Commit graph

949 commits

Author SHA1 Message Date
Sally Cochenour
add2497220 Port of Jimita's shader stuff + my lighting shader
Co-Authored-By: Jaime Passos <jimita@users.noreply.github.com>
2019-12-25 14:22:01 -05:00
Steel Titanium
5281c44042 Fix super theme ending early if invincibility expired 2019-12-20 23:45:32 -05:00
James R
982c6362db Merge branch 'elemental-tweak' into 'next'
Don't uncurl from spin if Elemental Stomp is used

See merge request STJr/SRB2!555
2019-12-20 17:32:59 -05:00
Steel Titanium
a0993baa0b Don't uncurl from spin if Elemental Stomp is used 2019-12-18 21:28:34 -05:00
James R
ebcd9923b1 Merge branch 'fix-divby0-spindash-crash' into 'next'
Fix a divide by zero crash when mindash and maxdash were the same.

See merge request STJr/SRB2!539
2019-12-17 20:42:56 -05:00
GoldenTails
f223446e2e Fix a divide by zero crash when mindash and maxdash were the same.
Props to rumia1 for finding this and Lach for figuring out this was a divide by zero error.
2019-12-15 04:09:56 -06:00
GoldenTails
5b61af47b0 Stop characters from being able to activate their abilities when doing a shield ability!
Fixes #61.
2019-12-10 23:55:52 -06:00
MascaraSnake
fffd385151 Merge branch 'datestuff' into 'master'
Date stuff

See merge request STJr/SRB2Internal!618
2019-12-06 16:10:36 -05:00
MascaraSnake
313afd1ea3 Merge branch 'signpost-cleanup' into 'master'
Signpost fixes

See merge request STJr/SRB2Internal!602
2019-12-06 15:58:46 -05:00
Steel Titanium
a5cdb0a4b3 Update copyright date on source files 2019-12-06 13:49:42 -05:00
lachwright
42b9af5b3b Fix diagonal input acceleration and glide directioning in analog mode 2019-12-05 15:59:16 +08:00
lachwright
a908cf41c4 Make signpost camera distance consistent in analog mode & don't target signpost in 2D mode 2019-12-05 12:58:44 +08:00
lachwright
dc011d2fd3 Fix signpost camera for S_SKIN camerascale, exitmove, opposite gravity, and analog mode 2019-12-05 12:36:25 +08:00
MascaraSnake
322831a448 Merge branch 'ideyagun' into 'master'
Ideyagun (resolves #406).

Closes #406

See merge request STJr/SRB2Internal!582
2019-12-03 02:15:26 -05:00
toaster
cfa49f72ef Remove tracer nulling, likely a leftover from when P_LookForEnemies set tracer directly. 2019-11-30 15:28:50 +00:00
lachwright
41dc496551 Restore spindash sounds to DSSPNDSH 2019-11-30 19:30:58 +08:00
MascaraSnake
0e1da4e4b1 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
toaster
300159143a 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
LJ Sonic
3eea61558e 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
toaster
50ae50a2a5 Correct tutorialmode case doubling up on camerascale. 2019-11-27 12:54:00 +00:00
toaster
ff26826ca0 Make camerascale have no effect in 2D mode (resolves #359 and resolves #363). 2019-11-27 12:31:23 +00:00
MascaraSnake
bef6ba1556 Merge branch 'deadstuff' into 'master'
Matters of mortality

See merge request STJr/SRB2Internal!558
2019-11-26 17:24:17 -05:00
toaster
b2426e7668 * 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
93e1fdd0bb 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
MascaraSnake
50545cbc6a 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
0f149b0feb Merge branch 'knuxstuff' into 'master'
Minor Knuckles fixes

See merge request STJr/SRB2Internal!527
2019-11-25 16:41:56 -05:00
MascaraSnake
8ed00fca89 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
LJ Sonic
e725b34c5c 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
d64fa9c478 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
Louis-Antoine
88def9b8e8 Do not focus the camera on the end sign if exitmove is active 2019-11-25 17:23:35 +01:00
lachwright
74b180f798 Merge branch 'master' into unglue-metalsonic 2019-11-26 00:20:47 +08:00
lachwright
bf46194ab6 Add comment 2019-11-26 00:20:43 +08:00
toaster
bb918c88f7 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
4c276b86de 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
toaster
875fe6575c 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
toaster
1fe24405db Make cv_exitmove only have effect if gametype is GT_COOP, otherwise immediately exit (resolves #342). 2019-11-24 13:35:37 +00:00
lachwright
7d15925069 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
0234ed6b6a Make Metal's vertical float speed technically negative 2019-11-24 18:46:59 +08:00
MascaraSnake
3ba08506b0 Merge branch 'nightsexitcam' into 'master'
NiGHTS exit camera tweak

See merge request STJr/SRB2Internal!519
2019-11-23 17:51:34 -05:00
MascaraSnake
e0a7fda93d 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
66103c19bc Merge branch 'superrun' into 'master'
Super runspd fix

See merge request STJr/SRB2Internal!515
2019-11-23 17:51:12 -05:00
toaster
d252d82039 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
toaster
ea5ac5bb6a Remove duplicate viewpointx/viewpointy set. 2019-11-23 15:23:42 +00:00
toaster
206f3ac51c 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
lachwright
975a452db0 Merge branch 'master' into signpost-cleanup 2019-11-23 07:05:45 +08:00
toaster
0a49bab070 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
toaster
21880219aa Resolve #310. 2019-11-22 19:51:27 +00:00
MascaraSnake
16f0e3c9f7 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
lachwright
553e80332e Add bump sounds to rollout rock & add Newton's third law to jumping off them 2019-11-20 23:45:34 +08:00
lachwright
b9def84140 WIP fix signpost issues with exitmove 2019-11-20 21:02:34 +08:00