stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-22 10:40:56 +00:00
Code Issues Projects Releases Packages Wiki Activity
7660 commits 172 branches 41 tags 280 MiB
Commit graph

7660 commits

This branch
This branch
All branches
Author SHA1 Message Date
lachwright
203f9d8c1a Trying out a new glide 2019-09-22 21:11:49 +08:00
toaster
753c1bcb50 Merge branch 'hitbox-tweaks' into 'master' 
Small hitbox tweaks

See merge request STJr/SRB2Internal!341
 2019-09-22 06:43:28 -04:00
sphere
f7ad5501e1 Increase emblem and token hitbox sizes. 2019-09-22 04:19:09 +02:00
sphere
f8c97aeb27 Tweak bubble grabbing behavior. 2019-09-22 04:05:22 +02:00
toaster
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
toaster
c36123aa56 Mark new-style log names as loaded. 2019-09-20 17:43:41 +01:00
Alam Ed Arias
9b4f1b60b9 Merge branch 'public_next' into private 2019-09-20 12:33:34 -04:00
Alam Ed Arias
bf28a7f5bc Merge branch 'master' into next 2019-09-20 12:32:32 -04:00
Alam Ed Arias
92779487a4 avoid the source code from getting the wrong EOL 2019-09-20 12:32:18 -04:00
toaster
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
Alam Ed Arias
8d3d5566b8 Undo file mode change on menu files 2019-09-20 12:18:57 -04:00
toaster
7da89e3bc9 Merge branch 'camerafix' into 'master' 
Camera fixes

Closes #105

See merge request STJr/SRB2Internal!303
 2019-09-20 11:51:30 -04:00
toaster
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
toaster
661966ced6 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into new_algae 2019-09-20 16:45:06 +01:00
toaster
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
toaster
20d098de8f Merge branch 'betterdirs' into 'master' 
Better directory structure

See merge request STJr/SRB2Internal!321
 2019-09-20 11:36:56 -04:00
toaster
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
toaster
d59c02fc0b Merge branch 'timerfix' into 'master' 
Timerres fix

Closes #213

See merge request STJr/SRB2Internal!338
 2019-09-20 11:34:50 -04:00
toaster
35803d74cc Merge branch 'camerafix-menu' into 'camerafix' 
Camera Options submenu

See merge request STJr/SRB2Internal!337
 2019-09-20 11:34:26 -04:00
toaster
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
lachwright
19e0e43e87 test?? 2019-09-20 12:07:57 +08:00
Alam Arias
bf55dd293e Merge remote-tracking branch 'private/master' into flats-png-macro-fix-please-just-work-already 2019-09-19 21:43:57 -04:00
Alam Arias
530b5784b8 platersprite_t is not the same as unsigned 2019-09-19 21:42:59 -04:00
Jaime Passos
322a0b8c41 Merge remote-tracking branch 'origin/master' into flats-png-macro-fix-please-just-work-already 2019-09-19 22:41:45 -03:00
Jaime Passos
ef7e8c5d58 use byteptr.h macros 2019-09-19 22:40:23 -03:00
sphere
4c7a7a7e0b Small DSZ coral tweaks. 2019-09-20 00:51:44 +02:00
lachwright
222d4f2b7c Improved orbital camera in Software; cam_adjust cvars changed to on by default 2019-09-20 02:02:17 +08:00
toaster
802ddf94b1 Always pretend cv_playersforexit is 4 in co-op special stages. 2019-09-19 18:44:55 +01:00
toaster
a3ea2274f4 Fix inconsistency between score tally screen and timerres cvar (Resolves #213). 2019-09-19 17:43:23 +01:00
toaster
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
toaster
ca9e6e31da * Resolve #224 (landing frames on ceiling contact). 
* Fix some other landing weirdness with CA_BOUNCE.
 2019-09-19 13:20:05 +01:00
toaster
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
toaster
c2f7b14336 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into playerfixes 2019-09-19 12:00:55 +01:00
lachwright
5015f8e142 Added Camera Options submenu (provided my files aren't broken again (please D:)) 2019-09-19 17:34:04 +08:00
toaster
0d1dbc8cb8 Merge branch 'painsoundfixes' into 'master' 
Pain sound fixes

See merge request STJr/SRB2Internal!335
 2019-09-18 16:58:50 -04:00
sphere
c81452211d Updated ACZ cacti. 2019-09-18 21:40:33 +02:00
sphere
284ced06ec Merge branch 'master' into new_algae 2019-09-18 20:17:36 +02:00
toaster
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
toaster
4e36cd82d3 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into playerfixes 2019-09-18 17:24:56 +01:00
toaster
a5460c7451 Correct location of MT_CACTI10 and MT_CACTI11 in relation to their positions given in info.h and dehacked.c (fixes several ACZ-related crashes) 2019-09-18 17:24:22 +01:00
toaster
3285cc9a0d Properly scrub the player struct clean between level transitions. (Good chance this fixes our new bug where the player gets stuck in their standing pose when the map begins..?) 2019-09-18 16:06:13 +01:00
toaster
2ed9d957b0 Fix Knuckles being able to climb up solid midtextures by repeatedly gliding at them. (addresses #174 checkbox 2) 2019-09-18 15:26:21 +01:00
toaster
5d37ddd676 Change threshold on autobrake skidding sound/animaton to runspeed rather than half of runspeed. 2019-09-18 14:16:52 +01:00
toaster
a8a8ae0d0b Only set flight time to 0 if skin has SPR2_SWIM spriteset. 2019-09-18 14:11:06 +01:00
toaster
e993b8981e Fix solidity of lava in reverse gravity. (Resolves #216) 2019-09-18 13:55:20 +01:00
toaster
9d774f7578 More swim stuff! 
* Prevent being able to damage enemies from below while swimming.
* Make the swim-specific bubbles happen at the hands instead of where the propeller would be.
* Improve placement/angle of swimming tails overlay.
* Immediately set flight time to 0 if a player is being carried underwater.
 2019-09-18 13:46:17 +01:00
toaster
110907a955 Merge branch 'patch-blending-aggregate-return-fix' into 'master' 
Patch blending aggregate return fix

See merge request STJr/SRB2Internal!333
 2019-09-18 08:35:50 -04:00
toaster
6a63802afa Merge branch 'patch-blending-aggregate-return-fix' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into charfixes 2019-09-18 12:46:36 +01:00
toaster
e230d7351c Completely untested cuz I need to commit before I can merge the compile fix, but the intent of this commit is: 
* Fix S_PLAY_FLY_TIRED animation being fast.
* Add moving tails to S_PLAY_SWIM animation!
* Fix autobrake happening when your controls are locked by pw_nocontrol/PF_STASIS. (Resolves #219, hopefully..?)
 2019-09-18 12:46:18 +01:00
toaster
45a99ce318 Change startchar's default value to 0 (Resolves #222). 2019-09-18 12:26:34 +01:00