lachwright
f7ede3b313
Merge branch 'master' into unglue-metalsonic
2019-11-26 00:20:47 +08:00
lachwright
287e8133bb
Add comment
2019-11-26 00:20:43 +08:00
lachwright
5719a93211
Fix 'Speeding off to...' placement in non-greeen resolutions
2019-11-26 00:16:46 +08:00
toaster
6398779983
Correct two instances where "Zone" is forced uppercase.
2019-11-25 16:04:03 +00:00
toaster
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
toaster
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
MascaraSnake
17acec0cd1
Merge branch 'zbskies2' into 'master'
...
More ZB Config Updates (retry)
See merge request STJr/SRB2Internal!537
2019-11-25 03:04:22 -05:00
MascaraSnake
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
MascaraSnake
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
MascaraSnake
9cf7d60288
Merge branch 'exitmove-erz2-fix' into 'master'
...
Account for exiting but non-finished players in G_EnoughPlayersFinished
Closes #354
See merge request STJr/SRB2Internal!542
2019-11-25 02:57:47 -05:00
Louis-Antoine
a187460865
Revert "Render title map on connecting to server screen too"
...
This reverts commit b6e145f0c5
2019-11-25 01:09:00 +01:00
toaster
82843fc78e
Fix Tutorial prompt being incorrect size in GL ( resolves #349 ).
2019-11-25 00:08:38 +00:00
toaster
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
Louis-Antoine
74ae5819c4
Account for exiting but non-finished players in G_EnoughPlayersFinished
2019-11-24 23:40:40 +01:00
toaster
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
MascaraSnake
7b80d509cc
Give RVZ lavafalls fire damage
2019-11-24 23:01:17 +01:00
Steel Titanium
d4a8fd8e64
Fix time emblem overlapping best time on NiGHTS Mode menu ( Resolves #353 )
2019-11-24 16:37:13 -05:00
FuriousFox
b231719eed
Missed a semicolon
2019-11-24 16:09:18 -05:00
FuriousFox
ba69a39802
Updated the list of which skies are associated with which maps, rearranged the list of character to match the character select in-game, and added myself to the file's credits.
...
(Re-did all of this because I think I messed up the branches and stuff last time.
2019-11-24 15:43:49 -05:00
Jaime Passos
c9ff8ec26b
Fix FreeMipmapColormap crash
2019-11-24 17:37:11 -03:00
MascaraSnake
23643e05c0
Merge branch 'racexitmove' into 'master'
...
Racexitmove (resolves #342 ).
Closes #342
See merge request STJr/SRB2Internal!530
2019-11-24 13:15:08 -05:00
MascaraSnake
d4ca1fb6e7
Merge branch 'patch-1' into 'master'
...
ZoneBuilder Config Updates
See merge request STJr/SRB2Internal!520
2019-11-24 13:14:45 -05:00
toaster
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
lachwright
6733a8c38f
Shhhhh, Fang
2019-11-24 23:46:37 +08:00
lachwright
4e9e5a072f
Have Minus spawn debris upon landing, as suggested
2019-11-24 23:42:27 +08:00
toaster
6773b39a40
Woops
2019-11-24 15:19:15 +00:00
lachwright
9a7979d841
Have Minus rotate in mid-air
2019-11-24 22:29:26 +08:00
toaster
508feaad9d
Enable lowercase text for Statistics and Unlockable Checklist menus ( resolves #339 ).
2019-11-24 13:51:53 +00:00
toaster
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
toaster
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
toaster
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
lachwright
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
lachwright
3fa04cb091
Make Metal's vertical float speed technically negative
2019-11-24 18:46:59 +08:00
MascaraSnake
4be45a5e43
Fixed crash when BASH's target disappears during chasing
2019-11-24 10:22:00 +01:00
lachwright
23ab807d68
Complete new intro
2019-11-24 15:58:03 +08:00
lachwright
f2de738b09
Merge branch 'master' into newintro
2019-11-24 13:11:38 +08:00
MascaraSnake
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
MascaraSnake
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
MascaraSnake
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
MascaraSnake
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
MascaraSnake
33dc443b77
Merge branch 'nightsexitcam' into 'master'
...
NiGHTS exit camera tweak
See merge request STJr/SRB2Internal!519
2019-11-23 17:51:34 -05:00
MascaraSnake
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
MascaraSnake
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
MascaraSnake
cd38173a7b
Merge branch 'superrun' into 'master'
...
Super runspd fix
See merge request STJr/SRB2Internal!515
2019-11-23 17:51:12 -05:00
MascaraSnake
5715727724
Merge branch 'firefuck2' into 'master'
...
Firefuck II
Closes #310
See merge request STJr/SRB2Internal!512
2019-11-23 17:51:02 -05:00
Jaime Passos
2a9db29c58
fix showfps with st_translucency
2019-11-23 18:41:28 -03:00
FuriousFox
9b36cc32c9
Added Dragonbomber
2019-11-23 16:37:33 -05:00
Jaime Passos
e850d42bc2
fix RA fade
2019-11-23 18:15:09 -03:00
Steel Titanium
97a87574b2
No longer allow showhud to toggle FPS counter or ping bar
2019-11-23 16:09:02 -05:00
FuriousFox
869764be7d
Added Blue Gargoyle and Green Flame
2019-11-23 15:04:59 -05:00
