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

Merged from upsteram #2

Merged
merged 29 commits into from Aug 18, 2020
Merged

Merged from upsteram #2

merged 29 commits into from Aug 18, 2020

Conversation

mbernard2
Copy link
Owner

No description provided.

mbernard2 and others added 29 commits August 10, 2020 01:03
Fixed transition between worlds 1 and 2
* New wind images 

* Updated wind

* fix odd formatting 

* Formatting

* Conversions(?)

* More conversions

* More conversions

* Update wind.sprite

* Update wind

* Indentation 

* Spaces
* Fixed undo manager to properly handle the undo stack (will no longer ask to save a freshly opened, unmodified level)

* Fixed issue with the preceeding correction of the Undo manager

Co-authored-by: Semphris <invalid@example.com>
Co-authored-by: Semphris <invalid@example.com>
…s sprite (#1506)

Co-authored-by: Semphris <invalid@example.com>
* Added fading gradients through Squirrel

* Fixed missing initializers for fading gradient properties

* I forgot one of the two constructors (Gradient fading Travis warnings)
* Support for easing on any path object (platforms, tilemaps, etc.)

* Attempt #1 to fix Travis build errors (easing)

* Attempt #2 at fixing the Travis build (easing)

* Remade the easing system with a WTFPL-Licensed library

* Fixed the double-to-flat implicit conversions in easing

* Changed 'std::string' with 'const char*' in C-linked functions in easing

* Reordered easing methods so that the names actually match the easing functions

* Moved easing to src/math

* Fixed include paths, oops

* Fixed some magic includes

* Deleted unreachable code in easing.cpp

* Improved coding style and fixed building problem on macOS

Co-authored-by: Semphris <invalid@example.com>
@mbernard2 mbernard2 merged commit a155cd7 into mbernard2:master Aug 18, 2020
mbernard2 pushed a commit that referenced this pull request Aug 18, 2020
mbernard2 pushed a commit that referenced this pull request Aug 18, 2020
* Support for easing on any path object (platforms, tilemaps, etc.)

* Attempt #1 to fix Travis build errors (easing)

* Attempt #2 at fixing the Travis build (easing)

* Remade the easing system with a WTFPL-Licensed library

* Fixed the double-to-flat implicit conversions in easing

* Changed 'std::string' with 'const char*' in C-linked functions in easing

* Reordered easing methods so that the names actually match the easing functions

* Moved easing to src/math

* Fixed include paths, oops

* Fixed some magic includes

* Deleted unreachable code in easing.cpp

* Improved coding style and fixed building problem on macOS

Co-authored-by: Semphris <invalid@example.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
5 participants