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

Fixes for TintScreen and tint pictures #1545

Merged
merged 3 commits into from Dec 10, 2018

Conversation

Projects
None yet
4 participants
@fmatthew5876
Copy link
Contributor

fmatthew5876 commented Dec 8, 2018

No description provided.

@fmatthew5876 fmatthew5876 force-pushed the fmatthew5876:picture branch 2 times, most recently from b01cf38 to 6dcc947 Dec 8, 2018

@fmatthew5876

This comment has been minimized.

Copy link
Contributor Author

fmatthew5876 commented Dec 8, 2018

Fixes: #1546 by re-ordering Update() calls.

@fdelapena fdelapena added this to the 0.6.0 (likely) milestone Dec 8, 2018

@fmatthew5876 fmatthew5876 changed the title Fixes for Tone Fixes for TintScreen and tint pictures Dec 8, 2018

Show resolved Hide resolved src/tone.h Outdated

fmatthew5876 added some commits Dec 8, 2018

Support Picture affected_by_tint flags
* Adds Blend(Tone, Tone)
* Also fixes operator== for Tone to be non-member inline
Update screen effects before map
* Fixes off by 1 error in frame timing for tint, flash, and shake

@fmatthew5876 fmatthew5876 force-pushed the fmatthew5876:picture branch from 1b83163 to cd4fff9 Dec 9, 2018

@fmatthew5876

This comment has been minimized.

Copy link
Contributor Author

fmatthew5876 commented Dec 9, 2018

Renamed blend() to Blend(), to match our coding style.

@fmatthew5876 fmatthew5876 referenced this pull request Dec 9, 2018

Closed

A bunch of Vampires Dawn bugs #1128

5 of 5 tasks complete
@Ghabry

Ghabry approved these changes Dec 10, 2018

@Ghabry Ghabry merged commit 938ee8f into EasyRPG:master Dec 10, 2018

6 checks passed

Android (armeabi-v7a) Build finished.
Details
GNU/Linux Build finished.
Details
OSX Build finished.
Details
Windows (x64) Build finished.
Details
Windows (x86) Build finished.
Details
web Build finished.
Details

@fmatthew5876 fmatthew5876 deleted the fmatthew5876:picture branch Dec 14, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.