Code

Merge upstream#6

Code

Open

MBeijer wants to merge 216 commits intoAmigaPorts:masterAmigaPorts/rockbot:masterfrom protoman:masterprotoman/rockbot:masterCopy head branch name to clipboard

+18,677-14,964

Commits

Commits on Dec 22, 2018

• - initial "frack you google monopholy" version of RockDroid

  Show description for 94a14e3
  protoman

  committed
  94a14e3

• - initial "frack you google monopholy" version of RockDroid

  Show description for 346b2b1
  protoman

  committed
  346b2b1

Commits on Dec 24, 2018

• - continue conversion to RockDroid

  protoman

  committed
  1f830fd

• - continue conversion to RockDroid

  protoman

  committed
  d0d1f21

• - continue conversion to RockDroid

  protoman

  committed
  0a2914a

• - continue conversion to RockDroid

  protoman

  committed
  b5e30dc

• - continue conversion to RockDroid

  protoman

  committed
  c0c2aaa

• - continue conversion to RockDroid

  protoman

  committed
  37570c8

• - continue conversion to RockDroid

  protoman

  committed
  248f15b

• - continue conversion to RockDroid

  protoman

  committed
  bf16c87

• - continue conversion to RockDroid

  protoman

  committed
  5633b1c

• - continue conversion to RockDroid

  protoman

  committed
  7aca701

• - continue conversion to RockDroid

  protoman

  committed
  24ec50d

• - continue conversion to RockDroid

  protoman

  committed
  63aeea1

• - continue conversion to RockDroid

  protoman

  committed
  646eb09

• - continue conversion to RockDroid

  protoman

  committed
  d9251d5

• - continue conversion to RockDroid

  protoman

  committed
  c7452ba

• - continue conversion to RockDroid

  protoman

  committed
  461fb0b

• - continue conversion to RockDroid

  protoman

  committed
  5e7fb6b

• - continue conversion to RockDroid

  protoman

  committed
  c301694

• - continue conversion to RockDroid

  protoman

  committed
  ad7c9e0

• - continue conversion to RockDroid

  protoman

  committed
  f0012fa

• - continue conversion to RockDroid

  protoman

  committed
  dead1ff

• - continue conversion to RockDroid

  protoman

  committed
  231ae7e

• - continue conversion to RockDroid

  protoman

  committed
  a635430

• - continue conversion to RockDroid

  protoman

  committed
  1923053

• - continue conversion to RockDroid

  protoman

  committed
  132a0b6

• - continue conversion to RockDroid

  protoman

  committed
  ff367c9

• - continue conversion to RockDroid

  protoman

  committed
  adf5bc2

• - continue conversion to RockDroid

  protoman

  committed
  98668fc

• - continue conversion to RockDroid

  protoman

  committed
  61105b0

• - continue conversion to RockDroid

  protoman

  committed
  c677a61

• - continue conversion to RockDroid

  protoman

  committed
  a622558

• - continue conversion to RockDroid

  protoman

  committed
  61e9abf

• - continue conversion to RockDroid

  protoman

  committed
  4affd7b

• - continue conversion to RockDroid

  protoman

  committed
  85f4dfc

• - continue conversion to RockDroid

  protoman

  committed
  096945e

• - continue conversion to RockDroid

  protoman

  committed
  416f67f

• - continue conversion to RockDroid

  protoman

  committed
  bbc98f8

• - continue conversion to RockDroid

  protoman

  committed
  b16c3dc

• - continue conversion to RockDroid

  protoman

  committed
  a4d9bf8

• - continue conversion to RockDroid

  protoman

  committed
  fd94c53

• - continue conversion to RockDroid

  protoman

  committed
  a5d7e28

• - continue conversion to RockDroid

  protoman

  committed
  2b95348

• - continue conversion to RockDroid

  protoman

  committed
  7bc49f7

• - continue conversion to RockDroid

  protoman

  committed
  c8b722e

• -update copyright year

  protoman

  committed
  b8e0b66

Commits on Dec 27, 2018

• - remove unused scripts

  protoman

  committed
  565674f

• - remove more tilesets, fix crash on last stage

  protoman

  committed
  7c3a957

