thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
16645 commits 1 branch 12 tags 205 MiB
Commit graph

646 commits

Author SHA1 Message Date
Sally Cochenour
b4933bacb3 Didn't work, let's try this 
objectSpeed was getting scaled with the spring's size, when only the spring's base speed should be scaled
 2020-03-08 01:37:48 -05:00
Sally Cochenour
8c1aec3713 Fix springs having weird launch speeds in mobjscale maps 
Same issue as lobbing -- scale being double-applied
 2020-03-08 01:12:53 -05:00
James R
18aa2972e5 Merge remote-tracking branch 'origin/master' into parties-only 2020-03-05 21:41:23 -08:00
Sally Cochenour
d459407866 Forgotten player check here 2020-03-03 17:22:13 -05:00
Sally Cochenour
3633dc341a Merge branch 'master' into targets 2020-03-01 15:42:49 -05:00
Sally Cochenour
885d6fea1f Merge branch 'master' into special-sector-tweak 2020-03-01 14:50:45 -05:00
Sally Cochenour
76e75d9756 Fix offroad collision 
Adds an option to P_MobjTouchingSectorSpecial to only use non-FOF sectors' special if you're touching their floor/ceiling.
 2020-03-01 14:36:13 -05:00
Jaime Passos
d831163487 Consider hide-and-seek as GTR_HIDEFROZEN 2020-02-28 23:52:33 -03:00
James R
f164320c88 Make the order of displayplayers irrelevant and split splitscreen into splitscreen and r_splitscreen 2020-02-23 23:20:20 -08:00
Steel Titanium
fc042e90f0 Merge branch 'master' into next 2020-02-21 21:01:29 -05:00
James R
2274129f57 Update copyright year to 2020 2020-02-19 14:08:45 -08:00
Tatsuru
0740af6914 Die 2020-01-20 10:04:44 -03:00
Tatsuru
a11d4f48c5 Remove Tails pick-up lock 2020-01-19 23:18:49 -03:00
Alam Ed Arias
f267f7bb3e whitespace cleanup 2020-01-09 16:19:12 -05:00
James R
0035964251 Merge branch 'next-newcontrols' into 'next' 
fcam simple controls but slightly less hacky

See merge request STJr/SRB2!647
 2020-01-08 16:15:47 -05:00
fickleheart
084a8db5a9 Merge remote-tracking branch 'upstream/next' into next-newcontrols 2020-01-07 23:43:43 -06:00
lachwright
1811a2a34d Dashmode tweaks: 
- Remove the ability for non-SF_MACHINE players in dashmode to break spikes and monitors
- Replace instances of dashmode magic numbers with dashmode constants
- Add dashmode constants to dehacked.c
 2020-01-07 15:38:48 +08:00
James R
2a6cf10f79 Merge branch 'lua-neatstuff' into 'next' 
Extra functionality for lua

See merge request STJr/SRB2!601
 2020-01-05 20:54:17 -05:00
fickleheart
067b132eb1 Merge remote-tracking branch 'origin/next' into next-newcontrols 2020-01-04 09:57:09 -06:00
Nami
f09ff4ca8d Move MobjLineCollide up a bit to where we first know for sure that we hit a line 2020-01-01 19:38:48 -08:00
James R
75514def83 Merge branch 'respawndelaygametyperule' into 'next' 
Gametype ruleset changes

See merge request STJr/SRB2!585
 2020-01-01 17:49:53 -05:00
Nami
9219699b42 Add MobjLineCollide hook 2019-12-31 15:17:02 -08:00
fickleheart
77ba835f4f Merge branch 'next' into next-newcontrols 
# Conflicts:
#	src/g_game.c
#	src/p_setup.c
 2019-12-31 12:58:36 -06:00
Jaime Passos
a811021112 **NEW!** hook_SeenPlayer 2019-12-31 14:37:45 -03:00
James R
0fdf838c86 Merge branch 'dashmode-ctf-monitors' into 'next' 
Don't let Metal pop the enemy team's monitors (closes #94)

See merge request STJr/SRB2!584
 2019-12-31 01:31:55 -05:00
fickleheart
e0d09a457e Convert simple movement to directionchar+analog 
Analog + no directionchar is old analog (now known as
CS_LMAOGALOG because lmao if you still use it).
 2019-12-30 15:05:24 -06:00
fickleheart
61a8f715ac Convert analog/directionchar cvars into 2-long arrays 2019-12-30 14:01:14 -06:00
James R
529ccf9271 Merge branch 'saloondoor-fix' into 'next' 
Fix saloon doors not letting players through when marked with the Ambush flag

See merge request STJr/SRB2!600
 2019-12-30 00:25:37 -05:00
Tatsuru
d01fb277dc Fix saloon doors not letting players through when marked with the Ambush flag 2019-12-30 01:16:50 -03:00
James R
821e1cf618 Only return if we damaged the monitor 2019-12-27 14:48:55 -08:00
James R
5b715fa11a Pop monitors properly so Metal doesn't destroy enemy team's monitors 2019-12-26 19:27:25 -08:00
Jaime Passos
448494e19b More gametype rules yay!! 2019-12-18 01:54:45 -03:00
Steel Titanium
a5cdb0a4b3 Update copyright date on source files 2019-12-06 13:49:42 -05:00
toaster
0b790acb42 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
MascaraSnake
0261148cb3 -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
99e016a774 SMOOTH PAPERCOLLISION TIME!!!!!!!! 
resolves #273, damn i feel good
 2019-11-25 20:12:42 +00:00
toaster
d8ce67a6c8 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
toaster
dbeec7dacc 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
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
MascaraSnake
04fbb5dbd3 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
66cc8046a5 Merge branch 'dragonbomber' into 'master' 
Dragonbomber

See merge request STJr/SRB2Internal!489
 2019-11-18 17:10:30 -05:00
toaster
7bcaa5c359 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
5324107edf 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
2df5fd3b30 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
lachwright
730ab79c08 Allow AI Tails to carry the player 2019-11-18 13:30:07 +08:00
Jaime Passos
743f04e2ca Fireball 2019-11-17 21:25:17 -03:00
Louis-Antoine
7b5967b0d2 Disable Tails carrying for players who completed the level 
To avoid trolls...
 2019-11-17 23:46:34 +01:00
lachwright
98d73028ab Make rollout rocks more friendly 2019-11-18 05:30:14 +08:00
toaster
9c221d2362 Make ACZ3's slapstick signpost taller (resolves #267). 2019-11-15 14:52:34 +00:00
Louis-Antoine
7a9bb54a5d Fix silly typo :P 2019-11-09 15:46:34 +01:00