thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
4289 commits 1 branch 12 tags 205 MiB
Commit graph

4289 commits

This branch
This branch
All branches
Author SHA1 Message Date
toaster
06ab5cf099 Fix "laststaff" setting 2018-11-05 14:03:09 +00:00
toaster
1dfd7ab4e5 Merge branch 'master' into staff_names 2018-11-05 13:46:10 +00:00
toaster
4568753e4c TITLE SCREEN DEMOS: Pick a random Staff Attack demo!!! 
Also: Fix watching a demo replay of a map with a palette not resetting your palette back to normal when you go back to the menu(/titlescreen).
 2018-11-05 13:45:40 +00:00
toaster
5f8e8f4ab2 Black out the background around the GAMEQUIT picture, since we removed the automatic doing of that for non-green resolutions. 2018-11-05 12:52:15 +00:00
toaster
94ea5b6c89 Redo the help command stuff, this time with much less impact on other areas of the code for sanity as we approach R1. 2018-11-05 12:49:28 +00:00
toaster
33ca25c705 Merge branch 'fix-mixed-declarations' into 'master' 
Literally a single compiler warning.

See merge request KartKrew/Kart!80
 2018-11-04 16:49:45 -05:00
toaster
ab9f908cad Properly support widescreen in Y_IntermissionDrawer (I meant to do this in charscleanup but forgot). 2018-11-04 21:48:47 +00:00
Sryder
f6ff9c603e Literally a single compiler warning. 2018-11-04 17:37:18 +00:00
toaster
d950cfd9d7 Correctly disable OGL-only menus/options in software. 2018-11-04 14:41:24 +00:00
toaster
839062bc2b Add a wide lap sticker for the record attack menu, so you're not looking at the same icon twice to mean two different things. 
https://cdn.discordapp.com/attachments/270211093761097728/508614473628647442/kart0002.png
 2018-11-04 12:15:13 +00:00
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
Sal
b7f82fdcc4 Merge branch 'battle-arrow-fix' into 'master' 
Battle arrow fixes and cleanup

See merge request KartKrew/Kart!78
 2018-11-03 17:50:29 -04: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
Sal
c344ec34a7 Merge branch 'update-version' into 'master' 
v1 release prep

See merge request KartKrew/Kart!24
 2018-11-03 03:39:02 -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
3b6e8bcf09 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
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
Sal
a7ad98c64c Merge branch 'chars_cleanup' into 'master' 
Chars cleanup

See merge request KartKrew/Kart!64
 2018-11-02 01:32:52 -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
Sal
b86c04125d Merge branch 'resync' into 'master' 
Resync fixes

See merge request KartKrew/Kart!69
 2018-11-01 23:38:17 -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
Sal
ee23d2e1bc Merge branch 'more-fixes' into 'master' 
More fixes

See merge request KartKrew/Kart!76
 2018-11-01 19:53:08 -04:00