thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-07-05 14:06:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
14498 commits 2 branches 14 tags 207 MiB
Commit graph

14498 commits

This branch
This branch
All branches
Author SHA1 Message Date
Monster Iestyn
8151360ca7 Merge branch 'eggcolosseum' into 'master' 
Egg Colosseum (CEZ3 remaster)

See merge request STJr/SRB2Internal!248
 2019-07-09 16:32:24 -04:00
Monster Iestyn
7a8843a295 Merge branch 'seaegg_tweaks' into 'master' 
Sea Egg

See merge request STJr/SRB2Internal!244
 2019-07-09 16:25:07 -04:00
Monster Iestyn
6105275e42 Fixed mixed-code-and-declaration, shadowed variables, etc ...and the compiler doesn't like P_AddEachTimeThinker being inline anymore for some reason, oh well 2019-07-09 21:15:12 +01:00
Steel Titanium
c0927754a1 Seperate declarations from code 2019-07-09 15:51:11 -04:00
Steel Titanium
7088a5d534 Merge branch 'master' into libopenmpt-fixes 2019-07-09 15:44:58 -04:00
Steel Titanium
d9ed4be606 Fix compiling on Linux 2019-07-09 15:42:14 -04:00
toaster
3c5cbd5980 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into eggcolosseum 
# Conflicts:
#	src/p_mobj.c
#	src/sounds.c
#	src/sounds.h
 2019-07-09 19:52:52 +01:00
Monster Iestyn
dcbe0f7f46 Merge branch 'toast_cleanup' into 'master' 
PITY IN PINK and everything associated (formerly toast_fixes)

See merge request STJr/SRB2Internal!232
 2019-07-09 14:31:25 -04:00
Monster Iestyn
d9048f2c39 Merge branch 'metalfixes' into 'toast_cleanup' 
Metal Sonic Boss fixes (again)

See merge request STJr/SRB2Internal!245
 2019-07-09 14:29:42 -04:00
Monster Iestyn
11bf294a74 Merge branch 'rainfixesmkII' into 'master' 
Accidentially broke rain in the rainfixes branch (oh, the irony!)

See merge request STJr/SRB2Internal!249
 2019-07-09 14:24:14 -04:00
MascaraSnake
193b86efab Merge branch 'remove-character-flags' into 'master' 
Remove character flags

Closes #27

See merge request STJr/SRB2Internal!246
 2019-07-09 14:18:27 -04:00
Steel Titanium
ccecb4c6cd Some few comments 2019-07-09 00:56:22 -04:00
Steel Titanium
86c8a0a5d9 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal into libopenmpt-fixes 2019-07-09 00:17:27 -04:00
Steel Titanium
f4275cf4ce Merge branch 'master' into libopenmpt-fixes 2019-07-08 23:37:56 -04:00
Monster Iestyn
a10514b5ef Merge branch 'sound-menu-fix' into 'master' 
Sound options menu fixes

Closes #160

See merge request STJr/SRB2Internal!250
 2019-07-08 19:42:47 -04:00
Monster Iestyn
ba0455ab47 Merge branch 'cezbricks' into 'master' 
Hardcode CEZ brick debris

See merge request STJr/SRB2Internal!247
 2019-07-08 17:03:31 -04:00
MascaraSnake
2a700e12d0 Removed the "disable" linedef effect, since it's useless now that the character flags are gone 2019-07-08 22:58:31 +02:00
MascaraSnake
d066fdc82f Simplified checks for ML_NETONLY and ML_NONET 2019-07-08 22:56:00 +02:00
Monster Iestyn
59b346b6d1 Use M_SetupNextMenu to actually set up the Sound Options menu "properly" instead of the old hacks. 
If you wanted the game to reset the item selected to the top option like before though, I left a line commented out that would do that for you. Unlike the old item = 0 way, it would automatically be corrected for headers and other spaces (thus kind of future-proofing this code)
 2019-07-08 21:17:40 +01:00
GoldenTails
1fc3bbc087 Merge branch 'master' of http://git.magicalgirl.moe/STJr/SRB2 into fix-fixedrem 2019-07-08 08:45:24 -05:00
GoldenTails
b283a84ac0 Make FixedRem less laggy by just using the modulo operator. 2019-07-08 08:39:31 -05:00
toaster
9282e8cd7e Merge branch 'toast_cleanup' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into toast_cleanup 2019-07-08 13:54:11 +01:00
toaster
e5cdfe998b Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into toast_cleanup 
# Conflicts:
#	src/p_mobj.c
 2019-07-08 13:53:31 +01:00
toaster
823ea62e7c Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into seaegg_tweaks 
# Conflicts:
#	src/p_enemy.c
#	src/p_mobj.c
 2019-07-08 13:52:11 +01:00
