Commit graph

3393 commits

Author SHA1 Message Date
TehRealSalt
d65b02b176 Moved colors around yet again for nicer invincibility effect
- Ruby is closer to the pinks (and where purples would be if it wrapped around)
- Sapphire is closer to the cyans
- Dream is right before the teals
2018-10-03 21:18:07 -04:00
TehRealSalt
c99d9e7253 Edit Pink, Navy, and Jet 2018-10-03 20:48:44 -04:00
Sryder
6d54202674 Merge branch 'waypastpoint' into 'master'
Ghetto waypoint improvements

See merge request KartKrew/Kart!21
2018-10-02 18:20:17 -04:00
Sryder
2b2a23ab68 Merge branch 'keysmash' into 'master'
(Mic)key('s Dick) Smasher

See merge request KartKrew/Kart!18
2018-10-01 14:58:31 -04:00
Sryder
fa7a2fc9ac Merge branch 'hack_the_de_damnit' into 'master'
Fix dehacked list incongruence

See merge request KartKrew/Kart!20
2018-09-29 16:52:41 -04:00
Sryder
0e04819573 Merge branch 'invert_dynamic_slopes' into 'master'
Flip dynamic slope toggle

See merge request KartKrew/Kart!17
2018-09-29 16:51:35 -04:00
toaster
dd5247811f Experimental: Making the ghetto waypoints we have right now their own mobj list in order to make them slightly less bullshit 2018-09-29 20:28:27 +01:00
toaster
c57a2b0724 Fix dehacked list incongruence. 2018-09-29 16:43:00 +01:00
toaster
7a4b6b6081 Correct that thing Lat` found where sometimes the controls menus'd get "stuck" replacing the second key every time, effectively only allowing one key until you clear it and try again.
Also, sounds.
2018-09-29 16:18:16 +01:00
toaster
2df598f148 Flip dynamic slope toggle. 2018-09-28 12:58:07 +01:00
toaster
79639c1104 Merge branch 'minimap_in_demos' into 'master'
Show minimap in demo playback

See merge request KartKrew/Kart!16
2018-09-23 18:14:09 -04:00
Sal
f69b3f3f59 Merge branch 'thundershield-hell' into 'master'
Thundershield hell

See merge request KartKrew/Kart!14
2018-09-23 18:08:59 -04:00
toaster
b7a62b9625 smoll to tiny 2018-09-23 23:07:38 +01:00
toaster
54234ba8d9 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into thundershield-hell
# Conflicts:
#	src/info.c
#	src/info.h
#	src/sounds.c
#	src/sounds.h
2018-09-23 23:07:16 +01:00
Sal
824c9066e6 Merge branch 'itemdrop' into 'master'
Itemdrop

See merge request KartKrew/Kart!11
2018-09-23 17:51:28 -04:00
toaster
7f9052add0 You're right, this works fine 2018-09-23 22:34:59 +01:00
toaster
9a94a43fc3 Turns out Playing() evaluates to false when playing back demos. Who knew? 2018-09-23 19:58:15 +01:00
toaster
98e9767afb Merge branch 'addons_menu' into 'master'
Addons menu

See merge request KartKrew/Kart!8
2018-09-23 12:58:06 -04:00
toaster
383ba1d738 Forgot I did this optimisation! Updated for the new colours. 2018-09-23 16:39:07 +01:00
toaster
862c256e92 The pipeline halted for some reason, so here's the smallest possible legitimate change to bump it back into action: Replacing commenting-out with #ifdefing. 2018-09-23 16:13:58 +01:00
toaster
2025f23a09 Somehow butchered the code cleanliness (indentation/not taking advantage of a macro I defined specifically for this) here a little by accident - tidied up. 2018-09-23 13:34:49 +01:00
toaster
1331826600 Fix Sryder's crash (incorrect setting of dir_on when searching in subfolders).
Also, correct a minor copypaste failure in one of the I_Errors' messages.
2018-09-23 13:23:03 +01:00
toaster
fdb2315bca Add a scroll bar to the addons menu. Should hopefully make the temperature gauge a little less problematic... 2018-09-23 13:22:00 +01:00
toaster
b12c2516ec Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop
# Conflicts:
#	src/dehacked.c
#	src/info.c
#	src/info.h
2018-09-23 11:47:29 +01:00
Sal
1d1705d4e7 Merge branch 'new-voices' into 'master'
New voices

See merge request KartKrew/Kart!15
2018-09-22 20:22:59 -04:00
TehRealSalt
a4ce0bebbd Doing this looks more appealing to me 2018-09-22 20:15:12 -04:00
TehRealSalt
d6399bc2bc Quick fix for other player's win/lose not playing 2018-09-22 20:14:32 -04:00
Sal
7a354f1b8f Merge branch 'this-is-a-sign' into 'master'
End sign on finish

See merge request KartKrew/Kart!13
2018-09-22 20:11:05 -04:00
TehRealSalt
a32f87fab2 New sparkles 2018-09-22 19:55:26 -04:00
TehRealSalt
67e1e9aab3 Set nogravity on landing
Means you can't have a finishline that moves up and down, but eh, thinking this might help the fallback measure disappearing
2018-09-22 19:03:38 -04:00
TehRealSalt
e6db552945 Better particle spread 2018-09-22 19:00:30 -04:00
TehRealSalt
8bc02a3ec6 raceexittime var 2018-09-22 18:59:26 -04:00
toaster
ae002fa578 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop
# Conflicts:
#	src/sounds.c
#	src/sounds.h
2018-09-22 23:11:14 +01:00
toaster
d2ca0d5bfe Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into addons_menu
# Conflicts:
#	src/m_menu.c
2018-09-22 23:00:46 +01:00
TehRealSalt
2e0365645e Merge branch 'master' into this-is-a-sign 2018-09-22 17:58:35 -04:00
Sal
739bbd3808 Merge branch 'encore' into 'master'
Encore

See merge request KartKrew/Kart!7
2018-09-22 17:52:33 -04:00
Sal
2f4a91bff2 Merge branch 'shitsfree' into 'master'
:shitsfree:

See merge request KartKrew/Kart!12
2018-09-22 17:24:11 -04:00
Sal
7dd66f62d6 Merge branch 'icon_update' into 'master'
Icon Update

See merge request KartKrew/Kart!9
2018-09-22 17:19:02 -04:00
Sal
fdff85791b Merge branch 'chat-changes' into 'master'
Chat changes

See merge request KartKrew/Kart!10
2018-09-22 17:14:04 -04:00
toaster
a5f8b8ac65 Turns out I actually forgot to push this when I did the GL fade colour thing earlier, woops. 2018-09-22 21:05:20 +01:00
toaster
bbed50b73f List update as requested by Sal 2018-09-22 20:56:44 +01:00
toaster
6884e4aa9a * Seven new text colours! Gold, Lavender, Tea-green, Steel, Pink, Teal, and Peach, all added to the menu highlights cvar.
* Revamp the saycmd colour list to take advantage of them. Peach and Purple are used the least...
* In all of the string drawers, replace colormap only when charflags changes.
* Add V_SKYMAP to dehacked.c alongside the above (oversight from when I added it yonks ago...)
2018-09-22 18:22:04 +01:00
toaster
d2fc1ea230 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into chat-changes 2018-09-22 15:14:21 +01:00
toaster
ba9df6d0d5 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into thundershield-hell
# Conflicts:
#	src/info.c
2018-09-22 14:57:33 +01:00
toaster
3e23576060 One last thing - make the OpenGL level loading bar screen have the correct background colour. 2018-09-22 12:43:54 +01:00
toaster
fd247b8252 Sign compare fix via boolean cast 2018-09-22 11:59:07 +01:00
TehRealSalt
6a8fa59277 Merge branch 'master' into new-voices 2018-09-21 21:13:46 -04:00
TehRealSalt
6ecf752273 Slightly darker green backgrounds 2018-09-21 19:51:31 -04:00
Latapostrophe
428ab9896d Did everything toaster suggested 2018-09-22 01:47:13 +02:00
TehRealSalt
fef5ec005f Different timings 2018-09-21 19:44:14 -04:00