• - add info on rockbot removal by google

  protoman

  committed
  1e646fd

Commits on Feb 19, 2019

• - fixes for PS2

  protoman

  committed
  5c1c69e

Commits on Feb 20, 2019

• - more fixes and improvements for PS2 version

  protoman

  committed
  0f5c822

Commits on Apr 23, 2019

• Add missing files

  protoman

  committed
  c912f97

Commits on May 27, 2019

• - update graphics

  Show description for 34c4c21
  protoman

  committed
  34c4c21

Commits on Jun 18, 2019

• - change compiler from gcc to clang

  Show description for cd8197e
  protoman

  committed
  cd8197e

Commits on Jun 19, 2019

• - fix a bug in object collision that was made aparent because of clang change

  protoman

  committed
  ba4ead7

• - new icon for android v2

  Show description for 0c45c7c
  protoman

  committed
  0c45c7c

Commits on Oct 14, 2019

• - Fixes for RockDroid2 ending

  protoman

  committed
  cce29ce

Commits on Mar 11, 2020

• - 1 e 2: às vezes, o diálogo de mudança de arma fica abaixo dos tiles (deve estar debaixo do nível 2 de tiles)

  Show description for e65f1ab
  protoman

  committed
  e65f1ab

• - adjusts for release

  Show description for 71b781d
  protoman

  committed
  71b781d

Commits on Mar 19, 2020

• - fix getting stuck in invalid place after dying and returning to checkpoint (thanks to Pix-el 64)

  Show description for bbad3cb
  protoman

  committed
  bbad3cb

Commits on Mar 25, 2020

• - increase audio buffer size

  Show description for 672889c
  protoman

  committed
  672889c

Commits on Mar 28, 2020

• - add missing font file

  protoman

  committed
  8d57906

• - Fixes for WIN32 build.

  protoman

  committed
  d82de50

Commits on Mar 29, 2020

• Re-add ports like Dingux.

  protoman

  committed
  8797616

Commits on Mar 31, 2020

• - update 1up icon in RockBot2

  Show description for 0b8f13e
  protoman

  committed
  0b8f13e

• Show boss name in stage selection

  protoman

  committed
  57befd3

Commits on Apr 7, 2020

• - fix crash in number picker (really this time)

  Show description for a93e509
  protoman

  committed
  a93e509

Commits on Apr 8, 2020

• - add 30 fps mode for older/slower platforms such as PS2 and Dingux.

  protoman

  committed
  a94b617

• - add back Playstation2 build support

  protoman

  committed
  3a3c075

Commits on Apr 9, 2020

• - Add frameskip option for slow systems such as Dingoo/PS2 (will later make it an option for the user to set it for slow Android devices also)

  protoman

  committed
  c6d084c

Commits on Apr 11, 2020

• - merge back frixes from old rockbot branch

  Show description for 6503798
  protoman

  committed
  6503798

Commits on Apr 20, 2020

• - add configs for on-screen controls spacing and audio buffer size

  protoman

  committed
  d074559

Commits on May 4, 2020

• Fix ghost flag being unset in NPC.

  Show description for 0712c7a
  protoman

  committed
  0712c7a

Commits on May 24, 2020

• - use ogg files for Android version to fix audio issue with mikmod

  Show description for bf47b31
  protoman

  committed
  bf47b31

Commits on Jun 16, 2020

• - add music in mod format to fix Android issues with mikmod player

  Show description for 4ab1f3e
  protoman

  committed
  4ab1f3e

Commits on Jun 19, 2020

• - add support for PocketGo build

  Show description for bd603cc
  protoman

  committed
  bd603cc

Commits on Jun 21, 2020

• Rockbot1:

  Show description for 65b400a
  protoman

  committed
  65b400a

• - some fixes for warnings

  Show description for d8cb1b8
  protoman

  committed
  d8cb1b8

• - fix ending stopping stars animation while waits for keypress

  Show description for 999b8e3
  protoman

  committed
  999b8e3

Commits on Jun 25, 2020

• - fixes in AI

  Show description for dec6ef0
  protoman

  committed
  dec6ef0

