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
Sally Coolatta
089cffd900
Recovery stat has risen from its grave
...
Boost stacking potential is increased for low weight. Also changed order of operations so that flashing tics differences are more significant in Battle.
2020-07-22 18:21:50 -04:00
Sal
ec07d27170
Merge branch 'makefile-detect-version-now' into 'master'
...
Automatically set warning flags according to GCC version
See merge request KartKrew/Kart!296
2020-07-21 22:32:06 -04:00
Sal
ec13738233
Merge branch 'bad-merge' into 'master'
...
Fix bad merge of !298 (CRLF)
See merge request KartKrew/Kart!300
2020-07-21 20:08:57 -04:00
Sally Coolatta
7b42027af8
Show nametags in replays, fix in splitscreen
2020-07-21 17:09:17 -07:00
James R
c2cb91e3ae
Correct CRLF
2020-07-21 17:08:20 -07:00
James R
1c51b93d0e
Revert "Merge branch 'nametags-in-replays' into 'master'"
...
This reverts commit 43e7e9ee7e315e808634
2020-07-21 17:05:35 -07:00
James R
7432d65342
Parenthesis
2020-07-21 16:16:03 -07:00
James R
f6527e56b3
Merge branch 'next-lc-uint16' into 'next'
...
Allow modification of built-in skincolors
See merge request STJr/SRB2!1078
2020-07-21 17:56:12 -04:00
Sal
43e7e9ee7e
Merge branch 'nametags-in-replays' into 'master'
...
Show nametags in replays
See merge request KartKrew/Kart!298
2020-07-21 01:46:52 -04:00
Sally Coolatta
7a5d923eab
Merge branch 'master' into nametags-in-replays
2020-07-21 01:42:52 -04:00
Sal
315e808634
Merge branch 'draw-flags' into 'master'
...
Seperate MF2_DONTDRAW and MF2_SHADOW into it's own varied set of flags -- drawflags.
See merge request KartKrew/Kart!167
2020-07-21 01:26:45 -04:00
Steel Titanium
1afe2f4988
Fix crash if you start recording a replay and immediately close the game
2020-07-20 22:19:44 -04:00
Sally Coolatta
c7f19a4b83
Lazy synch drawflags on join
2020-07-20 17:49:56 -04:00
Sally Coolatta
ca6ccca594
Add drawflags to Lua
2020-07-20 17:33:13 -04:00
Sally Coolatta
509f085d46
This should be a proper diff for k_kart's drawflags stuff
2020-07-20 17:22:07 -04:00
Sally Coolatta
d649be4554
revert back to master
...
yay i get to MANUALLY redo everything.
2020-07-20 16:57:25 -04:00
Sally Coolatta
5e4be346d4
Ring sting debt indicator properly supports splitscreen
2020-07-20 16:16:56 -04:00
Sally Coolatta
3190edd666
Show nametags in replays, fix in splitscreen
2020-07-20 16:02:46 -04:00
lachwright
c6f752a394
Fix Super Sonic exploiting CA_FLOAT abilities
2020-07-21 03:50:26 +08:00
