Commit graph

5657 commits

Author SHA1 Message Date
TehRealSalt
3d90abf538 Mixed up validity check... 2018-11-03 22:53:12 -04:00
toaster
220d4d5605 Staff attack ghost names on the REPLAY... menu.
Also: Remove playercolor being set to the replay's color. No need to kill your settings, seeing as it makes no tangible effect on your replay (doesn't even lose colour when you die, so I don't even know...)
2018-11-04 01:00:17 +00:00
TehRealSalt
bf4846c42b Battle arrow fixes and cleanup 2018-11-03 17:45:38 -04:00
Latapostrophe
4702c6fcf7 Merge branch 'master' into lua-hudlib 2018-11-03 22:25:33 +01:00
Latapostrophe
d52d9d4c71 Remove indents on #ifdefs and take K_drawInput in the hud_position check 2018-11-03 22:24:45 +01:00
toaster
6de4c77fe6 Fix 2p ("wide") splitscreen having an incorrect FINISH arrangement (drawn at wrong scale, moved across screen at wrong speed...) 2018-11-03 13:20:02 +00:00
Monster Iestyn
fcee38d647 Merge branch 'master' into next 2018-11-03 12:29:04 +00:00
Monster Iestyn
3e4ab68264 Merge branch 'soc-sanitising-the-sequel' into 'next'
SOC sanitising the sequel!

See merge request STJr/SRB2!308
2018-11-03 08:18:16 -04:00
TehRealSalt
c22b3b3d76 Keep the old y offsets, though. 2018-11-03 03:38:41 -04:00
TehRealSalt
bb4dfed072 Changed this randomly changed instance back to vanilla, due to compile errors
https://i.imgur.com/SEdmZpC.png
2018-11-03 03:29:06 -04:00
TehRealSalt
4781f34190 Remove NOFOURPLAYER from Makefile
Seems that someone already removed it from the other code anyway...?
2018-11-03 03:21:08 -04:00
TehRealSalt
87f767fad0 Add textures.kart, re-define DEVELOP mode,
Disabling DEVELOP can be another branch; this means this can get in master quicker
2018-11-03 03:17:20 -04:00
TehRealSalt
aeeedc2732 Merge branch 'master' into update-version 2018-11-02 23:57:28 -04:00
TehRealSalt
9c2767649b Check for valid source in A_JawzChase, change 1 target rule 2018-11-02 23:51:06 -04:00
Monster Iestyn
a67dd8821f Make sure handles of files opened by W_LoadWadFile are closed if we abort loading the files for whatever reason.
ESPECIALLY if the file is already loaded in SRB2, that's just silly.
2018-11-02 20:48:12 +00:00
TehRealSalt
c4fec80513 fullbright points 2018-11-02 15:06:56 -04:00
TehRealSalt
0ed3fb95f4 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart 2018-11-02 14:59:48 -04:00
TehRealSalt
e4a0c3103a Fix for "became a spectator" text repeating 2018-11-02 14:59:26 -04:00
Sal
4c08fa66ba Merge branch 'all_hardcode' into 'master'
Truly all-hardcode

See merge request KartKrew/Kart!71
2018-11-02 14:54:09 -04:00
TehRealSalt
03bedd870e use gfx.kart 2018-11-02 14:52:08 -04:00
Monster Iestyn
f2623aaa90 Merge branch 'lua-hudlib-addition' into 'next'
Lua: hud.enabled and v.getLocalTransFlag()

See merge request STJr/SRB2!306
2018-11-02 14:29:02 -04:00
TehRealSalt
53e017f649 wrong var fix 2018-11-02 14:01:29 -04:00
Monster Iestyn
b4ef5c4060 Merge branch 'master' into next 2018-11-02 11:02:35 +00:00
Monster Iestyn
529f38d1e9 Merge branch 'patch-offsets-fix' into 'master'
Patch offsets fix

See merge request STJr/SRB2!305
2018-11-02 07:00:37 -04:00
TehRealSalt
62152af724 Merge branch 'master' into all_hardcode 2018-11-02 02:30:36 -04:00
TehRealSalt
0148c1209c quick merge fix 2018-11-02 02:28:34 -04:00
TehRealSalt
ab02ea1e1a Merge branch 'master' into all_hardcode 2018-11-02 01:42:34 -04:00
TehRealSalt
f7ca5685e2 Use chars.kart 2018-11-02 01:22:52 -04:00
TehRealSalt
3af5af996d Fix ghost rankings issue 2018-11-02 01:19:25 -04:00
TehRealSalt
ed7e5cae14 Merge branch 'master' into chars_cleanup 2018-11-01 23:48:22 -04:00
TehRealSalt
75af6af57c Actually lets just do this now, like how its done below 2018-11-01 21:05:52 -04:00
TehRealSalt
71db7214e4 0xFFFF to 0xFFFFFFFF
I'll implement proper bit-setting later, just gotta see if it works first
2018-11-01 20:50:19 -04:00
TehRealSalt
fbc4c3464d Change out the hex used for hnext/hprev consistancy 2018-11-01 20:46:20 -04:00
TehRealSalt
5360bff294 Merge branch 'master' into resync 2018-11-01 20:39:50 -04:00
TehRealSalt
28e40b7e97 Fix random crash on squishing
Why does this cause a crash? I dunno, beats me, but this seemed to fix it.
2018-11-01 19:50:31 -04:00
TehRealSalt
053579371a Merge branch 'master' into more-fixes 2018-11-01 18:10:53 -04:00
TehRealSalt
3c050b44f3 Change default brake color from Yellow to White 2018-11-01 17:37:59 -04:00
TehRealSalt
9223b06ff4 Merge branch 'master' into brake-drift 2018-11-01 17:37:10 -04:00
TehRealSalt
11fa783ace Merge branch 'master' into brake-drift 2018-11-01 17:35:45 -04:00
TehRealSalt
5b23270433 Merge branch 'master' into battle-visuals 2018-11-01 17:35:01 -04:00
TehRealSalt
b26ef23b52 Double length of msg 2018-11-01 17:08:30 -04:00
TehRealSalt
5cebc06db6 Properly center this 2018-11-01 17:06:10 -04:00
TehRealSalt
0c0a53b2d6 Lap hands touch-up 2018-11-01 16:15:25 -04:00
Steel Titanium
d7a0a3c94b Update copyright info on some files 2018-11-01 14:47:19 -04:00
TehRealSalt
a4ad09c470 First frame lasts longer 2018-11-01 13:44:09 -04:00
TehRealSalt
e59102365f Battle points are visible 2018-11-01 00:57:38 -04:00
TehRealSalt
ee033c1ac4 YOU GOT EM
Flashes on screen whenever you get more than 1 karma point at a time, getting you back into the game.
2018-10-31 23:34:13 -04:00
TehRealSalt
04dc2978ab Added judging hands (if'd out) 2018-10-31 23:10:38 -04:00
TehRealSalt
94429a1cb6 Fix offsets, add colormapping 2018-10-31 22:38:43 -04:00
TehRealSalt
dd28bda75f Brake drfit effect 2018-10-31 21:35:17 -04:00