• - tradução de créditos do motor de jogo

  protoman

  committed
  19e8955

• - fixes in strings

  Show description for a52de66
  protoman

  committed
  a52de66

• - more translations for in-game weapons menu

  protoman

  committed
  f2f5a33

• - code cleanup

  protoman

  committed
  d78ea3a

• - more code-cleanup

  protoman

  committed
  ce71a04

Commits on Jul 8, 2020

• - fix coil teleporting on roof

  Show description for 90bb805
  protoman

  committed
  90bb805

Commits on Jul 13, 2020

• - improvements in character/map collision code

  Show description for f467b70
  protoman

  committed
  f467b70

• - add a folder to store old-style music

  protoman

  committed
  4d39090

Commits on Jul 14, 2020

• - fix enemy moving when top is out of water and bottom in-it.

  protoman

  committed
  327ab84

• - add anim-tile for mansion windows

  protoman

  committed
  844fe1a

Commits on Jul 15, 2020

• - add old music as optional

  protoman

  committed
  b4a80b3

• - remove unused files

  protoman

  committed
  c64f696

• - move ogg files to its own folder

  Show description for 565e3a6
  protoman

  committed
  565e3a6

• - fix audio menu not updating with changes

  protoman

  committed
  b1ef7b7

Commits on Jul 21, 2020

• - re-add intro scene

  Show description for 5971681
  protoman

  committed
  5971681

• - finish about screen

  Show description for 60e98cc
  protoman

  committed
  60e98cc

Commits on Jul 22, 2020

• - removed unused fonts

  Show description for cb4193f
  protoman

  committed
  cb4193f

Commits on Jul 23, 2020

• - add music in mp3 format, replacing ogg to make file smaller

  protoman

  committed
  f2952dc

Commits on Jul 26, 2020

• - add a placeholder in sprites/enemies/background folder, so we don't have to manually create it when checking out from git

  Show description for 50160d5
  protoman

  committed
  50160d5

Commits on Aug 2, 2020

• - try to fix a crash in option-picker in some Android devices.

  Show description for 298d199
  protoman

  committed
  298d199

• - add extra check to prevent crash in option-picker

  protoman

  committed
  342b284

Commits on Sep 1, 2020

• - add boss intro image for intro-stage

  Show description for 53f7eb7
  protoman

  committed
  53f7eb7

Commits on Sep 3, 2020

• - option to auto-detect language

  Show description for 560878d
  protoman

  committed
  560878d

• - set default language in config as auto-detect

  protoman

  committed
  95fd444

Commits on Sep 4, 2020

• add log class to better handle android logging, add missing boss-intro bg files for castle stages (placeholder), new music for horror stage, fix boss intro bg crash for castle stages

  protoman

  committed
  32977d1

• - fixes for Rockbot2 stages and bricks-boss

  protoman

  committed
  b06fda9

Commits on Nov 15, 2020

• - boss dialog cleanup

  Show description for 232f6a7
  protoman

  committed
  232f6a7

• - code cleanup

  Show description for 70329e7
  protoman

  committed
  70329e7

Commits on Nov 17, 2020

• - code cleanup

  Show description for 0705b34
  protoman

  committed
  0705b34

Commits on Nov 19, 2020

• - add intro scene

  Show description for aec39be
  protoman

  committed
  aec39be

Commits on Nov 20, 2020

• - fix vertical wall-walking that was checking position with the wrong variable (real, instead of position)

  protoman

  committed
  f0b17df

Commits on Nov 22, 2020

• - Rockbot2: improve last stage

  Show description for 1e3be46
  protoman

  committed
  1e3be46

Commits on Nov 26, 2020

• - stage improvements

  Show description for 98bdb50
  protoman

  committed
  98bdb50

• - remove unused graphic file

  Show description for 4b4d908
  protoman

  committed
  4b4d908

Commits on Nov 27, 2020

• - fix easy/hard blocks not allowing player to move over it when the difficult is not the same as the block requires.

  protoman

  committed
  71cb8d1

• - fix issue with map 2 of castle 5 in Rockbot 1

  protoman

  committed
  cdde653

