Skip to content
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

Scene + Transition fixes #1717

Merged
merged 10 commits into from May 6, 2019

Conversation

@fmatthew5876
Copy link
Contributor

commented Mar 21, 2019

Depends on #1714

Fixes some transition issues and provides a refactor that eliminates more Game_Temp variables.

@fmatthew5876 fmatthew5876 changed the title Scene fixes Scene + Transition fixes Mar 22, 2019

@fdelapena fdelapena modified the milestones: 0.7.0, 0.6.1 Mar 23, 2019

@fmatthew5876 fmatthew5876 force-pushed the fmatthew5876:scene_fixes branch 3 times, most recently from bd9ebd2 to 210a549 Mar 28, 2019

@fmatthew5876 fmatthew5876 referenced this pull request Apr 6, 2019
10 of 11 tasks complete

@fmatthew5876 fmatthew5876 force-pushed the fmatthew5876:scene_fixes branch from 210a549 to 9372b3c Apr 7, 2019

@Ghabry

This comment has been minimized.

Copy link
Member

commented Apr 8, 2019

I'm not a big fan of all these

if
elseif
else

to

if
  return
elseif
  return
[else-code]

changes.

Makes it really easy to add bugs by accident when a new if-condition is added and a return is forgotten.

@fmatthew5876 fmatthew5876 force-pushed the fmatthew5876:scene_fixes branch 2 times, most recently from 3e6006e to f5aa332 Apr 9, 2019

@fdelapena

This comment has been minimized.

Copy link
Contributor

commented Apr 19, 2019

@fmatthew5876 fmatthew5876 force-pushed the fmatthew5876:scene_fixes branch from f5aa332 to 9daf559 Apr 20, 2019

@carstene1ns carstene1ns self-requested a review Apr 27, 2019

@fmatthew5876 fmatthew5876 force-pushed the fmatthew5876:scene_fixes branch from 9daf559 to 535d19c Apr 27, 2019

src/scene.h Outdated Show resolved Hide resolved

@fmatthew5876 fmatthew5876 force-pushed the fmatthew5876:scene_fixes branch 2 times, most recently from 681e754 to 186426f Apr 30, 2019

fmatthew5876 added some commits Mar 18, 2019

Remove Game_Temp::transition_menu
* Use prev/next scenes to determine transitions
* Put FinishTeleport logic in Scene_Map::Continue() for
  teleport / escape spells
* Handle teleport / escape transition logic in TransitionIn()
Fix skill / item scene transition out
Fixes bugs:
* Switch skill should fast transition out to map
* Escape item should slow transition out to map
Debug menu - don't interrupt other scenes.
Imagine a very long cutscene which calls the menu at some point allowing
you to save and prepare your characters for a boss battle. Now suppose
you hit F9 at exactly that moment. The menu gets canceled in favor of
the debug menu and now you start the battle immediately after.

We should not allow the debug scene if any event called another scene.
We should not allow it to be abused to cancel battles.
It also makes sense for ESC menu to take precedence.

fmatthew5876 added some commits Mar 22, 2019

Title screen fixes
* Simplify logic using prev_scene
* Animate the command window if we continue from non-loading
* Remove Scene_Title::Resume()
Fix event transitions behavior with scene change
If an event erases the screen:
* After a battle - stays erased
* After debug - stays erased (Fixes RPG_RT bug where the entire
  debug menu would be black
* After anything else - screen is shown

@fmatthew5876 fmatthew5876 force-pushed the fmatthew5876:scene_fixes branch from 186426f to 2d96720 May 1, 2019

@Ghabry

Ghabry approved these changes May 6, 2019

@Ghabry Ghabry merged commit 028c5cc into EasyRPG:master May 6, 2019

7 checks passed

Android (armeabi-v7a) Build finished.
Details
GNU/Linux Build finished.
Details
OSX Build finished.
Details
Wii (SDL1) Build finished.
Details
Windows (x64) Build finished.
Details
Windows (x86) Build finished.
Details
web Build finished.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.