Monster Iestyn
|
924c3164b0
|
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 |
|
Sal
|
d1b8b5d2f7
|
Merge branch 'update-version' into 'master'
v1 release prep
See merge request KartKrew/Kart!24
|
2018-11-03 03:39:02 -04:00 |
|
TehRealSalt
|
0d79cbdd27
|
Keep the old y offsets, though.
|
2018-11-03 03:38:41 -04:00 |
|
TehRealSalt
|
cb1380ae51
|
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
|
69faf1cbc7
|
Remove NOFOURPLAYER from Makefile
Seems that someone already removed it from the other code anyway...?
|
2018-11-03 03:21:08 -04:00 |
|
TehRealSalt
|
9de7a9d5cc
|
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
|
0eab0c5a14
|
Merge branch 'master' into update-version
|
2018-11-02 23:57:28 -04:00 |
|
TehRealSalt
|
9ae9e7ec3a
|
Check for valid source in A_JawzChase, change 1 target rule
|
2018-11-02 23:51:06 -04:00 |
|
Monster Iestyn
|
86ad6de35b
|
Merge branch 'file-loading-hotfix' into 'master'
File loading hotfix
See merge request STJr/SRB2!310
|
2018-11-02 19:03:59 -04:00 |
|
Monster Iestyn
|
0f37411e2b
|
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
|
cb699c1770
|
fullbright points
|
2018-11-02 15:06:56 -04:00 |
|
TehRealSalt
|
6bb33b9d16
|
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart
|
2018-11-02 14:59:48 -04:00 |
|
TehRealSalt
|
ba67c7aa70
|
Fix for "became a spectator" text repeating
|
2018-11-02 14:59:26 -04:00 |
|
Sal
|
87dd8cd0ce
|
Merge branch 'all_hardcode' into 'master'
Truly all-hardcode
See merge request KartKrew/Kart!71
|
2018-11-02 14:54:09 -04:00 |
|
TehRealSalt
|
399bccd2c7
|
use gfx.kart
|
2018-11-02 14:52:08 -04:00 |
|
Monster Iestyn
|
7b268d15b1
|
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
|
8d5fb13111
|
wrong var fix
|
2018-11-02 14:01:29 -04:00 |
|
Monster Iestyn
|
f37a573834
|
Merge branch 'master' into next
|
2018-11-02 11:02:35 +00:00 |
|
Monster Iestyn
|
ba5f5be3bb
|
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
|
37893cc523
|
Merge branch 'master' into all_hardcode
|
2018-11-02 02:30:36 -04:00 |
|
TehRealSalt
|
1bdaad3f06
|
quick merge fix
|
2018-11-02 02:28:34 -04:00 |
|
TehRealSalt
|
5c1cc6e1df
|
Merge branch 'master' into all_hardcode
|
2018-11-02 01:42:34 -04:00 |
|
Sal
|
0154ef1d01
|
Merge branch 'chars_cleanup' into 'master'
Chars cleanup
See merge request KartKrew/Kart!64
|
2018-11-02 01:32:52 -04:00 |
|
TehRealSalt
|
667e636631
|
Use chars.kart
|
2018-11-02 01:22:52 -04:00 |
|
TehRealSalt
|
6fd0f3f0ba
|
Fix ghost rankings issue
|
2018-11-02 01:19:25 -04:00 |
|
TehRealSalt
|
89276b739f
|
Merge branch 'master' into chars_cleanup
|
2018-11-01 23:48:22 -04:00 |
|
Sal
|
cdabbdddd3
|
Merge branch 'resync' into 'master'
Resync fixes
See merge request KartKrew/Kart!69
|
2018-11-01 23:38:17 -04:00 |
|
TehRealSalt
|
950bca1217
|
Actually lets just do this now, like how its done below
|
2018-11-01 21:05:52 -04:00 |
|
TehRealSalt
|
78299c5fee
|
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
|
67dd962fb9
|
Change out the hex used for hnext/hprev consistancy
|
2018-11-01 20:46:20 -04:00 |
|
TehRealSalt
|
e758e0f8fd
|
Merge branch 'master' into resync
|
2018-11-01 20:39:50 -04:00 |
|
Sal
|
d66225bad1
|
Merge branch 'more-fixes' into 'master'
More fixes
See merge request KartKrew/Kart!76
|
2018-11-01 19:53:08 -04:00 |
|
TehRealSalt
|
5c7de75592
|
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
|
0c2a5cf9d3
|
Merge branch 'master' into more-fixes
|
2018-11-01 18:10:53 -04:00 |
|
Sal
|
9abe3e24a4
|
Merge branch 'brake-drift' into 'master'
Brake drift effect
See merge request KartKrew/Kart!74
|
2018-11-01 18:02:06 -04:00 |
|
TehRealSalt
|
7e103be393
|
Change default brake color from Yellow to White
|
2018-11-01 17:37:59 -04:00 |
|
TehRealSalt
|
6a31959381
|
Merge branch 'master' into brake-drift
|
2018-11-01 17:37:10 -04:00 |
|
TehRealSalt
|
03d64cbced
|
Merge branch 'master' into brake-drift
|
2018-11-01 17:35:45 -04:00 |
|
Sal
|
cea1b1c26f
|
Merge branch 'battle-visuals' into 'master'
Battle visuals
See merge request KartKrew/Kart!77
|
2018-11-01 17:35:11 -04:00 |
|
TehRealSalt
|
deb51d1eb4
|
Merge branch 'master' into battle-visuals
|
2018-11-01 17:35:01 -04:00 |
|
Sal
|
840d964800
|
Merge branch 'lap-anim-update' into 'master'
Lap start animation update
See merge request KartKrew/Kart!75
|
2018-11-01 17:32:20 -04:00 |
|
TehRealSalt
|
a2da81243e
|
Double length of msg
|
2018-11-01 17:08:30 -04:00 |
|
TehRealSalt
|
43d72d72f9
|
Properly center this
|
2018-11-01 17:06:10 -04:00 |
|
TehRealSalt
|
7e9300c420
|
Lap hands touch-up
|
2018-11-01 16:15:25 -04:00 |
|
Steel Titanium
|
5a0cfc10f4
|
Update copyright info on some files
|
2018-11-01 14:47:19 -04:00 |
|
TehRealSalt
|
4cf9476510
|
First frame lasts longer
|
2018-11-01 13:44:09 -04:00 |
|
TehRealSalt
|
7891a11fba
|
Battle points are visible
|
2018-11-01 00:57:38 -04:00 |
|
TehRealSalt
|
a193a4adf2
|
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
|
6c557407d5
|
Added judging hands (if'd out)
|
2018-10-31 23:10:38 -04:00 |
|
TehRealSalt
|
4369917912
|
Fix offsets, add colormapping
|
2018-10-31 22:38:43 -04:00 |
|