MascaraSnake
a3a7dc6bed
Merge branch 'remove-unused-levelwipes' into 'master'
...
(Cleanup) Remove unused levelwipes
See merge request STJr/SRB2Internal!507
2019-11-22 09:21:17 -05:00
MascaraSnake
ae8f0b42aa
Merge branch 'titlecard-event-fix' into 'master'
...
Remove D_ProcessEvents call in G_PreLevelTitleCard (resolves #317 )
Closes #317
See merge request STJr/SRB2Internal!506
2019-11-22 09:12:02 -05:00
MascaraSnake
f13e67bf8f
Merge branch 'gametype-out-of-range' into 'master'
...
Prevent gametype changes being out of range
See merge request STJr/SRB2Internal!503
2019-11-21 09:31:05 -05:00
MascaraSnake
9db5c5875c
Merge branch 'hi-lj' into 'master'
...
Fix issue with strcasestr that causes a map command crash
See merge request STJr/SRB2Internal!502
2019-11-21 09:30:18 -05:00
MascaraSnake
f1ab6783c2
Merge branch 'subtitlesubterfuge' into 'master'
...
Subtitle subterfuge (resolves #306 )
Closes #306
See merge request STJr/SRB2Internal!498
2019-11-21 09:29:13 -05:00
MascaraSnake
3b2b8ab80f
Merge branch 'ptzcrash' into 'master'
...
Fix crash in new fireflower (resolves #305 ).
Closes #305
See merge request STJr/SRB2Internal!497
2019-11-21 09:28:35 -05:00
Jaime Passos
248306ccb0
Remove D_ProcessEvents call in G_PreLevelTitleCard
2019-11-21 02:16:09 -03:00
Jaime Passos
e0a9b3d695
Merge remote-tracking branch 'origin/subtitlesubterfuge' into remove-unused-levelwipes
2019-11-19 21:49:45 -03:00
James R
6ffb18c4b1
Warn if gametype number is out of range to map command
2019-11-19 12:32:02 -08:00
James R
9b96964cbb
Check for out of range gametype on map change
2019-11-19 12:25:50 -08:00
James R
c5d73e37bb
Fix strcasestr SIGSEGV in the case of only upper case strchr returning NULL
2019-11-19 11:16:17 -08:00
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
toaster
3add9a9bd2
Make the SPEEDING OFF TO ZONE text that appears while loading:
...
* Use a mixed case "Zone" to match the mixed case level titles.
* Have V_TRANSLUCENT to not stick out too much against pure black/white backgrounds. (Can revert this aspect if necessary, but I think you'll agree it's a good balance between readable and aesthetic.)
2019-11-19 13:00:37 +00:00
toaster
2ac44240db
Fix the coords of the subtitle.
2019-11-19 12:59:01 +00:00
toaster
340e2e48f9
Fix crash in new fireflower. ( resolves #305 )
...
Also, correct indentation on bounce ring fuse since I was here.
2019-11-19 11:53:45 +00: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
Jaime Passos
99d4db956c
change vertical alignment
2019-11-18 21:45:30 -03:00
Jaime Passos
8de7ff0c86
fix subttl
2019-11-18 21:44:02 -03: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
Jaime Passos
8de06a93f9
remove UINT8 wipecolorfill
2019-11-18 20:07:37 -03: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
Jaime Passos
1e4060af8c
remove unused levelwipes
2019-11-18 19:22:46 -03: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
