stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-25 11:50:50 +00:00
Code Issues Projects Releases Packages Wiki Activity
3535 commits 60 branches 11 tags 94 MiB
Commit graph

3535 commits

This branch
This branch
All branches
Author SHA1 Message Date
toaster
eb4a967d8e 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
b964c1c49a Merge branch 'thundershield-hell' into 'master' 
Thundershield hell

See merge request KartKrew/Kart!14
 2018-09-23 18:08:59 -04:00
toaster
c9e994ae07 smoll to tiny 2018-09-23 23:07:38 +01:00
toaster
c0a16be662 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
9c10a85596 Merge branch 'itemdrop' into 'master' 
Itemdrop

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

See merge request KartKrew/Kart!8
 2018-09-23 12:58:06 -04:00
toaster
d2d6e67f48 Forgot I did this optimisation! Updated for the new colours. 2018-09-23 16:39:07 +01:00
toaster
73116f2b60 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
fa65cbb43e 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
c5e16f183e 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
2e158f2c21 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
659810cd81 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
TehRealSalt
9f42e74fe2 Attempt to not let the camera into thok barriers 
Doesn't really work right now; it'll still go into thok barriers and get caught up at its floor height
 2018-09-22 22:46:06 -04:00
TehRealSalt
3949d0fcdb Obvious first commit: enable the NOCLIPCAM define again 2018-09-22 22:22:44 -04:00
Sal
8ff0e976c2 Merge branch 'new-voices' into 'master' 
New voices

See merge request KartKrew/Kart!15
 2018-09-22 20:22:59 -04:00
TehRealSalt
c63518e0b2 Doing this looks more appealing to me 2018-09-22 20:15:12 -04:00
TehRealSalt
8a06e78ab6 Quick fix for other player's win/lose not playing 2018-09-22 20:14:32 -04:00
Sal
9c361f8a19 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
bb1aaf9d54 New sparkles 2018-09-22 19:55:26 -04:00
TehRealSalt
ad8d674e5e 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
a3b40c7577 Better particle spread 2018-09-22 19:00:30 -04:00
TehRealSalt
487e114fee raceexittime var 2018-09-22 18:59:26 -04:00
toaster
d7f8d4507a 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
6cc7f97d8a 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
7256e99b12 Merge branch 'master' into this-is-a-sign 2018-09-22 17:58:35 -04:00
Sal
5f78807ef0 Merge branch 'encore' into 'master' 
Encore

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

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

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

See merge request KartKrew/Kart!10
 2018-09-22 17:14:04 -04:00
toaster
f20710fbb4 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
81c04480f9 List update as requested by Sal 2018-09-22 20:56:44 +01:00
toaster
3a76605772 * 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
1f2ee32a83 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into chat-changes 2018-09-22 15:14:21 +01:00
toaster
e63d4740ec 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
4fd4deff8a One last thing - make the OpenGL level loading bar screen have the correct background colour. 2018-09-22 12:43:54 +01:00
toaster
84c2a8c28f Sign compare fix via boolean cast 2018-09-22 11:59:07 +01:00
TehRealSalt
e9d4fae5b9 Merge branch 'master' into new-voices 2018-09-21 21:13:46 -04:00
TehRealSalt
0e39bf2821 Slightly darker green backgrounds 2018-09-21 19:51:31 -04:00
Latapostrophe
f8c9ef9431 Did everything toaster suggested 2018-09-22 01:47:13 +02:00
TehRealSalt
dd6b63f9da Different timings 2018-09-21 19:44:14 -04:00
Latapostrophe
23090e82b5 Changed thundershield sound 2018-09-22 01:15:04 +02:00
TehRealSalt
3fa7f4e7b4 Address review 
- Reduced states
- Metal Sonic on sign roulette
- Landing sound
- New falling sound
 2018-09-21 18:40:18 -04:00
toaster
20222c47e7 Okay, seems like reducing it to 1x is enough - making it singular is overkill and means that often if the furthest one away from you is the one to yell, you'll barely hear it. At least this way you'll only hear overkill chao if you're super close to the stands and the mapper's placed way too many 2018-09-21 22:06:27 +01:00
TehRealSalt
cb3c93e56e Minor adjustments to the endsign color back table 2018-09-21 16:54:29 -04:00
toaster
80bc266f3f Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into itemdrop 
# Conflicts:
#	src/info.c
#	src/k_kart.c
 2018-09-21 21:05:47 +01:00
toaster
084b99a5c9 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into encore 
# Conflicts:
#	src/info.c
#	src/m_menu.c
#	src/y_inter.c
 2018-09-21 20:54:38 +01:00
TehRealSalt
4fa1860543 Merge branch 'master' into this-is-a-sign 2018-09-21 15:40:12 -04:00
TehRealSalt
06a4a5e4dc Prevent signs from disappearing 2018-09-21 15:37:30 -04:00