Skip to content

Merge from head #4

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
merged 376 commits into from
Mar 1, 2021
Merged

Merge from head #4

merged 376 commits into from
Mar 1, 2021

Conversation

mbernard2
Copy link
Owner

No description provided.

Semphris and others added 30 commits October 8, 2020 22:36
Make badguys' pattern not random-based (WIP)
* Allows access to Cheat and Debug menus when playtesting a level fro mthe editor

* Removed access to debug menu, as it had impacts outside the editor and didn't seem as necessary (it's one line, if anyone wants to re-enable it)

Co-authored-by: Semphris <[email protected]>
* Corner-based autotile system, in addition to the current system, for smoother experience with certain tilesets

* Autotiles : Fixed and improved erasing using the empty tile

* Fixed build errors (autotile corners)

* Fixed autotiling with non-autotileable tiles causing a segfault

* Improved autotile help message

Co-authored-by: Semphris <[email protected]>
Family names are a way for the game to identify sprites that continue each other; when switching between actions with the same family name, animations won't reset.

Co-authored-by: Semphris <[email protected]>
Ensure that squirrel is compiled with -fPIC to allow linking the static
libraries with dynamically linked programs. This is not a requirement
for most architectures but is mandatory for ARM.

Fixes:
x86_64-buildroot-linux-musl/bin/ld: CMakeFiles/sq_static.dir/sq.c.o: relocation R_X86_64_32 against `.rodata.str1.8' can not be used when making a PIE object; recompile with -fPIC
x86_64-buildroot-linux-musl/bin/ld: final link failed: nonrepresentable section on output

Fix #1536

Signed-off-by: Romain Naour <[email protected]>
[Retrieved from:
https://git.buildroot.net/buildroot/tree/package/supertux/0001-CMakeLists.txt-compile-squirrel-with-fPIC.patch]
Signed-off-by: Fabrice Fontaine <[email protected]>
Also added a fix for Tux on the title screen (collision bug)

Co-authored-by: Semphris <[email protected]>
…n scripting) (#1566)

* Fixed Squirrel-exposed objects not being allowed to be exposed via multiple objects (for ex. Will O'Wisp could not be exposed as a Will O'Wisp *and* as a generic BadGuy)

* Attempt to fix build errors on Windows/MSVC

* Forgot the dispenser (fixing badguys scripting inheritance)

Co-authored-by: Semphris <[email protected]>
* Support for zooming from scripting

* Fixed build errors (Camera zooming/scaling)

* Improved code quality

Co-authored-by: Semphris <[email protected]>
- Picnic with Penny is now fixed and accessible
- Two levels were switched around, as was agreed upon a few months ago if I remember correctly
serano01 and others added 29 commits February 12, 2021 08:07
Tux stops upon reaching the top of the ladder and doesn't fall anymore
* Added workflow for Ubuntu Touch (UBports)

- Files to build using Clickable
- Workflow for GitHub Actions

* Fixed broken dependency for UBports

* Fixed build errors

* UBports: Cleanup and build error fixes

* Fixed workflow error

* Fixed workflow for debug

* Changed build folder name to avoid collisions (ci skip)

Co-authored-by: Semphris <[email protected]>
* Added workflow for 32-bit Linux (i386,x86)

* Fixed the single dumbest mistake I ever made a commit for.

* GitHub actions: removed compiler versions

* Fixed the SECOND dumbest mistake I ever wrote a commit for.

No seriously, it's 18:30, I woke up at 12 today, there's absolutely NO REASON I should be tired at this hour. But still, my hand decides it would do a dumb mistake, my eyes said they wouldn't see it, my brain said it wouldn't think about it, and GitHub Actions said it would refuse to print the error messages. Subodiosus!

* Restricted source upload to only one build

Co-authored-by: Semphris <[email protected]>
* Added near-complete scripting support for custom particles

* Added missing float cast

* Added missing double cast

* Added missing initialiser in custom_particle_system.cpp

* Fixed initialiser order and added another missing initialiser

* for-loop by reference

* Finished implementing scripting for custom particles

* Removed superfluous  statements after 's

* Fixed scripting wrapper merge conflict

Co-authored-by: Semphris <[email protected]>
…d releases for Linux, macOS and Windows will have it by default.
@mbernard2 mbernard2 merged commit dfcd4f4 into mbernard2:master Mar 1, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.