Update branch 'with-folders' #71
Merged
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
This adds a way for guard hitpoints to not get reset when re-entering a room with a guard (added a new option "enable_remember_guard_hp" in the Enhancements section of SDLPoP.ini) Added a function that resets the unused fields and bits in the level format to zero (may be useful for forward compatibility, should we want to add things to the level format / savestate format in the future) Added an #include for stdbool.h.
Remembering guard hitpoints
Merged both makefiles. Now make is fully portable.
This adds optional fixes for a few movement/collision glitches: - FIX_GLIDE_THROUGH_WALL: Fixes the kid being able to glide sideways through the top sections of walls/tapestries while in freefall. - FIX_DROP_THROUGH_TAPESTRY: Fixes the kid dropping through tiles when dropping down from a tapestry. - FIX_LAND_AGAINST_GATE_OR_TAPESRY: Fixes the landing animation aborting when landing against a gate or tapestry+floor instead of a wall
…OSX. Commented an always-true if.
Removed duplicate const to avoid warnings in default gcc settings on …
…to Falcury_movement_fixes Conflicts: types.h
Added Markus installation method with brew install for OSX to the readme.
As suggested by @mfn
Add OSX build configuration for CMake
config: compile with USE_MIXER undefined
The SDL bug was fixed in SDL 2.0.4.
Removed sudo as Markus remarks. Added another tested OSX version by D…
Removed duplicate definition of timer_stopped. Also changed 0 to timer_0 where appropriate.
- added unistd_win.h to support windows-specific differences from GNU - added NMakefile for nmake to use to build the project - updated common.h and config.h for minor windows-specifics such as including the unistd_win.h when compiling with VC++
That is: 44100 Hz, 16-bit, Stereo.
Visual C++ (NMake) support
remove joy_state variable (its use was identical to the newer gamepad_states variable
Fix joypad/joystick movement
@vanfanel wrote this is needed on the Raspberry PI.
Yes, the two are the same for byte arrays, but it's good to be consistent.
Fast-forward for the `with-folders` branch Fixed conflicts: CMakeLists.txt source/Makefile.osx
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.
Fast-forward for the
with-foldersbranch.