forked from protoman/rockbot
-
Notifications
You must be signed in to change notification settings - Fork 0
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merge upstream #6
Open
MBeijer
wants to merge
216
commits into
AmigaPorts:master
Choose a base branch
from
protoman:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fix for a crash that happened in some Android devices due to incorrect size of array and std::copy.
Adjusts for Android build with newer SDL from Pelya. Update images in Rockbot 2 uswing chibi style.
- Adjust hitbox for Kurupira so player can jump over him.
- some sfx play even with audio disabled.
- bring back weapon list into in-game menu.
- new object type crusher. - stages adjusts and improvements. - add missing reaction near-player. - AI iumprovements for Beast Bot.
- Fixes for morph-into and replace-itself. - Improve sfx delay by lowering buffer size.
- add music from SIMONE "JMD" BERNACCHIA - add intro
- update text and translations for intro.
Update credits. Remove projectile that hits enemy that is intangible. Onbly show warning about new players on first time finishing the game.
- Small fixes in enemies. - Improvements in package scripts.
- EDITOR: reset do mapa deve ser geral, incluindo links, inimigos e objetos - EFEITO wave no fundo (bubbleman wily wars) - new AI: shoot projectile in several directions at same time - new AI: fall down in diagonal - moving platform up and down
- block that can be broken by shooting or jumping on it - fix projectile trajectories up and down - fix replace itself position # EDDIE: - npc amigável via behavior flag - nova IA: throw item - nova IA: teleport out - EDITOR: shuld not be able to select empty tile - map gfx animated bg: splits image into half for frames - fix jump limits when inside quicksand - new IA para walk ou fly: up to ground, down to inside ground - corrigido projetil tipo TARGET_EXACT - suporte a goto nas reactions - ao trocar de mapa, só deve manter o scroll se o fundo for o mesmo, senao deve resetar - EDITOR: ask if user wants to same data before loading another game - EDITOR: tornar mais fácild e enxergar linhas de tamanho de sala e seleção de tile - active platform e destructible item (sem drop), fora da tela, tem que resetar posição e estado - ao transicionar tela na horizontal e não fort porta, não mudar para STAND se estiver em slide - use hitbox area defined in editor for players instead of hardcoded one - se usar o frog para sair da tela por cima, acaba ficando preso fora dela - novo tipo de escudo: usando escudo (anim_type_shield) - novo tipo de escudo: back - limit the max of spawned npcs from the origin point of the map-npc instead of the number of the main-npc data. - two new object types, destructible (with regular weapons) and same that drops item. - try to use ANIM_TYPE_STAND for hitbox if current anim-type is not used, avoiding falling to default frameSize. # fix collision against npcs with background. - NPC death explosion being shown at start point when falling in hold/ground (should have no explision at all) - fly/to-player esta deixando rastro como dash, não é para ter. - HIGH: reflected projectiles were not being consumed/finished. - AI: use move-speed to determine the range of the jump. - new AI: walk ahead even if falls from platform. - new AI: shoot projectile in several directions at same time. - new AI: fall down in diagonal. - new projectile types that fire multiple, 5 way up, 5 way down and 8 way. - EDITOR: opção "draw areas" que mostra o retangulo de objetos e inimigos. - moving platform up and down. - EDITOR: add option for FG auto-scroll. - EDITOR: npc with background was not being correctly shown when facing right direction. - EDITOR: poder ver o preview em outros idiomas, respeitando a opção do combo em - EDITOR: adicionada opção view->tileset. - EDITOR: reset do mapa deve ser geral, incluindo links, inimigos e objetos. - EFEITO wave no fundo (bubbleman wily wars).
- add sfx for shoot+jump destructible object - fix entering stairs pos x adjust for different player sprites sizes - player showing above overlay in teleport-in animation
- fix classic hud weapon value - do not restart auto charging shot if dead - music do not stop after dying - more fixes for hitarea and vulnerable-area when npc has background - added option in cheats menu to change between modern and classic styles - adicionar efeito sonoro em plataformas ativas quando acionar elas - adicionar som ao entrar em cápsula de teleporte - fixes for object platform: # if player is inside object, adjust position when moving him # update map scrolling when moving player - projectile appearing in position 0x0 for one frame (missing update-real-pos) - improved error display and add log message into file - EDITOR: fix vulnerable-area with bg in preview - fix hitting enemy outside hit-area if it has background - fix for npcs with background not showing when partially outside screen (use bg pos adjust and width) - add option for door animation if it has frames in image - fix jump interruption when hitting the head on solid - fix stairs transitioning back when moving from bottom to top - game-style option in editor can use used to bring back some mm-like presentation # stage select # player and boss death explosions # got-weapon screen # skull castle intro # boss intro
- adjust object execution timer to make them faster - show beaten faces as darkned in stage select screen - show player celebrating victory after defeating boss even if is one that do not give you a weapon - AI: fix turn confition for zig-zag-ahead - pause game wqhen entering door to prevent rapid movement after it closes - improve Rockbot 1 castle 3 tileset with a anim-tile for magnets. - created new projectile trajectory, ahead-and-back, so that zig-zag won't stop when reaching initial-x. - ground-damage block player jump for a second - walk-on-roof should update direction to given destination - improved blinking animation when player or enemies are invulnerabvle after being hit - fixed chain projectile position for player and npcs - increase star-shield speed a bit - fixed auto-respawn for the second time (was not resetting the dead flag on revive method) - improved hit_ground method to theck not only center, but left and right of the character's hitbox also # prevents jump not being finished if center is still on air
…art from the middle before restarting. - fix friend npc teleport-out. - friend npc that teleports out should not come back when changing map or dying. - added sprites for Dragon Bot's teleporting. - fix projectile of type spiral, avoid inc of zero to the radius, fix Dragon Bot's weapon. - do not reused a RW for error font, causes problems in Windows. - EDITOR: use opened game in the window title.
Rockdroid to Master
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.