• - adjust in the endings.

  protoman

  committed
  e777906

• - adjusts in ending dialogs

  protoman

  committed
  b0addce

• - adjusts in ending dialogs

  protoman

  committed
  ecf862f

Commits on Nov 28, 2020

• - add anbimated tiles for Daisie stage

  Show description for 71e3652
  protoman

  committed
  71e3652

• - remove sub-boss wasp from castole #1, it is a boss on castle #4, no sense to use twice

  Show description for acbdcee
  protoman

  committed
  acbdcee

Commits on Nov 29, 2020

• - new water splash animation and position fix

  protoman

  committed
  97c20a4

• - Add missing files, update for release .38

  protoman

  committed
  a7ee776

Commits on Dec 1, 2020

• - art update

  Show description for 9ae5355
  protoman

  committed
  9ae5355

• - update art

  Show description for ce77143
  protoman

  committed
  ce77143

Commits on Dec 2, 2020

• - add new animated tile for moon stage (castle 5)

  protoman

  committed
  dd780fe

Commits on Dec 3, 2020

• - add frameskip to PSP

  protoman

  committed
  ed9e07d

• Update PSP makefile

  protoman

  committed
  fe0a2e3

• - add quit callbacks to psp main

  protoman

  committed
  fae0f09

Commits on Dec 4, 2020

• - fix typo

  protoman

  committed
  c080112

• New icon and background for Rockbot 1 PSP

  protoman

  committed
  0336669

• - better making system for PSP

  protoman

  committed
  08f4c3f

Commits on Dec 17, 2020

• - improve lighting attack (fix vertical position, show animation indication where will land)

  Show description for c9d794d
  protoman

  committed
  c9d794d

Commits on Feb 28, 2021

• - #2: improve lighting attack, show where it will land before, fix vertical position

  Show description for 1e6fd6c
  protoman

  committed
  1e6fd6c

• - text adjust

  protoman

  committed
  4981968

Commits on Apr 23, 2021

• - add missing translations and dialog cleanup

  Show description for d2e6174
  protoman

  committed
  d2e6174

Commits on Apr 24, 2021

• - EDITOR: set default zoom to 2 and show overlay tiles as translucent when background is selected.

  protoman

  committed
  5a562db

• - add option in view to hide the overlay tiles if they are in the way for editting the background ones.

  protoman

  committed
  6cdc6a6

• - update win32 makefiles with most recent qt5 path

  protoman

  committed
  f9a1b39

• EDITOR:

  Show description for e88315b
  protoman

  committed
  e88315b

Commits on May 3, 2021

• - update roadmap and code organization

  protoman

  committed
  9ff2a0b

• - Fix qt5 path

  protoman

  committed
  60fcf58

• Merge branch 'rockdroid' of https://github.com/protoman/rockbot into rockdroid

  protoman

  committed
  580b6f6

Commits on Jun 12, 2021

• - fix collision on water when there is a single block ahead

  Show description for 1ca60b5
  protoman

  committed
  1ca60b5

Commits on Jun 13, 2021

• - fix animation timer that made the stairs attack to last just a few frames.

  protoman

  committed
  94d28ae

• - change 1up animation graphic style

  Show description for 8f68c7a
  protoman

  committed
  8f68c7a

Commits on Jun 19, 2021

• - do not change to default weapon after calling coil or jet

  Show description for f597872
  protoman

  committed
  f597872

• - jet item should only start moving once player set foot on it

  Show description for a288476
  protoman

  committed
  a288476

• #62 - Non player character must consider terrain-stair as solid for hit-ground check.

  protoman

  committed
  ae685b6

• close #62

  protoman

  committed
  8dfcaca

Commits on Jun 20, 2021

• Fix #75

  protoman

  committed
  cc128e7

• Fix #117 - show nice dialog and create directory if one is missing for files combobox.

  protoman

  committed
  dfe5bf3

• Fix #60 - when activated, checkpoint must continue to other objects instead of leaving loop.

  protoman

  committed
  b56dd3a

• Fix #73 - change giant fly to UFO and improve it's AI.

  protoman

  committed
  c4d201b

Commits on Jul 11, 2021

