d9507d62f8
ignore TRANSPARENTPIXEL
2019-09-23 19:20:59 -03:00
61aa84d15a
pixel alpha mistake
2019-09-23 18:27:43 -03:00
9c7b3f1d80
patch fixes
2019-09-23 18:25:53 -03:00
98d0a0d98e
Added bounce-off behavior for multi-hit enemies/bosses
2019-09-24 03:54:04 +08:00
3fdf48f9b0
Further cleanup
2019-09-24 03:21:01 +08:00
41d718dabf
Cleanup
2019-09-24 03:10:41 +08:00
de294d84e7
Lots of CA_GLIDEANDCLIMB changes:
...
Glide speed now starts at whatever speed you were traveling at prior.
If glide speed is below actionspd, the glide accelerates towards it.
When landing from a glide, player now enters a landing animation (SPR2_LAND); they cannot move in this state, but they can jump or start a spindash.
Ground-sliding after a glide can now be cancelled into the landing animation by releasing jump, where the same rules apply.
Climb speed increased x1.33.
2019-09-24 02:17:20 +08:00
dfee7efd33
Merge branch 'master' into internal-hotplug-stableid
2019-09-23 00:44:34 -04:00
73146a8338
Restore code that somehow got reverted???
...
How did this even happen??
2019-09-22 20:30:07 -04:00
e897f5df45
Sneakers affect max glide speed, changed glideslide behavior
2019-09-23 02:56:01 +08:00
0772ee693c
Merge remote-tracking branch 'origin/master' into knuxstuff
...
Update to master branch
2019-09-23 00:21:35 +08:00
e9d211d2bc
reallowed strafe key leeway, increased leeway strength
2019-09-23 00:21:28 +08:00
203f9d8c1a
Trying out a new glide
2019-09-22 21:11:49 +08:00
753c1bcb50
Merge branch 'hitbox-tweaks' into 'master'
...
Small hitbox tweaks
See merge request STJr/SRB2Internal!341
2019-09-22 06:43:28 -04:00
f7ad5501e1
Increase emblem and token hitbox sizes.
2019-09-22 04:19:09 +02:00
f8c97aeb27
Tweak bubble grabbing behavior.
2019-09-22 04:05:22 +02:00
07120aeda4
Merge branch 'logloaded' into 'master'
...
Mark new-style log names as loaded in addons menu
See merge request STJr/SRB2Internal!340
2019-09-20 13:39:08 -04:00
c36123aa56
Mark new-style log names as loaded.
2019-09-20 17:43:41 +01:00
9b4f1b60b9
Merge branch 'public_next' into private
2019-09-20 12:33:34 -04:00
bf28a7f5bc
Merge branch 'master' into next
2019-09-20 12:32:32 -04:00
92779487a4
avoid the source code from getting the wrong EOL
2019-09-20 12:32:18 -04:00
113568095a
* Resolve compiling issues with logmessages.
...
* Improve logfile print. (I know Steel wanted it gone entirely, but I feel like it's relevant to have it in game..?)
2019-09-20 17:22:09 +01:00
8d3d5566b8
Undo file mode change on menu files
2019-09-20 12:18:57 -04:00
7da89e3bc9
Merge branch 'camerafix' into 'master'
...
Camera fixes
Closes #105
See merge request STJr/SRB2Internal!303
2019-09-20 11:51:30 -04:00
a6c9525de6
Merge branch 'new_algae' into 'master'
...
New animated DSZ kelp (plus ACZ cacti & DSZ coral)
See merge request STJr/SRB2Internal!332
2019-09-20 11:45:46 -04:00
661966ced6
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into new_algae
2019-09-20 16:45:06 +01:00
880c2cdada
Merge branch 'playerfixes' into 'master'
...
Some Player fixes and enhancements
Closes #216 , #219 , #222 , and #224
See merge request STJr/SRB2Internal!334
2019-09-20 11:39:32 -04:00
20d098de8f
Merge branch 'betterdirs' into 'master'
...
Better directory structure
See merge request STJr/SRB2Internal!321
2019-09-20 11:36:56 -04:00
361be5c659
Merge branch 'nmus-pk3' into 'master'
...
Support W_VerifyFile on PK3
See merge request STJr/SRB2Internal!328
2019-09-20 11:35:22 -04:00
d59c02fc0b
Merge branch 'timerfix' into 'master'
...
Timerres fix
Closes #213
See merge request STJr/SRB2Internal!338
2019-09-20 11:34:50 -04:00
35803d74cc
Merge branch 'camerafix-menu' into 'camerafix'
...
Camera Options submenu
See merge request STJr/SRB2Internal!337
2019-09-20 11:34:26 -04:00
971d35736a
Merge branch 'flats-png-macro-fix-please-just-work-already' into 'master'
...
Use byteptr.h macros in flats png
See merge request STJr/SRB2Internal!339
2019-09-20 11:34:10 -04:00
19e0e43e87
test??
2019-09-20 12:07:57 +08:00
bf55dd293e
Merge remote-tracking branch 'private/master' into flats-png-macro-fix-please-just-work-already
2019-09-19 21:43:57 -04:00
530b5784b8
platersprite_t is not the same as unsigned
2019-09-19 21:42:59 -04:00
322a0b8c41
Merge remote-tracking branch 'origin/master' into flats-png-macro-fix-please-just-work-already
2019-09-19 22:41:45 -03:00
ef7e8c5d58
use byteptr.h macros
2019-09-19 22:40:23 -03:00
4c7a7a7e0b
Small DSZ coral tweaks.
2019-09-20 00:51:44 +02:00
222d4f2b7c
Improved orbital camera in Software; cam_adjust cvars changed to on by default
2019-09-20 02:02:17 +08:00
802ddf94b1
Always pretend cv_playersforexit is 4 in co-op special stages.
2019-09-19 18:44:55 +01:00
a3ea2274f4
Fix inconsistency between score tally screen and timerres cvar ( Resolves #213 ).
2019-09-19 17:43:23 +01:00
f8475eef26
Disable some code which sometimes makes the player enter walking frames when jumping up to a platform, such as the CEZ3 buttons, despite still being in jumping mode.
...
If this causes more problems than it solves it can be reverted, but doing a bunch of playthroughs of DSZ1/2, GFZ1, and CEZ3 didn't seem to uncover anything, so I'm tentatively putting it in this branch.
2019-09-19 13:20:52 +01:00
ca9e6e31da
* Resolve #224 (landing frames on ceiling contact).
...
* Fix some other landing weirdness with CA_BOUNCE.
2019-09-19 13:20:05 +01:00
cf14d5fe5d
* Remove sounds from swimming.
...
* Lower default swim animation speed.
* Make speed of flight/swim animation increase whenever mashing jump.
2019-09-19 12:30:30 +01:00
c2f7b14336
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into playerfixes
2019-09-19 12:00:55 +01:00
5015f8e142
Added Camera Options submenu (provided my files aren't broken again (please D:))
2019-09-19 17:34:04 +08:00
0d1dbc8cb8
Merge branch 'painsoundfixes' into 'master'
...
Pain sound fixes
See merge request STJr/SRB2Internal!335
2019-09-18 16:58:50 -04:00
c81452211d
Updated ACZ cacti.
2019-09-18 21:40:33 +02:00
284ced06ec
Merge branch 'master' into new_algae
2019-09-18 20:17:36 +02:00
f870b5237f
* Fix native MF_PAIN sound extension being limited to UINT8 range, which only became evident when the new s1/2/cd/3db/kc sfx were added.
...
* Make the pain-causing cactodes have DMG_SPIKE.
2019-09-18 17:48:41 +01:00
Jaime Passos