stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-12-21 10:20:42 +00:00
Code Issues Projects Releases Packages Wiki Activity
8139 commits 172 branches 41 tags 280 MiB
Commit graph

8139 commits

This branch
This branch
All branches
Author SHA1 Message Date
MascaraSnake
b98b56670e Merge branch 'bottweaks' into 'master' 
Bot fixes

See merge request STJr/SRB2Internal!557
 2019-11-26 17:24:15 -05:00
MascaraSnake
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
toaster
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
toaster
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
toaster
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
toaster
613ae0c9f8 Resolve #374. 2019-11-26 17:06:30 +00:00
MascaraSnake
e48dea4291 Merge branch 'cc-jingles' into 'master' 
Fix stuck closed captioning with no audio

See merge request STJr/SRB2Internal!555
 2019-11-26 08:42:38 -05:00
toaster
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
toaster
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
toaster
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
toaster
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
toaster
e8b3f84741 Prevent Tailsbot from considering flight when Sonic is exiting. 2019-11-26 11:53:49 +00:00
toaster
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
Jaime Passos
67d0499903 Fix stuck closed captioning 2019-11-25 20:16:17 -03:00
MascaraSnake
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
MascaraSnake
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
MascaraSnake
34baf101aa Merge branch 'nightsnoforce' into 'master' 
Charsel tweaks

See merge request STJr/SRB2Internal!551
 2019-11-25 16:54:27 -05:00
MascaraSnake
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
MascaraSnake
73bb913ec9 Merge branch 'paperprojection' into 'master' 
Papersprite projection tweak

See merge request STJr/SRB2Internal!535
 2019-11-25 16:53:48 -05:00
MascaraSnake
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
MascaraSnake
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
MascaraSnake
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
MascaraSnake
aaea0f095c Merge branch 'knuxstuff' into 'master' 
Minor Knuckles fixes

See merge request STJr/SRB2Internal!527
 2019-11-25 16:41:56 -05:00
MascaraSnake
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
toaster
64cda33d6d SMOOTH PAPERCOLLISION TIME!!!!!!!! 
resolves #273, damn i feel good
 2019-11-25 20:12:42 +00:00
Nev3r
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
toaster
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
MascaraSnake
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
MascaraSnake
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
MascaraSnake
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
MascaraSnake
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
LJ Sonic
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
LJ Sonic
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
LJ Sonic
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
LJ Sonic
66c46bb3ea Merge branch 'mapisnowZONE' into 'master' 
Map is now ZONE

See merge request STJr/SRB2Internal!548
 2019-11-25 13:08:01 -05:00
LJ Sonic
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
LJ Sonic
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
LJ Sonic
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
LJ Sonic
80b346fe80 Merge branch 'eximove-sign-fix' into 'master' 
Do not focus the camera on the end sign if exitmove is active

See merge request STJr/SRB2Internal!550
 2019-11-25 12:57:42 -05:00
LJ Sonic
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
LJ Sonic
66ffe8f922 Merge branch 'gameovercoop' into 'join-bug-fix' 
Co-op Game Over fix

See merge request STJr/SRB2Internal!547
 2019-11-25 12:55:44 -05:00
toaster
f86b46640d Skip character select entirely if only one character is available on the list. 2019-11-25 17:06:06 +00:00
toaster
fc407cf6ce Skip tagteam characters (ie, Sonic&Tails) for NiGHTS secret map character selection. 2019-11-25 16:55:18 +00:00
toaster
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
Louis-Antoine
404d09e35a Do not focus the camera on the end sign if exitmove is active 2019-11-25 17:23:35 +01:00
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