• Fix #120 set parabola when no target is defined.

  Show description for 01b0846
  protoman

  committed
  01b0846

• Fix #119 - adjust so all projectiles from bomb rain fall into the screen width and do not change new bombs dropping position if scroll changes.

  protoman

  committed
  c3cc8c8

Commits on Jul 20, 2021

• EDITOR: fix layer number in parallax tab in movie editor to be filled again with 0-10 values. Improve UI for scenes editor.

  protoman

  committed
  b6227dd

Commits on Jul 21, 2021

• EDITOR: Add mousewheel zoom adjust in tileset selector and projectile preview areas.

  protoman

  committed
  0aac252

• Merge branch 'rockdroid' of https://github.com/protoman/rockbot into rockdroid

  protoman

  committed
  89713ec

• EDITOR: fix issue with tileset selection when using zoom and save/load selected theme.

  protoman

  committed
  ed10ca3

• Merge branch 'rockdroid' of https://github.com/protoman/rockbot into rockdroid

  protoman

  committed
  fa528f6

Commits on Jul 30, 2021

• Add license details in docs, fixes #124

  protoman

  committed
  f89698a

Commits on Aug 30, 2021

• Fix #128

  

  Iuri Fiedoruk

  authored and

  Iuri Fiedoruk

  committed
  3971c90

• Fix #130

  

  Iuri Fiedoruk

  authored and

  Iuri Fiedoruk

  committed
  8f56f69

• Fix #127

  

  Iuri Fiedoruk

  authored and

  Iuri Fiedoruk

  committed
  1ec2fbc

• Fix #126

  

  Iuri Fiedoruk

  authored and

  Iuri Fiedoruk

  committed
  6e8a519

Commits on Aug 31, 2021

• Fix run on windows

  protoman

  committed
  0d95e73

• Merge branch 'rockdroid' of https://github.com/protoman/rockbot into rockdroid

  protoman

  committed
  184b106

Commits on Sep 4, 2021

• Cleanup code for .050 release. Remove some unecessary methods in Adndroid port.

  

  Iuri Fiedoruk

  authored and

  Iuri Fiedoruk

  committed
  ff90555

Commits on Sep 7, 2021

• - use background to clear player name in player selection screen

  

  Iuri Fiedoruk

  authored and

  Iuri Fiedoruk

  committed
  8587deb

Commits on Oct 22, 2021

• Fix #134

  

  Iuri Fiedoruk

  authored and

  Iuri Fiedoruk

  committed
  6608b59

Commits on Oct 27, 2021

• Fix crash with old-style energy bar.

  Show description for 9c1d3cd
  

  Iuri Fiedoruk

  authored and

  Iuri Fiedoruk

  committed
  9c1d3cd

Commits on Nov 2, 2021

• - fix drill-down AI

  

  Iuri Fiedoruk

  authored and

  Iuri Fiedoruk

  committed
  2e1f853

• - fix drill-down AI

  

  Iuri Fiedoruk

  authored and

  Iuri Fiedoruk

  committed
  c9495fa

Commits on Dec 17, 2021

• - set correct music for stages like Dragon Bot's.

  Show description for 752dc37
  

  Iuri Fiedoruk

  authored and

  Iuri Fiedoruk

  committed
  752dc37

Commits on Dec 20, 2021

