lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
7,866 Commits 1 Branch 29 Tags 122 MiB
Commit Graph

7866 Commits

Author SHA1 Message Date
Monster Iestyn d1d1098f7c fix object type restrictions for popping monitors 
(MT_BOUNCERING to MT_GRENADERING are actually the ammo pickups, MT_THROWNBOUNCE to MT_THROWNGRENADE are what actually want here)
 2019-11-19 12:31:20 -05:00
MascaraSnake fe1bb6f716 Merge branch 'bot-flip-mistyped' into 'master' 
Bot's `flip` variable is declared the wrong type

See merge request STJr/SRB2Internal!496
 2019-11-19 02:50:44 -05:00
James R 1db9e312a6 P_MobjFlip does not return boolean 2019-11-18 15:55:21 -08:00
James R f3e66f7b58 dist is unused 2019-11-18 15:53:30 -08:00
James R 1febf8cb4b Mixed code... 2019-11-18 15:52:14 -08:00
James R eefc285b5c locvars not needed 2019-11-18 15:48:29 -08:00
MascaraSnake 2418e33a00 Merge branch 'cobalt-ai' into 'master' 
CobaltBW's Tails AI

See merge request STJr/SRB2Internal!358
 2019-11-18 17:26:28 -05:00
MascaraSnake 3df0afb7db Merge branch 'f_wipes' into 'master' 
Colormapped fades

See merge request STJr/SRB2Internal!469
 2019-11-18 17:21:09 -05:00
MascaraSnake 7dc3484e5d Merge branch 'dragonbomber' into 'master' 
Dragonbomber

See merge request STJr/SRB2Internal!489
 2019-11-18 17:10:30 -05:00
Jaime Passos 1698e2d986 adjust duration 2019-11-18 19:08:04 -03:00
Jaime Passos 8a05afa1aa Merge remote-tracking branch 'origin/master' into f_wipes 2019-11-18 18:48:19 -03:00
toaster 1fdcc270d8 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into cobalt-ai 
# Conflicts:
#	src/p_map.c
 2019-11-18 21:33:51 +00:00
MascaraSnake 8adc5bd876 Merge branch 'titlecards' into 'master' 
Titlecards

See merge request STJr/SRB2Internal!492
 2019-11-18 16:22:32 -05:00