toaster
83ca8e065d Realised I accidentially broke rain in the rainfixes branch (oh, the irony!), realised it needed a few additional P_RecalcPrecipInSector calls to properly work with the new arena, and increased its speed. 
If you must, I can cherrypick this into another branch - but it's required for this one, at least.
 2019-07-08 13:39:21 +01:00
toaster
bc53be177e Before I forget... 2019-07-08 13:36:02 +01:00
toaster
0124e248ee ha ha ha how can i possibly describe this commit 
Just wait for the MR, it won't be far behind.
 2019-07-08 13:26:40 +01:00
Sryder
d6382107d3 Hopefully better Jawz behaviour 
Moved the movement code for it out of the thinker and into A_JawzChase to have it all in a consistent place.
 2019-07-07 21:56:23 +01:00
MascaraSnake
c48d00ad72 Fixed teetering on TNT barrels 2019-07-07 17:02:10 +02:00
Sryder
fbc5b9f880 Added () for slight clarity 2019-07-07 15:24:32 +01:00
MascaraSnake
5bc8424419 TNT barrels are no longer enemies, but still aimable for Fang 2019-07-07 12:06:45 +02:00
Steel Titanium
5dc55712e1 Update info.h 
Also add a case for MT_BRICKDEBRIS to P_MobjThinker
 2019-07-06 18:11:49 -04:00
Steel Titanium
c7527ad58b Change this, not that it really matters but 2019-07-06 00:39:36 -04:00
Steel Titanium
0374101ca1 Hardcode brick debris 2019-07-06 00:36:02 -04:00
James R
c5bd4d6ecd Apply P_MobjFlip to ring and ring sparkle animations 2019-07-05 20:11:38 -07:00
Sryder
d6ec65de59 Added some slope handling for regular jawz. 
Jawz as a result can absolutely behave differently, but it's mostly the case when in the range where it would slow down.
Will need testing, seems like it can sometimes rocket past a player that's stationary, maybe that's not a bad thing?
 2019-07-05 23:29:31 +01:00
Sryder
893d8cd211 Support Jawz dud on slopes 
Don't let orbinaut accelerate infinitely when in the air.
 2019-07-05 21:11:13 +01:00
Sryder
de62209d96 Orbinaut supports slopes, slows down naturally when above top speed. 
Still has it's speed reset lower when hitting a wall. Doesn't maintain slope speed increase.
 2019-07-05 20:34:36 +01:00
Sryder
9beaac2e53 Merge branch 'fix-port-connect' into 'master' 
Don't use client port as default peer port

See merge request KartKrew/Kart-Public!152
 2019-07-05 11:54:28 -04:00
Sryder
edcd75dcb9 Merge branch 'fix-ms-version' into 'next' 
Fix "Competition" as the gametype displayed by the Master Server

See merge request KartKrew/Kart-Public!151
 2019-07-05 11:50:42 -04:00
Sryder
8ac774a9d6 Merge branch 'add-floats-command' into 'master' 
Fix the Add command when floats

See merge request KartKrew/Kart-Public!153
 2019-07-05 11:49:46 -04:00
James R
460105cb8a Support adding to CV_FLOAT cvars with the Add command 2019-07-04 17:48:17 -07:00
James R
d4e950f17b Don't use client port as default peer port 2019-07-04 16:38:00 -07:00
Sryder
ae344fa2bc Fix silly issue 2019-07-04 17:55:41 +01:00
toaster
63889422a6 Realised I accidentially broke rain in the rainfixes branch (oh, the irony!), realised it needed a few additional P_RecalcPrecipInSector calls to properly work with the new arena, and increased its speed. 
If you must, I can cherrypick this into another branch - but it's required for this one, at least.
 2019-07-04 14:44:09 +01:00
toaster
689a4545df Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2Internal.git into eggcolosseum 2019-07-04 14:09:56 +01:00
toaster
c0f7cfaa8e Pre-pinch behaviour complete - heavily reliant on a new map, which I won't be sharing until everything is ready. 
Just making this commit now so I can merge in master...
 2019-07-04 14:09:38 +01:00
MascaraSnake
2b70287b01 Implemented a skin-based linedef executor trigger 2019-07-03 09:19:29 +02:00
toaster
168a7f4768 Revert "Revert "Merge branch 'metalfixes' into 'toast_cleanup'"" 
This reverts commit c17ec4a77e.
 2019-07-03 00:58:02 +01:00
MascaraSnake
c17ec4a77e Revert "Merge branch 'metalfixes' into 'toast_cleanup'" 
This reverts merge request !239
 2019-07-02 23:49:10 +00:00