6545284eaf
Merge branch 'gfz-debris' into 'master'
...
VAdaPEGA's GFZ debris
See merge request STJr/SRB2Internal!505
2019-11-22 15:27:11 -05:00
e9ca39d3bc
Merge branch 'infopoke' into 'master'
...
MS Info packet tweaks (resolves #300 )
Closes #300
See merge request STJr/SRB2Internal!499
2019-11-22 15:21:41 -05:00
ca74636a27
Merge branch 'dsz3target' into 'master'
...
Sea Egg targeting systems online! (resolves #303 )
Closes #303
See merge request STJr/SRB2Internal!501
2019-11-22 14:26:40 -05:00
6f82e5197d
Merge branch 'rollout-bumps' into 'master'
...
Add fun™ to rollout rocks
See merge request STJr/SRB2Internal!504
2019-11-22 14:25:39 -05:00
44fa076698
Merge branch 'radiomode3' into 'master'
...
Fix conditionset-based unlocks on the Sound Test (resolves #312 ).
Closes #312
See merge request STJr/SRB2Internal!508
2019-11-22 14:12:03 -05:00
f7c4ec1965
Merge branch 'mapvisitedupdate' into 'master'
...
Intermission fixes/cleanup
See merge request STJr/SRB2Internal!509
2019-11-22 14:11:31 -05:00
18babe3268
Merge branch 'followghost' into 'master'
...
Followmobj Record Attack fix (resolves #322 ).
Closes #322
See merge request STJr/SRB2Internal!510
2019-11-22 14:10:59 -05:00
e351d629bd
Merge branch 'playersall' into 'master'
...
Players All reliability fix (resolves #301 and #315 )
Closes #301 and #315
See merge request STJr/SRB2Internal!500
2019-11-22 14:10:39 -05:00
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
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
143d4aa053
Move all the visitation/emblems/record attack update stuff into a single function, and call that function in two different places depending on whether the tally screen is visited or not.
2019-11-21 23:38:33 +00:00
3798e886ea
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into mapvisitedupdate
2019-11-21 23:16:06 +00:00
990d9ed40c
Correct location of followmobj scale write to match read ( resolves #322 ).
...
Requires deleting all of RC1's Record Attack replays with followmobj characters, but I think you'll agree that's a reasonable price to pay.
2019-11-21 22:50:04 +00:00
7ff616b26e
Do a whole bunch of cleanup for mapvisited and intermission related things.
...
* Move the visitation flags, Record Attack/NiGHTS Attack data, and emblem checking to outside of Y_StartIntermission.
* Y_CleanupScreenBuffer never got called for maps which skip the intermission, leading to a small memory leak; this is now fixed by moving it to G_AfterIntermission.
* Y_FollowIntermission was just G_AfterIntermission with modeattacking specific behaviour, but this is desired for all places where G_AfterIntermission is called, so just merge this into G_AfterIntermission.
Notably, these changes are necessary because there are now three maps in the main SP campaign which do not end with traditional intermissions. As a result, this fixes an issue where Black Core's tracks are not available in the Sound Test (due to MV_BEATEN never being applied).
Also, since I was here: Remove "gotperfect" from recorddata_t. This is a duplicate of `mapvisited[gamemap-1] & MV_PERFECT` which uses more memory. I have kept the new spacing in the gamedata for compatibility with RC1 savedatas, but moved it across to the original method everywhere else.
2019-11-21 16:10:28 +00:00
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
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
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
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
7c7eec4b9a
Fix conditionset-based unlocks on the Sound Test.
2019-11-21 13:12:54 +00:00
248306ccb0
Remove D_ProcessEvents call in G_PreLevelTitleCard
2019-11-21 02:16:09 -03:00
35f2572e29
Correct sound for GFZ debris (copy-paste oversight)
2019-11-21 01:26:53 +08:00
c5d085d333
Add missing GFZD spriteset
2019-11-21 01:14:24 +08:00
ac3924c9c8
Add GFZ debris; reorganize wood debris index
2019-11-21 01:05:22 +08:00
cdc7a88b04
Add bump sounds to rollout rock & add Newton's third law to jumping off them
2019-11-20 23:45:34 +08:00
abf0c5e632
resolve #315
2019-11-20 14:34:19 +00:00
e0a9b3d695
Merge remote-tracking branch 'origin/subtitlesubterfuge' into remove-unused-levelwipes
2019-11-19 21:49:45 -03:00
6ffb18c4b1
Warn if gametype number is out of range to map command
2019-11-19 12:32:02 -08:00
9b96964cbb
Check for out of range gametype on map change
2019-11-19 12:25:50 -08:00
7645d0417a
Further cleanup.
2019-11-19 20:24:44 +00:00
c5d73e37bb
Fix strcasestr SIGSEGV in the case of only upper case strchr returning NULL
2019-11-19 11:16:17 -08:00
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
2bba25c1e1
As selected by Nev3r, implement option 2: Proximity Bastard for the Sea Egg to resolve #303 .
2019-11-19 15:59:24 +00:00
86f343b84b
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
f5885f84f0
lmao how did i forget a null terminator
2019-11-19 13:40:07 +00:00
ef1aeb2ff6
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
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
2ac44240db
Fix the coords of the subtitle.
2019-11-19 12:59:01 +00:00
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
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
99d4db956c
change vertical alignment
2019-11-18 21:45:30 -03:00
8de7ff0c86
fix subttl
2019-11-18 21:44:02 -03:00
1db9e312a6
P_MobjFlip does not return boolean
2019-11-18 15:55:21 -08:00
f3e66f7b58
dist is unused
2019-11-18 15:53:30 -08:00
1febf8cb4b
Mixed code...
2019-11-18 15:52:14 -08:00
eefc285b5c
locvars not needed
2019-11-18 15:48:29 -08:00
8de06a93f9
remove UINT8 wipecolorfill
2019-11-18 20:07:37 -03:00
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
1e4060af8c
remove unused levelwipes
2019-11-18 19:22:46 -03:00
3df0afb7db
Merge branch 'f_wipes' into 'master'
...
Colormapped fades
See merge request STJr/SRB2Internal!469
2019-11-18 17:21:09 -05:00
7dc3484e5d
Merge branch 'dragonbomber' into 'master'
...
Dragonbomber
See merge request STJr/SRB2Internal!489
2019-11-18 17:10:30 -05:00
MascaraSnake