MascaraSnake 1365ef49b3 Merge branch 'jester-fireball' into 'master' 
Mario fireball by Jester (resolves #296)

Closes #296

See merge request STJr/SRB2Internal!487
 2019-11-18 15:56:33 -05:00
Jaime Passos aa659836ee Merge remote-tracking branch 'origin/master' into titlecards 2019-11-18 17:55:47 -03:00
Steel Titanium 8d9ef84970
Merge branch 'master' of git.magicalgirl.moe:STJr/SRB2Internal 2019-11-18 15:41:57 -05:00
MascaraSnake baaec6f191 Merge branch 'nightstail' into 'master' 
NiGHTS tail

See merge request STJr/SRB2Internal!482
 2019-11-18 15:41:52 -05:00
Steel Titanium efac76f833
Merge branch 'public_next' into 'master' 2019-11-18 15:39:41 -05:00
MascaraSnake 2001cad144 Merge branch 'capsuletweaks' into 'master' 
Egg Capsule tweaks

See merge request STJr/SRB2Internal!474
 2019-11-18 15:24:13 -05:00
MascaraSnake 1210545a8e Merge branch 'fhzenemytweaks' into 'master' 
Hardcode DrT's FHZ improvements (resolves #295).

Closes #295

See merge request STJr/SRB2Internal!483
 2019-11-18 15:21:59 -05:00
MascaraSnake 7a48a8d72d Merge branch 'poledance' into 'master' 
Make ACZ3's slapstick signpost taller (resolves #267).

Closes #267

See merge request STJr/SRB2Internal!473
 2019-11-18 15:14:48 -05:00
MascaraSnake 233ff8bd27 Merge branch 'exit-move-lj' into 'master' 
Post-exit movement

See merge request STJr/SRB2Internal!486
 2019-11-18 15:10:15 -05:00
MascaraSnake 5649365c19 Merge branch 'titlecard-lowercase-support' into 'master' 
Lowercase support in titlecards

See merge request STJr/SRB2Internal!481
 2019-11-18 15:05:02 -05:00
MascaraSnake 98f2ee598d Merge branch 'endingmus' into 'master' 
Ending music and associated

See merge request STJr/SRB2Internal!475
 2019-11-18 14:33:22 -05:00
toaster 508fdb493b compilation fixes (no review yet, currently just about to have dinner) 2019-11-18 19:22:51 +00:00
MascaraSnake 3e7e749327 Merge branch 'reset-rollangle' into 'master' 
Reset rollangle

See merge request STJr/SRB2Internal!494
 2019-11-18 14:11:32 -05:00
MascaraSnake 881524a2d7 Merge branch 'signpost-cleanup' into 'master' 
Signpost camera cleanup

See merge request STJr/SRB2Internal!490
 2019-11-18 14:00:05 -05:00
MascaraSnake 778543af08 Merge branch 'pingimprovements' into 'master' 
Better ping implementation.

See merge request STJr/SRB2Internal!488
 2019-11-18 13:58:41 -05:00
MascaraSnake dbdbc116c7 Merge branch 'metalbwarp' into 'master' 
Fix Metal Sonic not correctly flipping with gravity (Resolve #289).

Closes #289

See merge request STJr/SRB2Internal!472
 2019-11-18 13:39:22 -05:00
Jaime Passos dc70a24b30 restore zigzags 2019-11-18 15:32:48 -03:00
Jaime Passos b7f2b74d9a V_PERPLAYER did exactly what I did not want it to do so I'll disable these elements 2019-11-18 15:18:27 -03:00
Jaime Passos 29792c7a2b missing prototype 2019-11-18 15:13:31 -03:00
Jaime Passos cf24b57d8f perplayer 2019-11-18 15:12:55 -03:00
Jaime Passos 5c55c86dd2 invert conditional 2019-11-18 15:06:07 -03:00
MascaraSnake 9da5932d88 Merge branch 'damnnothere' into 'master' 
Disable the GL sprite shadows behind a #define.

See merge request STJr/SRB2Internal!485
 2019-11-18 13:05:43 -05:00
MascaraSnake 535aa79418 Merge branch 'firefuck' into 'master' 
Firefuck (resolves #291).

Closes #291

See merge request STJr/SRB2Internal!476
 2019-11-18 13:05:00 -05:00
Jaime Passos 85f1b847e9 LF_WARNINGTITLE 2019-11-18 15:04:40 -03:00
MascaraSnake 3e7242af3c Merge branch 'papersign3' into 'master' 
I fucked up papersigns (Resolve #288).

Closes #288

See merge request STJr/SRB2Internal!471
 2019-11-18 13:03:46 -05:00
Jaime Passos 444953d0bb oh sh 2019-11-18 14:32:34 -03:00
Jaime Passos 6920d20a0f map header option 2019-11-18 14:08:47 -03:00
Jaime Passos e40bf85a6f lua 2019-11-18 13:50:44 -03:00
Jaime Passos 4ea3513076 Organize 2019-11-18 12:56:41 -03:00
lachwright f786a8dbf6 Important fixes & mine lob speed reduction 2019-11-18 22:57:26 +08:00
Jaime Passos 9d17614c55 arg 2019-11-18 11:42:45 -03:00
Jaime Passos 6c98dde736 stuff 2019-11-18 11:39:54 -03:00
lachwright 280d151d76 Allow positive momentum retention when jumping off rollout rocks 2019-11-18 22:36:25 +08:00
lachwright 27fcaf0f93 Whoops, deleted a little too much by accident 2019-11-18 16:26:15 +08:00
lachwright 4c432c376e Make camera use signpost's ground z coordinate instead of the player's z coordinate 2019-11-18 16:22:12 +08:00
lachwright f682de3f1b Fix controllable flight ending when player hits the ground while being carried by Tailsbot 2019-11-18 15:55:55 +08:00
lachwright bb67b24143 Add flight indicator 2019-11-18 15:17:27 +08:00