2eb8e6be49
...why is Metal overwriting his movecount to spawn explosions?
2019-11-30 14:37:21 +00:00
6613286f1c
Fix intro's BRITEGG/DARKEGG scale
2019-11-30 22:07:21 +08:00
e664e8b7f3
Merge branch 'jumphood' into 'master'
...
Jumphood
See merge request STJr/SRB2Internal!573
2019-11-30 06:53:15 -05:00
d46f022837
Restore spindash sounds to DSSPNDSH
2019-11-30 19:30:58 +08:00
85e3180056
Make the fling always occur, and only have the horizontal momentum apply if not MTF_EXTRA.
2019-11-30 10:31:18 +00:00
0d4158bbd0
Fix the flung Brak not being removed on deathpits.
2019-11-30 10:29:51 +00:00
0d433b9e51
Merge branch 'brakyeet' into 'master'
...
This Black Eggman? ***YEET*** (resolves #399 )
Closes #399
See merge request STJr/SRB2Internal!575
2019-11-30 05:21:55 -05:00
b22e8c809f
Merge branch 'goldstatue' into 'master'
...
Gold statue MTF_EXTRA
See merge request STJr/SRB2Internal!576
2019-11-30 05:19:27 -05:00
c2bd91af50
Discovered this was wrong when working on the config for brakyeet, MS objected to the hack so he's updating the tutorial map accordingly.
2019-11-30 10:12:45 +00:00
23b0b03d4d
Merge branch 'spd' into 'master'
...
Deton alert sound
See merge request STJr/SRB2Internal!491
2019-11-30 05:04:10 -05:00
c72f501042
Merge branch 'sandtnoflip' into 'master'
...
S&T no flip
See merge request STJr/SRB2Internal!571
2019-11-30 05:03:07 -05:00
6bbc412eac
Merge branch 'finalcountdown' into 'master'
...
The final countdown (resolves #400 ).
Closes #400
See merge request STJr/SRB2Internal!574
2019-11-30 04:03:07 -05:00
8a3c7da1d2
Merge branch 'mapinter' into 'master'
...
Intermission Buffer Clear On Map Command (no funny name today)
See merge request STJr/SRB2Internal!570
2019-11-30 04:02:44 -05:00
3bddd4365a
Merge branch 'newintro' into 'master'
...
New intro graphics
See merge request STJr/SRB2Internal!524
2019-11-30 04:01:51 -05:00
916fec2c41
Make INTRO4 display at high res
2019-11-30 12:31:23 +08:00
d88eef3e95
Merge branch 'master' into newintro
2019-11-30 12:30:12 +08:00
339907fd5d
This Black Eggman? ***YEET***
...
Resolve issue #399 in the silliest way possible: by having Brak be yeeted off the platform by an explosion at his feet, preventing the downed mech from being anywhere near the escape pod.
2019-11-29 21:55:25 +00:00
fdcc8c912a
Actually, wait; this is way better and cleaner.
2019-11-29 20:41:13 +00:00
ed0529b9d5
Match final countdown timer to timer ( resolves #400 ).
2019-11-29 20:35:59 +00:00
0db38d213b
Make Cobalt-picked sound effect audible from far away, like the original.
2019-11-29 20:04:14 +00:00
de34298bbd
Merge branch 'master' into spd
2019-11-29 19:19:55 +00:00
1fa87611f7
Give the Robo-Hood a cute jump sound whenever it's fleeing you.
2019-11-29 19:18:05 +00:00
92f8c002f3
Prevent exit sectors having any effect whatsoever outside of platform gametypes ( resolve #396 ).
2019-11-29 19:11:17 +00:00
960ee7fe72
Don't flip P1 of a two-character save card, for aesthetique reasons.
2019-11-29 15:58:37 +00:00
cbc49882bc
Fix screen buffer not being cleared if a map command is used during the intermission.
2019-11-29 15:25:55 +00:00
bc00380aa4
Merge branch 'endelinger' into 'master'
...
Endelinger (resolves #384 ).
Closes #384
See merge request STJr/SRB2Internal!569
2019-11-28 16:10:04 -05:00
ebcb17d607
Merge branch 'sleepwalkin' into 'master'
...
Sleepwalkin (resolves most of #382 )
Closes #382
See merge request STJr/SRB2Internal!567
2019-11-28 16:08:40 -05:00
ccbb122143
Holy shit
2019-11-28 12:10:57 -08:00
2495e58bdb
Merge branch 'campokes' into 'master'
...
Camera pokes (resolves #359 , #363 , and #383 ).
Closes #359 , #363 , and #383
See merge request STJr/SRB2Internal!566
2019-11-28 14:21:18 -05:00
f5dd0c5c3b
Update ending cutscene(s) to linger for an additional two seconds, so that the music can properly fade out ( resolves #384 ).
2019-11-28 19:11:12 +00:00
546c54b390
Merge branch 'mpspecfix2' into 'master'
...
Counting spheres (resolves #378 ).
Closes #378
See merge request STJr/SRB2Internal!564
2019-11-28 13:54:47 -05:00
ec69195fc9
Keep counting players as finished even after dying
2019-11-27 17:32:02 +01:00
803b22a3e7
Change required for Tails' tails to behave like falling sprite.
2019-11-27 13:54:13 +00:00
7ff218efaf
Change SPR_NFLT default to superised SPR2_FALL (resolves code side of #382 ).
2019-11-27 13:47:38 +00:00
ae84246721
Fix camera not being flipped when camera is stopped due to game design hack reasons ( resolves #383 ).
2019-11-27 13:37:03 +00:00
c29540a201
Merge branch 'exit-move-lj' into 'master'
...
No more drowning with exitmove now.
See merge request STJr/SRB2Internal!563
2019-11-27 08:17:22 -05:00
bcbf5e7c38
Correct tutorialmode case doubling up on camerascale.
2019-11-27 12:54:00 +00:00
7ff4a9b1e7
Make camerascale have no effect in 2D mode ( resolves #359 and resolves #363 ).
2019-11-27 12:31:23 +00:00
a3050063cd
Resolve #378 , because I knew as soon as I saw that issue name that it was my fault.
2019-11-27 09:03:21 +00:00
9a1dd06776
Merge branch 'continuequestionmark' into 'master'
...
Continue?
See merge request STJr/SRB2Internal!562
2019-11-26 17:24:25 -05:00
c8c52315fa
Merge branch 'burningpoint' into 'master'
...
Burning points (resolves #373 ).
Closes #373
See merge request STJr/SRB2Internal!561
2019-11-26 17:24:22 -05:00
3aa72c5553
Merge branch 'ballstuck' into 'master'
...
BALL STUCK!! BALL!!!! STUCK!!!!!! (Resolve #374 )
Closes #374
See merge request STJr/SRB2Internal!560
2019-11-26 17:24:20 -05:00
07afb52a2a
Merge branch 'deadstuff' into 'master'
...
Matters of mortality
See merge request STJr/SRB2Internal!558
2019-11-26 17:24:17 -05:00
b98b56670e
Merge branch 'bottweaks' into 'master'
...
Bot fixes
See merge request STJr/SRB2Internal!557
2019-11-26 17:24:15 -05:00
e49e91c355
Merge branch 'unslide' into 'master'
...
Unslide (resolves #369 ).
Closes #369
See merge request STJr/SRB2Internal!556
2019-11-26 17:24:12 -05:00
c55a6cb3f8
MascaraSnake is a bully and will make a pariah out of me in front of his doctoral student colleagues if I don't change this
2019-11-26 17:10:59 -05:00
d56a117a93
Now we have mixed case level title font, and since we had a question mark graphic in that for a while, make the continue screen a tad nicer.
2019-11-26 18:25:36 +00:00
fa01a32a7f
Move the fireball despawn to later so its target/tracer isn't nulled until AFTER the enemy it touches is killed, allowing for correct point delivery ( resolves #373 ).
2019-11-26 17:56:42 +00:00
613ae0c9f8
Resolve #374 .
2019-11-26 17:06:30 +00:00
f50feb1639
Change the default value of cv_coopstarposts (as per #321 ), and make it NOT a cheat to change since the other options are in effect more restrictive. (Leaving cv_cooplives at its current value for now, though.)
2019-11-26 12:37:57 +00:00
b71cf97cac
* Prevent that GOD AWFUL random camera turn that happens sometimes during the fade after you die (when you input camera turn stuff after death) by locking the camera during PST_REBORN.
...
* Remove whitespace in P_DeathThink.
2019-11-26 12:33:56 +00:00
f1387a07a1
Instead of making conditions which check for death individually check for special stages to prevent lives loss, just set G_GametypeUsesLives to false in a special stage.
2019-11-26 12:30:32 +00:00
6ac44415fb
Make P_CanPickupItem check whether Sonic is in a state to recieve it when Tailsbot tries to get it.
...
Specfically, this fixes the case where Sonic runs into something hazardous and spills his rings, but Tailsbot is immediately behind and ends up picking them all up the tic before they also get hurt.
2019-11-26 11:55:31 +00:00
e8b3f84741
Prevent Tailsbot from considering flight when Sonic is exiting.
2019-11-26 11:53:49 +00:00
1dee1da7e3
Fix issue where you can get stuck in pain frames after stepping up, or after sliding ( resolves #369 ).
2019-11-26 10:11:52 +00:00
67d0499903
Fix stuck closed captioning
2019-11-25 20:16:17 -03:00
05ee9c8a21
Merge branch 'paperslid' into 'master'
...
SMOOTH PAPERCOLLISION TIME!!!!!!!!
Closes #273
See merge request STJr/SRB2Internal!554
2019-11-25 17:07:56 -05:00
4c1c87df39
Merge branch 'xtrafix' into 'master'
...
Stop being so XTRA (resolves #362 ).
Closes #362
See merge request STJr/SRB2Internal!552
2019-11-25 17:02:32 -05:00
34baf101aa
Merge branch 'nightsnoforce' into 'master'
...
Charsel tweaks
See merge request STJr/SRB2Internal!551
2019-11-25 16:54:27 -05:00
1128660c5c
Merge branch 'fix-play-sfx-exec-part2' into 'master'
...
Fix the "play sound from nowhere as long as you're in the tagged areas" behavior
See merge request STJr/SRB2Internal!553
2019-11-25 16:54:08 -05:00
73bb913ec9
Merge branch 'paperprojection' into 'master'
...
Papersprite projection tweak
See merge request STJr/SRB2Internal!535
2019-11-25 16:53:48 -05:00
858df0c704
Merge branch 'charlock' into 'master'
...
Charlock (resolves #345 ).
Closes #345
See merge request STJr/SRB2Internal!528
2019-11-25 16:44:38 -05:00
f1584efe80
Merge branch 'unglue-metalsonic' into 'master'
...
Unglue Metal Sonic after floating onto a platform
Closes #344
See merge request STJr/SRB2Internal!526
2019-11-25 16:44:18 -05:00
8adcea56c3
Merge branch 'minusflip' into 'master'
...
Have Minus rotate in mid-air
Closes #326
See merge request STJr/SRB2Internal!532
2019-11-25 16:43:49 -05:00
aaea0f095c
Merge branch 'knuxstuff' into 'master'
...
Minor Knuckles fixes
See merge request STJr/SRB2Internal!527
2019-11-25 16:41:56 -05:00
f54eeb82b7
-Fix player being able to push up spikes
...
-Minor tweaks to make paper collision slightly more reliable
2019-11-25 22:35:40 +01:00
64cda33d6d
SMOOTH PAPERCOLLISION TIME!!!!!!!!
...
resolves #273 , damn i feel good
2019-11-25 20:12:42 +00:00
1b360d2cd8
Fix the "play from nowhere as long as you're in the tagged areas" behavior in the Play Sound line executor.
2019-11-25 20:30:06 +01:00
ef556ca6d5
Fix Continue sprites not working for custom characters (incorrect SPR2_XTRA bounds check).
...
Also, change all the references to XTRA_ constants to consistently check for > its value, instead of >= its value plus one (or that there's any frames at all) - for extra clarity/consistency, and capacity for re-ordering later.
2019-11-25 18:52:38 +00:00
8596445de6
Merge branch 'statisticase' into 'master'
...
Statisticase (resolves #339 ).
Closes #339
See merge request STJr/SRB2Internal!531
2019-11-25 13:21:09 -05:00
3a12c13e50
Merge branch 'nightsmode-menu-fix' into 'master'
...
Fix time emblem overlapping best time on NiGHTS Mode menu (Resolves #353 )
Closes #353
See merge request STJr/SRB2Internal!539
2019-11-25 13:20:31 -05:00
e48f4170fc
Merge branch 'springroll' into 'master'
...
Spring roll (Resolves #336 ).
Closes #336
See merge request STJr/SRB2Internal!543
2019-11-25 13:20:16 -05:00
bdc0075ee0
Merge branch 'speclook' into 'master'
...
Speclook (resolves #340 ).
Closes #340
See merge request STJr/SRB2Internal!529
2019-11-25 13:20:00 -05:00
406ff44bae
Merge branch 'speedingofftocorner' into 'master'
...
Fix "Speeding off to..." placement in non-green resolutions
See merge request STJr/SRB2Internal!549
2019-11-25 13:12:04 -05:00
0cc5d35308
Merge branch 'reversesmash' into 'master'
...
Spikes and gravity (resolves #348 ).
Closes #348
See merge request STJr/SRB2Internal!541
2019-11-25 13:11:48 -05:00
31af9107e3
Merge branch 'lavafall-firedamage' into 'master'
...
Give RVZ lavafalls fire damage (resolves #352 )
Closes #352
See merge request STJr/SRB2Internal!540
2019-11-25 13:09:18 -05:00
66c46bb3ea
Merge branch 'mapisnowZONE' into 'master'
...
Map is now ZONE
See merge request STJr/SRB2Internal!548
2019-11-25 13:08:01 -05:00
69c41c5013
Merge branch 'bashfix' into 'master'
...
Fixed crash when BASH's target disappears during chasing
Closes #341
See merge request STJr/SRB2Internal!525
2019-11-25 13:06:16 -05:00
1892ab0de5
Merge branch 'tutboxgl' into 'master'
...
Tutorial Prompt in GL (resolves #349 ).
Closes #349
See merge request STJr/SRB2Internal!544
2019-11-25 13:05:46 -05:00
9541137f5e
Merge branch 'join-bug-fix' into 'master'
...
Fix for the join bug
Closes #302 , #338 , and #347
See merge request STJr/SRB2Internal!545
2019-11-25 12:58:48 -05:00
6c453ebf6e
Merge branch 'mpspecialfixes' into 'join-bug-fix'
...
MP Special Stage fixes (resolves #347 ).
See merge request STJr/SRB2Internal!546
2019-11-25 12:56:22 -05:00
f86b46640d
Skip character select entirely if only one character is available on the list.
2019-11-25 17:06:06 +00:00
fc407cf6ce
Skip tagteam characters (ie, Sonic&Tails) for NiGHTS secret map character selection.
2019-11-25 16:55:18 +00:00
5cf803f7d0
Allow character select for NiGHTS stages on the Secret Level Select now that every character has NiGHTS sprites.
...
(think of this as the collorary to 358, not a direct change)
2019-11-25 16:46:26 +00:00
404d09e35a
Do not focus the camera on the end sign if exitmove is active
2019-11-25 17:23:35 +01:00
f7ede3b313
Merge branch 'master' into unglue-metalsonic
2019-11-26 00:20:47 +08:00
287e8133bb
Add comment
2019-11-26 00:20:43 +08:00
5719a93211
Fix 'Speeding off to...' placement in non-greeen resolutions
2019-11-26 00:16:46 +08:00
6398779983
Correct two instances where "Zone" is forced uppercase.
2019-11-25 16:04:03 +00:00
2110fa6bd1
Fix extra lives given to game-overed players not re-entering them into the action when cv_coopstarposts is 0.
2019-11-25 14:59:06 +00:00
71e74ca363
Fix a bunch of shit with MP special stages!
...
* Prevent an infinite quantity of Emeralds being spawned when P_GiveEmerald is called while a MP Special Stage is in session (resolves #347 ).
* Fix FuriousFox's ridiculous timer on special stage spawn (mentioned in the comments of the previous issue) by correctly marking spectator players in special stages as finished, and preventing the underflow.
2019-11-25 14:33:15 +00:00
10df92d232
Merge branch 'shhhhhfang' into 'master'
...
Make DSWBREAK a singular sound
See merge request STJr/SRB2Internal!534
2019-11-25 03:00:49 -05:00
9e598f583a
Merge branch 'hwr-cache-fix' into 'master'
...
Fix FreeMipmapColormap crash (resolves #287 and #351 )
Closes #287 and #351
See merge request STJr/SRB2Internal!538
2019-11-25 02:59:07 -05:00
a187460865
Revert "Render title map on connecting to server screen too"
...
This reverts commit b6e145f0c5
2019-11-25 01:09:00 +01:00
82843fc78e
Fix Tutorial prompt being incorrect size in GL ( resolves #349 ).
2019-11-25 00:08:38 +00:00
df5c8e792f
Go from spindash into ordinary roll if player's speed is suddenly above the speed you're allowed to roll at.
2019-11-24 22:55:37 +00:00
74ae5819c4
Account for exiting but non-finished players in G_EnoughPlayersFinished
2019-11-24 23:40:40 +01:00
c0bc46ca9c
A bunch of spike tweaks.
...
* Make it possible to break them in reverse gravity (resolves #348 ) by making the spikes break in a circle around the spike touched, rather than in a circle around the player.
* Fix the spike chunks spawned not being flipped in reverse gravity by using P_SpawnMobjFromMobj.
* Make their breaking sound singular (prevents eardrum destruction).
2019-11-24 22:38:26 +00:00
7b80d509cc
Give RVZ lavafalls fire damage
2019-11-24 23:01:17 +01:00
d4a8fd8e64
Fix time emblem overlapping best time on NiGHTS Mode menu ( Resolves #353 )
2019-11-24 16:37:13 -05:00
c9ff8ec26b
Fix FreeMipmapColormap crash
2019-11-24 17:37:11 -03:00
3594623891
Courteousy of fickle, an adjustment to papersprite rendering that prevents the object's x1 and x2 being slightly off where they should be. Not perfect, but absolutely better than it was!
...
Also, tweak the Minecart segment spawning position, since this was originally placed based on the awkward rendering.
2019-11-24 16:42:13 +00:00
6733a8c38f
Shhhhh, Fang
2019-11-24 23:46:37 +08:00
4e9e5a072f
Have Minus spawn debris upon landing, as suggested
2019-11-24 23:42:27 +08:00
6773b39a40
Woops
2019-11-24 15:19:15 +00:00
9a7979d841
Have Minus rotate in mid-air
2019-11-24 22:29:26 +08:00
508feaad9d
Enable lowercase text for Statistics and Unlockable Checklist menus ( resolves #339 ).
2019-11-24 13:51:53 +00:00
4dfae1a65b
Make cv_exitmove only have effect if gametype is GT_COOP, otherwise immediately exit ( resolves #342 ).
2019-11-24 13:35:37 +00:00
fcfbd403f0
Make mouselook follow the first-person option when a spectator, even when other variables assume you're in third person ( resolves #340 ).
2019-11-24 13:30:49 +00:00
6cc2ca7542
* Resolve #345 .
...
* Prevent skincolours from being reset to the skin's prefcolour, but only for not-always-usable characters.
2019-11-24 13:24:37 +00:00
ccc41c7a8f
Fix elemental stomp activating glide landing after emerging from goop; fix climbing boost-up not scaling properly with player scale
2019-11-24 19:30:20 +08:00
3fa04cb091
Make Metal's vertical float speed technically negative
2019-11-24 18:46:59 +08:00
4be45a5e43
Fixed crash when BASH's target disappears during chasing
2019-11-24 10:22:00 +01:00
23ab807d68
Complete new intro
2019-11-24 15:58:03 +08:00
f2de738b09
Merge branch 'master' into newintro
2019-11-24 13:11:38 +08:00
d99e3f8337
Merge branch 'translucenthud-showfps-fix' into 'master'
...
Title card showfps translucency fix
See merge request STJr/SRB2Internal!522
2019-11-23 18:16:17 -05:00
5fe89e6e9b
Merge branch 'ra-wipe-fix' into 'master'
...
Fix RA fade (resolves #329 )
Closes #329
See merge request STJr/SRB2Internal!521
2019-11-23 18:16:09 -05:00
df50900ac5
Merge branch 'statusbar-stuff' into 'master'
...
No longer allow showhud to toggle FPS counter or ping bar
See merge request STJr/SRB2Internal!523
2019-11-23 18:09:59 -05:00
a24949cfa6
Merge branch 'menu-reordering' into 'master'
...
Menu reordering (also renaming secrets to extras)
See merge request STJr/SRB2Internal!511
2019-11-23 17:51:46 -05:00
33dc443b77
Merge branch 'nightsexitcam' into 'master'
...
NiGHTS exit camera tweak
See merge request STJr/SRB2Internal!519
2019-11-23 17:51:34 -05:00
01f02b142f
Merge branch 'exitcam' into 'master'
...
Exit camera fixes (Resolves #327 ).
Closes #327
See merge request STJr/SRB2Internal!518
2019-11-23 17:51:29 -05:00
9b8b463791
Merge branch 'horizonclimb' into 'master'
...
Horizonclimb (resolves #323 )
Closes #323
See merge request STJr/SRB2Internal!516
2019-11-23 17:51:17 -05:00
cd38173a7b
Merge branch 'superrun' into 'master'
...
Super runspd fix
See merge request STJr/SRB2Internal!515
2019-11-23 17:51:12 -05:00
5715727724
Merge branch 'firefuck2' into 'master'
...
Firefuck II
Closes #310
See merge request STJr/SRB2Internal!512
2019-11-23 17:51:02 -05:00
2a9db29c58
fix showfps with st_translucency
2019-11-23 18:41:28 -03:00
e850d42bc2
fix RA fade
2019-11-23 18:15:09 -03:00
97a87574b2
No longer allow showhud to toggle FPS counter or ping bar
2019-11-23 16:09:02 -05:00
aabddd69f1
Fixed a missing space in the "Speeding off to..." text
2019-11-23 18:51:32 +01:00
90c13effc0
Since I was tired of seeing NiGHTS players bump their head into the ceiling, and since similar camera enhancements have been made for the papersprite sign exit, implement a camera lock when exiting while NiGHTS.
...
https://cdn.discordapp.com/attachments/359091121789468672/647821662003396609/srb20088.gif
2019-11-23 15:40:32 +00:00
ebead10dca
Remove duplicate viewpointx/viewpointy set.
2019-11-23 15:23:42 +00:00
7956584797
Have the vertical aiming focus on the signpost's z rather than continue to focus on the player even while the camera is forced to be near the signpost. ( resolves #327 )
2019-11-23 15:11:24 +00:00
5a63e22f56
It's not safe to store a file-scope pointer to a mobj_t* without having any mechanism to clear it between map reloadings, so move the Tailsbot "press jump now to fly!" indicator into `tails->target`.
...
Resolves #331 , and likely also #330 and #309 .
2019-11-23 14:43:47 +00:00
95ed442d55
Prevent Knuckles latching onto horizon special linedefs.
...
Also, update all references to the horizon special to use a #defined constant instead of a magic number.
2019-11-23 14:20:41 +00:00
4ccb4f5c8a
Merge branch 'crossfade-fix' into 'master'
...
Fix crossfades
See merge request STJr/SRB2Internal!514
2019-11-23 04:14:07 -05:00
dea1ba6568
Merge branch 'master' into signpost-cleanup
2019-11-23 07:05:45 +08:00
0f164301e1
Do Cobalt's suggestion, because this branch wasn't gonna get merged in its original state anyways.
2019-11-22 16:27:22 -05:00
2c85aa9f69
Merge branch 'drtminus' into 'master'
...
drt minus
See merge request STJr/SRB2Internal!495
2019-11-22 16:09:58 -05:00
5611f8eff4
I was reading the Sonic 3 Unlocked blog by NeoHazard when I came across a very interesting post.
...
https://s3unlocked.blogspot.com/2017/12/over-threshold.html
It turns out that in Sonic 3 & Knuckles, the threshold for crossing into the super animation is increased compared to normal gameplay. This makes a lot of sense - however, both Sonic Mania and the Taxman/Stealth mobile remakes missed this. I quickly tested and confirmed that SRB2 had the same issue, so here's the fix.
2019-11-22 21:06:25 +00:00
b24c709206
clarify comment
2019-11-22 17:50:05 -03:00
faa305a2f2
Fix crossfades
...
Fixes NoReload using the wrong wipestyle.
Also fixes non-titlemap title screen wipes using the wrong wipestyle.
2019-11-22 17:44:42 -03:00
227f69f063
fix missing mmx check
2019-11-22 17:30:53 -03:00
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
de2a26bf5d
Swap statistics and tutorial options in the 1 Player menu.
2019-11-22 21:00:03 +01:00
c8c5237540
Resolve #310 .
2019-11-22 19:51:27 +00:00
07221c50ce
i'm a dumbass
2019-11-22 20:37:35 +01: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
e3aca4b647
restore secrets = 0, not sure why i changed that
2019-11-22 20:24:57 +01: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
3e1c3b04e7
WIP intro graphics update
2019-11-22 20:08:23 +08:00
514394a4f3
fuck autocomplete
2019-11-22 04:12:38 +01: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
5a7ebb3ba6
Re-reorganize sound options.
2019-11-21 16:53:37 +01:00
b37c3a414a
Remove unneeded HAVE_MIXERX checks.
2019-11-21 16:35:27 +01: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
f021d35e7e
Move tutorial to the bottom of the 1 Player menu.
2019-11-21 02:43:07 +01:00
74987beb1f
Reword some evaluation sentences.
2019-11-21 02:24:12 +01:00
48c454553f
Move SP and MP down if extras aren't unlocked yet.
2019-11-21 02:19:31 +01:00
9608021824
Rename "secrets" to "extras".
2019-11-21 01:34:32 +01:00
f587069d0e
Reorganize sound options.
2019-11-21 01:14:09 +01:00
2d509eff47
Move the main menu options around.
2019-11-21 00:34:58 +01: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
cde56dbe6c
WIP fix signpost issues with exitmove
2019-11-20 21:02:34 +08:00
e0a9b3d695
Merge remote-tracking branch 'origin/subtitlesubterfuge' into remove-unused-levelwipes
2019-11-19 21:49:45 -03:00
032f53ce07
Prevent drowning after completing the level
2019-11-19 22:44:33 +01: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
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
1698e2d986
adjust duration
2019-11-18 19:08:04 -03:00
5eaa3fc3f8
Left this in by mistake.
2019-11-18 22:07:29 +00:00
ab70512253
As requested by MotorRoach and doublechecked with MascaraSnake, DrT's Minus resprite.
2019-11-18 22:05:05 +00:00
8a05afa1aa
Merge remote-tracking branch 'origin/master' into f_wipes
2019-11-18 18:48:19 -03:00
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
8adc5bd876
Merge branch 'titlecards' into 'master'
...
Titlecards
See merge request STJr/SRB2Internal!492
2019-11-18 16:22:32 -05:00
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
aa659836ee
Merge remote-tracking branch 'origin/master' into titlecards
2019-11-18 17:55:47 -03:00
8d9ef84970
Merge branch 'master' of git.magicalgirl.moe:STJr/SRB2Internal
2019-11-18 15:41:57 -05:00
baaec6f191
Merge branch 'nightstail' into 'master'
...
NiGHTS tail
See merge request STJr/SRB2Internal!482
2019-11-18 15:41:52 -05:00
efac76f833
Merge branch 'public_next' into 'master'
2019-11-18 15:39:41 -05:00
2001cad144
Merge branch 'capsuletweaks' into 'master'
...
Egg Capsule tweaks
See merge request STJr/SRB2Internal!474
2019-11-18 15:24:13 -05:00
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
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
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
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
98f2ee598d
Merge branch 'endingmus' into 'master'
...
Ending music and associated
See merge request STJr/SRB2Internal!475
2019-11-18 14:33:22 -05:00
508fdb493b
compilation fixes (no review yet, currently just about to have dinner)
2019-11-18 19:22:51 +00:00
3e7e749327
Merge branch 'reset-rollangle' into 'master'
...
Reset rollangle
See merge request STJr/SRB2Internal!494
2019-11-18 14:11:32 -05:00
881524a2d7
Merge branch 'signpost-cleanup' into 'master'
...
Signpost camera cleanup
See merge request STJr/SRB2Internal!490
2019-11-18 14:00:05 -05:00
778543af08
Merge branch 'pingimprovements' into 'master'
...
Better ping implementation.
See merge request STJr/SRB2Internal!488
2019-11-18 13:58:41 -05:00
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
dc70a24b30
restore zigzags
2019-11-18 15:32:48 -03:00
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
29792c7a2b
missing prototype
2019-11-18 15:13:31 -03:00
cf24b57d8f
perplayer
2019-11-18 15:12:55 -03:00
5c55c86dd2
invert conditional
2019-11-18 15:06:07 -03:00
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
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
85f1b847e9
LF_WARNINGTITLE
2019-11-18 15:04:40 -03:00
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
444953d0bb
oh sh
2019-11-18 14:32:34 -03:00
6920d20a0f
map header option
2019-11-18 14:08:47 -03:00
e40bf85a6f
lua
2019-11-18 13:50:44 -03:00
4ea3513076
Organize
2019-11-18 12:56:41 -03:00
f786a8dbf6
Important fixes & mine lob speed reduction
2019-11-18 22:57:26 +08:00
9d17614c55
arg
2019-11-18 11:42:45 -03:00
6c98dde736
stuff
2019-11-18 11:39:54 -03:00
280d151d76
Allow positive momentum retention when jumping off rollout rocks
2019-11-18 22:36:25 +08:00
0e71edeb50
In the absence of a proper revamp of the badnik, give the Deton the SPB sound from Kart when it sees the player, as a teaching shorthand and/or easter egg.
2019-11-18 13:27:02 +00:00
27fcaf0f93
Whoops, deleted a little too much by accident
2019-11-18 16:26:15 +08:00
4c432c376e
Make camera use signpost's ground z coordinate instead of the player's z coordinate
2019-11-18 16:22:12 +08:00
f682de3f1b
Fix controllable flight ending when player hits the ground while being carried by Tailsbot
2019-11-18 15:55:55 +08:00
bb67b24143
Add flight indicator
2019-11-18 15:17:27 +08:00
toaster