• - revert player selection screen to use background-color to erase between changes (sorry, can't just do everything you need, @rikifandubs)

  

  Iuri Fiedoruk

  authored and

  Iuri Fiedoruk

  committed
  aeb3349

Commits on Dec 24, 2021

• Remove path from process execution to avoid space in path issues in windows.

  protoman

  committed
  c1a05ac

• Merge branch 'rockdroid' of https://github.com/protoman/rockbot into rockdroid

  protoman

  committed
  d4311e4

Commits on Aug 9, 2022

• - improvements in editor UX

  Show description for 5643fa3
  

  Iuri Fiedoruk

  authored and

  Iuri Fiedoruk

  committed
  5643fa3

• Merge branch 'rockdroid' of https://github.com/protoman/rockbot into rockdroid

  protoman

  committed
  38b7baf

Commits on Aug 12, 2022

• Fix #141 by resetting the reaction type selector when changing NPC.

  protoman

  committed
  f66736b

• Fix #137. Do not use rotated surface if there is no target.

  protoman

  committed
  cada762

• Fix #140 by checking if npc has the final boss as replace-itself AI action.

  protoman

  committed
  21013ce

Commits on Dec 18, 2022

• - add android sdk project files

  protoman

  committed
  776cfe2

Commits on Jul 12, 2023

• - Rename log class due to conflicts in Android.

  protoman

  committed
  6c8ed7b

• Add Android config file

  

  Iuri Fiedoruk

  committed
  4447ebb

Commits on Jul 13, 2023

• Fixes for Android build

  

  Iuri Fiedoruk

  committed
  9947116

Commits on Jul 17, 2023

• Adjusts to use Pelya's SDL latest version.

  Show description for 253e134
  protoman

  committed
  253e134

Commits on Jul 18, 2023

• Fix for issue #138, do not reflect certain types of projectiles.

  Show description for 863946e
  protoman

  committed
  863946e

Commits on Jul 19, 2023

• - Fix hitboxes when facing left.

  Show description for 03c8da6
  protoman

  committed
  03c8da6

Commits on Jul 20, 2023

• - start a new in-game menu, move the code fromg raphLib to draw class.

  Show description for 055d785
  protoman

  committed
  055d785

Commits on Jul 21, 2023

• - bring back lifes and game-over.

  Show description for 69f9a65
  protoman

  committed
  69f9a65

Commits on Jul 24, 2023

• - fix vulnerable-area like was done in hit-area.

  Show description for 7c01466
  protoman

  committed
  7c01466

• - remove debug.

  protoman

  committed
  1a82d8c

• - fix bosses names in ending.

  protoman

  committed
  3024798

Commits on Jul 26, 2023

• - #2: add Destrin Ship after beating Destrin Machine.

  Show description for 50e9e3c
  protoman

  committed
  50e9e3c

Commits on Jul 27, 2023

• - add missing files

  Show description for ed53d7c
  protoman

  committed
  ed53d7c

• - add music from SIMONE "JMD" BERNACCHIA

  protoman

  committed
  fc97e57

• - fix one music that had issues in amiga-mod file format.

  Show description for fa63cff
  protoman

  committed
  fa63cff

Commits on Jul 29, 2023

• Changer back Android app name to RockBot.

  Show description for 16e54c9
  protoman

  committed
  16e54c9

Commits on Jul 31, 2023

• - Fix boss HP text position in HUD.

  Show description for df4d201
  protoman

  committed
  df4d201

• - update

  protoman

  committed
  f98d381

• add missing files

  protoman

  committed
  df33685

Commits on Aug 29, 2023

• - EDITOR: adicionada opção view->tileset

  Show description for 447b9b2
  protoman

  committed
  447b9b2

Commits on Oct 4, 2023

• - dercrease enemies intangible time after hit to 200ms

  Show description for 0a3a84f
  protoman

  committed
  0a3a84f

• -update script

  protoman

  committed
  3e90bc4

Commits on Oct 11, 2023

• - implement timed-bombs

  Show description for eb01af0
  protoman

  committed
  eb01af0

Commits on Oct 22, 2023

• - classic in-game menu

  Show description for 298dfbc
  protoman

  committed
  298dfbc

Commits on Oct 31, 2023

• - convert boss hp to classic style also.

  Show description for 95ab923
  protoman

  committed
  95ab923

• - update roadmap

  protoman

  committed
  c70c354

• - remove template, as it is very outdated and not good anymore

  protoman

  committed
  93a4b6f

Commits on Nov 1, 2023

• - always reload stage music on stage-restart, fixed music playing a part from the middle before restarting.

  Show description for b75e977
  protoman

  committed
  b75e977

Commits on Jan 14, 2024

• Resolve conflicts

  protoman

  committed
  6ca5c91

• Merge pull request #142 from protoman/rockdroid

  Show description for 40941c4
  protoman

  authored
  40941c4

• Delete build/games/Rockbot1 directory

  protoman

  authored
  981f747