Commit graph

15929 commits

Author SHA1 Message Date
Sally Coolatta
f0044e05c1 Crossing the finish line first before anyone else gives you a free rainbow boost 2020-07-24 21:41:41 -04:00
Sally Coolatta
f61f9a010c Merge branch 'master' into spindash 2020-07-24 21:26:17 -04:00
Sal
90f44c979d Merge branch 'less-bubbles' into 'master'
Less bubbles

See merge request KartKrew/Kart!304
2020-07-24 21:25:18 -04:00
Sally Coolatta
5a59a9e8b9 Adjust item tables again 2020-07-24 20:30:18 -04:00
Sally Coolatta
1a61810f16 Make ring respawn faster 2020-07-24 20:19:14 -04:00
Sally Coolatta
c614e9ee1f Merge branch 'master' into less-bubbles 2020-07-24 19:23:46 -04:00
Sally Coolatta
ba6d5e95ba Add Sneaker x2 to pad out the item table a bit better
Jeck mentioned it, we agreed it might be a fun item because stacking sneakers is possible now
2020-07-24 19:11:52 -04:00
Sally Coolatta
562964f242 Properly rebalanced table to make up for it 2020-07-24 18:47:05 -04:00
Sally Coolatta
babe71cdee Try to avoid respawning you past the finish line 2020-07-24 18:01:36 -04:00
Sally Coolatta
8acace7a50 Fault on death 2020-07-24 17:16:12 -04:00
Sally Coolatta
660596970b Add FAULT graphic, remove momentum when faulting 2020-07-24 16:47:18 -04:00
Latapostrophe
06d70c1f8e Push flipcam down the nearest staircase 2020-07-24 16:17:07 +02:00
Latapostrophe
fcacb092b7 Various antigrav item fixes 2020-07-24 15:51:59 +02:00
Latapostrophe
b8f2fe4bcc Fix respawns in antigrav 2020-07-24 15:04:55 +02:00
James R
f94ded5051 Ctrl + Backspace/Delete in Console 2020-07-24 04:06:04 -07:00
James R
329bd3e36a Fix Credits sequence from Extras being unskippable
This is because a server is not started before going to the credits. I'm way
too stupid/lazy to try starting a server, so have a special case!
2020-07-24 03:58:38 -07:00
James R
ae72e35886 Merge remote-tracking branch 'origin/master' into next 2020-07-24 02:58:15 -07:00
James R
50479ffb74 Compiler error :V 2020-07-24 02:58:05 -07:00
James R
4931d82393 Update LATEST_GCC_VERSION too 2020-07-24 02:33:39 -07:00
James R
f939cf973b Add missing GCC version flags to the Makefile 2020-07-24 02:32:10 -07:00
James R
b6b1ce4766 Merge branch 'masterserver' into 'master'
Fix the Master Server so it works

See merge request STJr/SRB2!856
2020-07-24 05:20:30 -04:00
James R
2613a29396 Merge remote-tracking branch 'origin/next' into g_findmap-lua 2020-07-24 02:14:03 -07:00
James R
45c8f3a6cb Merge branch 'ogl-polyobject-tex-fix' into 'next'
Fix OpenGL polyobject texture distortion

See merge request STJr/SRB2!1086
2020-07-24 04:49:25 -04:00
James R
dd0c85b1ca Merge branch 'ogl-shader-light-clamp' into 'next'
Clamp light level for shaders. Fixes #194.

Closes #194

See merge request STJr/SRB2!1085
2020-07-24 04:47:57 -04:00
James R
cfc659b175 Merge branch 'ogl-fog-block-fix' into 'next'
Don't discard zero alpha fog block fragments. Fixes #198.

Closes #198

See merge request STJr/SRB2!1084
2020-07-24 04:45:50 -04:00
James R
077743dcce Merge branch 'netticbuffer-port' into 'next'
Port netticbuffer from Kart

See merge request STJr/SRB2!1077
2020-07-24 04:45:08 -04:00
Sally Coolatta
5c1a33f95c Increase buffer time so that high speed characters have time to get in position, change ra_timeskip to introtime 2020-07-24 03:13:17 -04:00
Sally Coolatta
fc89f2cc47 Remove start boosts, let you roam, kill you for crossing the line before the start 2020-07-24 02:59:47 -04:00
Sally Coolatta
e6cc99c8c8 Rebalanced values, so speed gets better boosts too
Also, prevent spindash timer from being stored when mid-air
2020-07-24 02:07:06 -04:00
Sally Coolatta
db230e4d3d Add spindash launch, prevent charging while flashing
Used a timed buff instead of thrust due to friction issues, as a result I had to rebalance some values
2020-07-23 21:31:10 -04:00
Ashnal
96e098b451 Appease C91 2020-07-23 21:05:00 -04:00
Ashnal
8c5e725a8d Also lets do this for kitchen sinks
They also ignored in K_DropHnextList
2020-07-23 20:12:35 -04:00
Sally Coolatta
4a9a33130a Make it compile 2020-07-23 19:23:27 -04:00
Sally Coolatta
25e9c72bab Merge branch 'master' into spindash 2020-07-23 19:12:00 -04:00
Hannu Hanhi
b7f26c7f94 Fix OpenGL polyobject texture distortion 2020-07-23 20:51:05 +03:00
Hannu Hanhi
5e60111b9b Clamp light level for shaders. Fixes #194. 2020-07-23 19:05:17 +03:00
Hannu Hanhi
6fd250117a Don't discard zero alpha fog block fragments. Fixes #198. 2020-07-23 18:24:41 +03:00
Sal
c30e6a994c Merge branch 'recovery' into 'master'
Metabolism for light weights

See merge request KartKrew/Kart!302
2020-07-23 02:46:55 -04:00
Sally Coolatta
baa55be470 Merge branch 'master' into recovery 2020-07-22 23:50:46 -04:00
Sally Coolatta
3800603243 Bruhther moment 2020-07-22 23:49:24 -04:00
Sally Coolatta
d70e8ac919 Less bubbles 2020-07-22 22:56:45 -04:00
Sally Coolatta
863e2ce565 Merge branch 'master' into recovery 2020-07-22 22:16:39 -04:00
James R
1f2697050b Merge branch 'fix-nights-fullbright' into 'next'
NiGHTS fullbright fixes

See merge request STJr/SRB2!1080
2020-07-22 22:15:07 -04:00
Sal
ecc93e059c Merge branch 'drift-clip-up-slope' into 'master'
Even more drift boost fx

See merge request KartKrew/Kart!301
2020-07-22 22:14:58 -04:00
James R
905db8dc23 Merge branch 'fix-superfloat' into 'next'
Fix Super Sonic exploiting CA_FLOAT abilities

See merge request STJr/SRB2!1081
2020-07-22 22:13:51 -04:00
James R
02922cb53d Merge branch 'demo-quit-crash-fix' into 'next'
Fix crash if you start recording a replay and immediately close the game

See merge request STJr/SRB2!1082
2020-07-22 22:11:03 -04:00
James R
34a7c2ee88 Hammer cocks on rainbow sparks; hella bullet clips on rainbow boost + new sfx 2020-07-22 19:09:14 -07:00
James R
5b2f0d9209 Merge branch 'next-compile-now' into 'next'
AND OR PARENTHESIS

See merge request STJr/SRB2!1083
2020-07-22 22:08:31 -04:00
James R
262c84f6cc Add player z momentum to the clip if going upward 2020-07-22 17:29:38 -07:00
Sally Coolatta
c942390745 Rename to metabolism because it's funnier & more accurate to what it does
:XD:
2020-07-22 18:33:48 -04:00