stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-16 01:31:30 +00:00
Code Issues Projects Releases Packages Wiki Activity
8184 commits 174 branches 41 tags 300 MiB
Commit graph

934 commits

Author SHA1 Message Date
MascaraSnake
ba0dc5c884 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
3267a98fe9 Remove tracer nulling, likely a leftover from when P_LookForEnemies set tracer directly. 2019-11-30 15:28:50 +00:00
lachwright
d46f022837 Restore spindash sounds to DSSPNDSH 2019-11-30 19:30:58 +08:00
MascaraSnake
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
toaster
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
LJ Sonic
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
toaster
bcbf5e7c38 Correct tutorialmode case doubling up on camerascale. 2019-11-27 12:54:00 +00:00
toaster
7ff4a9b1e7 Make camerascale have no effect in 2D mode (resolves #359 and resolves #363). 2019-11-27 12:31:23 +00:00
MascaraSnake
07afb52a2a Merge branch 'deadstuff' into 'master' 
Matters of mortality

See merge request STJr/SRB2Internal!558
 2019-11-26 17:24:17 -05: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
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
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
aaea0f095c Merge branch 'knuxstuff' into 'master' 
Minor Knuckles fixes

See merge request STJr/SRB2Internal!527
 2019-11-25 16:41:56 -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
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
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
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
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
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
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
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
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
cd38173a7b Merge branch 'superrun' into 'master' 
Super runspd fix

See merge request STJr/SRB2Internal!515
 2019-11-23 17:51:12 -05:00
toaster
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
toaster
ebead10dca Remove duplicate viewpointx/viewpointy set. 2019-11-23 15:23:42 +00:00
toaster
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
toaster
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
toaster
c8c5237540 Resolve #310. 2019-11-22 19:51:27 +00:00
MascaraSnake
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
lachwright
cdc7a88b04 Add bump sounds to rollout rock & add Newton's third law to jumping off them 2019-11-20 23:45:34 +08:00
Louis-Antoine
032f53ce07 Prevent drowning after completing the level 2019-11-19 22:44:33 +01:00
toaster
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
MascaraSnake
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
MascaraSnake
7dc3484e5d Merge branch 'dragonbomber' into 'master' 
Dragonbomber

See merge request STJr/SRB2Internal!489
 2019-11-18 17:10:30 -05:00
toaster
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
MascaraSnake
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
MascaraSnake
2001cad144 Merge branch 'capsuletweaks' into 'master' 
Egg Capsule tweaks

See merge request STJr/SRB2Internal!474
 2019-11-18 15:24:13 -05:00
MascaraSnake
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
MascaraSnake
3e7e749327 Merge branch 'reset-rollangle' into 'master' 
Reset rollangle

See merge request STJr/SRB2Internal!494
 2019-11-18 14:11:32 -05:00
MascaraSnake
881524a2d7 Merge branch 'signpost-cleanup' into 'master' 
Signpost camera cleanup

See merge request STJr/SRB2Internal!490
 2019-11-18 14:00:05 -05:00
lachwright
280d151d76 Allow positive momentum retention when jumping off rollout rocks 2019-11-18 22:36:25 +08:00
lachwright
27fcaf0f93 Whoops, deleted a little too much by accident 2019-11-18 16:26:15 +08:00
lachwright
4c432c376e Make camera use signpost's ground z coordinate instead of the player's z coordinate 2019-11-18 16:22:12 +08:00
lachwright
f682de3f1b Fix controllable flight ending when player hits the ground while being carried by Tailsbot 2019-11-18 15:55:55 +08:00
lachwright
52a24e0bc4 Allow AI Tails to carry the player 2019-11-18 13:30:07 +08:00