Commit graph

16729 commits

Author SHA1 Message Date
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
Jaime Passos
10189ecdc0 Merge branch 'next' of https://git.magicalgirl.moe/STJr/SRB2 into pictureformats 2020-07-21 22:25:00 -03: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 43e7e9ee7e, reversing
changes made to 315e808634.
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
Sally Coolatta
643a63e1e6 Finish merge 2020-07-20 13:39:05 -04:00
Sally Coolatta
ef2579f2b3 Merge branch 'master' into draw-flags 2020-07-20 13:38:48 -04:00
SwitchKaze
a9f19fbd18 Deny standard color accessibility changes 2020-07-20 12:06:57 -05:00
lachwright
c9d8fcc1cb Fix default NiGHTS skin brightness for non-super characters 2020-07-20 22:24:16 +08:00
James R
57f6d0b496 Merge branch 'muspostbossname-fix' into 'next'
Fix muspostbossname sometimes returning garbage.

Closes #197

See merge request STJr/SRB2!1076
2020-07-20 04:47:40 -04:00
Sal
17b244969b Merge branch 'driftboost' into 'master'
Drift boost effects

See merge request KartKrew/Kart!297
2020-07-20 03:11:58 -04:00
James R
93e0872d9a Merge remote-tracking branch 'origin/master' into driftboost 2020-07-19 22:19:59 -07:00
James R
5efc34e43b Cleanup code and reverse gravity 2020-07-19 22:18:56 -07:00
James R
37aedad288 Sounds for big blue boost and bullet clip bouncing 2020-07-19 21:49:23 -07:00
James R
b23581ac38 The drift boost clip is fatter 2020-07-19 21:05:29 -07:00
James R
280791a832 Drift Boost Plumes, play every other frame of Drift Boost Explosion (normally flicker frames) 2020-07-19 19:11:19 -07:00
James R
3ff00e851e Better spawning for the clip spark 2020-07-19 18:09:52 -07:00
James R
f8b19a239f Drift Boost Clip, bounces on floor and sparks, then flickers until it dies 2020-07-19 18:04:11 -07:00
SwitchKaze
5044fba6ac Re-enable built-in color modification 2020-07-19 17:23:08 -05:00
Steel Titanium
058b41a834 Port netticbuffer from Kart 2020-07-19 15:24:27 -04:00
Steel Titanium
9630b9e244 Fix muspostbossname sometimes returning garbage. 2020-07-19 13:47:33 -04:00