toaster
2f5ab8df6a
resolve #315
2019-11-20 14:34:19 +00:00
Jaime Passos
bb3958d463
Merge remote-tracking branch 'origin/subtitlesubterfuge' into remove-unused-levelwipes
2019-11-19 21:49:45 -03:00
Louis-Antoine
2db9a95189
Prevent drowning after completing the level
2019-11-19 22:44:33 +01:00
James R
65ce4cab26
Warn if gametype number is out of range to map command
2019-11-19 12:32:02 -08:00
James R
edea7b2a10
Check for out of range gametype on map change
2019-11-19 12:25:50 -08:00
toaster
a76d50025b
Further cleanup.
2019-11-19 20:24:44 +00:00
James R
68253cc460
Fix strcasestr SIGSEGV in the case of only upper case strchr returning NULL
2019-11-19 11:16:17 -08:00
Monster Iestyn
1eedb7d656
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
d5d892004f
As selected by Nev3r, implement option 2: Proximity Bastard for the Sea Egg to resolve #303 .
2019-11-19 15:59:24 +00:00
toaster
0b7d613e60
Make the All Players linedef exectutor activator sector type more reliable for FOFs that span multiple sectors ( resolves #301 ).
2019-11-19 14:09:24 +00:00
toaster
834a36c1ed
lmao how did i forget a null terminator
2019-11-19 13:40:07 +00:00
toaster
17f2e83d4f
MS Info packet tweaks.
...
* Report a completely uppercase map title in SERVERINFO, as per the MS previously expected (resolves #300 ).
* Ignore colour codes in map titles in SERVERINFO, since those now function like with console font.
* Modulo the skin number provided in PLAYERINFO by 3 in DEVELOP builds, so it's safe to test with certain characters on the MS (AS LONG AS IT'S NOT A RELEASE BUILD).
2019-11-19 13:36:33 +00:00
toaster
c2cb2b7a35
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
9aeed5f146
Fix the coords of the subtitle.
2019-11-19 12:59:01 +00:00
toaster
78a946d9eb
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
f18625208b
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
9939e1f775
change vertical alignment
2019-11-18 21:45:30 -03:00
Jaime Passos
51e4153ec0
fix subttl
2019-11-18 21:44:02 -03:00
James R
387a068edf
P_MobjFlip does not return boolean
2019-11-18 15:55:21 -08:00
James R
b57253f8cc
dist is unused
2019-11-18 15:53:30 -08:00
James R
4a963d363e
Mixed code...
2019-11-18 15:52:14 -08:00
James R
5793ba8220
locvars not needed
2019-11-18 15:48:29 -08:00
Jaime Passos
349dab0b4b
remove UINT8 wipecolorfill
2019-11-18 20:07:37 -03:00
MascaraSnake
04fbb5dbd3
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
3ed8470b58
remove unused levelwipes
2019-11-18 19:22:46 -03:00
MascaraSnake
9052105215
Merge branch 'f_wipes' into 'master'
...
Colormapped fades
See merge request STJr/SRB2Internal!469
2019-11-18 17:21:09 -05:00
MascaraSnake
66cc8046a5
Merge branch 'dragonbomber' into 'master'
...
Dragonbomber
See merge request STJr/SRB2Internal!489
2019-11-18 17:10:30 -05:00
Jaime Passos
e30d85e265
adjust duration
2019-11-18 19:08:04 -03:00
toaster
2bfbfc1933
Left this in by mistake.
2019-11-18 22:07:29 +00:00
toaster
420656a716
As requested by MotorRoach and doublechecked with MascaraSnake, DrT's Minus resprite.
2019-11-18 22:05:05 +00:00
Jaime Passos
925940b44e
Merge remote-tracking branch 'origin/master' into f_wipes
2019-11-18 18:48:19 -03:00
toaster
7bcaa5c359
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
2ca069e5ba
Merge branch 'titlecards' into 'master'
...
Titlecards
See merge request STJr/SRB2Internal!492
2019-11-18 16:22:32 -05:00
MascaraSnake
5324107edf
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
8ce00492c2
Merge remote-tracking branch 'origin/master' into titlecards
2019-11-18 17:55:47 -03:00
Steel Titanium
8db5fb30e2
Merge branch 'master' of git.magicalgirl.moe:STJr/SRB2Internal
2019-11-18 15:41:57 -05:00
MascaraSnake
18d0f2bd90
Merge branch 'nightstail' into 'master'
...
NiGHTS tail
See merge request STJr/SRB2Internal!482
2019-11-18 15:41:52 -05:00
Steel Titanium
dc9a09f837
Merge branch 'public_next' into 'master'
2019-11-18 15:39:41 -05:00
MascaraSnake
064d9c2566
Merge branch 'capsuletweaks' into 'master'
...
Egg Capsule tweaks
See merge request STJr/SRB2Internal!474
2019-11-18 15:24:13 -05:00
MascaraSnake
ecd021abdf
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
2df5fd3b30
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
abdfc2d237
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
59af56480e
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
6f8a84b8cc
Merge branch 'endingmus' into 'master'
...
Ending music and associated
See merge request STJr/SRB2Internal!475
2019-11-18 14:33:22 -05:00
toaster
ea8502050b
compilation fixes (no review yet, currently just about to have dinner)
2019-11-18 19:22:51 +00:00
MascaraSnake
269b2be9f7
Merge branch 'reset-rollangle' into 'master'
...
Reset rollangle
See merge request STJr/SRB2Internal!494
2019-11-18 14:11:32 -05:00
MascaraSnake
d7bdcb5f4c
Merge branch 'signpost-cleanup' into 'master'
...
Signpost camera cleanup
See merge request STJr/SRB2Internal!490
2019-11-18 14:00:05 -05:00
MascaraSnake
ccf3be6ad8
Merge branch 'pingimprovements' into 'master'
...
Better ping implementation.
See merge request STJr/SRB2Internal!488
2019-11-18 13:58:41 -05:00
MascaraSnake
0c0b544bcf
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
649d040cfe
restore zigzags
2019-11-18 15:32:48 -03:00
