Commit graph

3342 commits

Author SHA1 Message Date
toaster
379dbaa92c Here's my progress on making demoplayback camera less shit. I know what probably needs to be done to make it thorough is to replace all the consoleplayer stuff with displayplayer stuff in demoplayback, but don't feel like doing that right now. 2018-09-23 19:55:46 +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
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
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
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
TehRealSalt
fef5ec005f Different timings 2018-09-21 19:44:14 -04:00
TehRealSalt
932572abf8 Address review
- Reduced states
- Metal Sonic on sign roulette
- Landing sound
- New falling sound
2018-09-21 18:40:18 -04:00
TehRealSalt
b6e60d2a63 Minor adjustments to the endsign color back table 2018-09-21 16:54:29 -04:00
toaster
9ab42d91cb 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
77c69f6150 Merge branch 'master' into this-is-a-sign 2018-09-21 15:40:12 -04:00
TehRealSalt
32ad050de8 Prevent signs from disappearing 2018-09-21 15:37:30 -04:00
Sal
670e9bd539 Merge branch 'sal-misc' into 'master'
Sal misc

See merge request KartKrew/Kart!6
2018-09-21 15:08:05 -04:00
Latapostrophe
44e6bb8df3 Moved strlen(w_chat) out of the loop. 2018-09-21 17:03:09 +02:00
toaster
1e57004fad Partially address Sal's review last night by switching to a more sensible default. I'm still unconvinced on the need to make encore mode a seperate knob on the grounds of overcomplexity and "you can't turn map hell off", but hopefully this'll be a shippable state we can come back to later.
Also, thank you for reminding me, Sryder - disable my very, very limited progress on encore mode in openGL so that stages aren't an unintended hodgepodge of different colourschemes for the objects versus the level environment.
2018-09-21 12:12:17 +01:00
Latapostrophe
ed3b69ff7f Fix visual error related to moving the cursor on multi-line messages. 2018-09-21 12:23:00 +02:00
TehRealSalt
748028e8d5 Condense this re: wolfs 2018-09-20 22:16:04 -04:00
toaster
a901e2de7e Smaller XPM with no redundant pixels 2018-09-20 22:36:01 +01:00
TehRealSalt
1dc0c8ad0d Reeling back on this again
Kinda want to save it for another branch
2018-09-20 17:11:59 -04:00
TehRealSalt
c3c39182fb Address review
(for anything code I did, anyway)
2018-09-20 17:11:11 -04:00
Sal
8fe42fbf27 Merge branch 'sonicitems' into 'master'
Sonic Items

See merge request KartKrew/Kart!5
2018-09-20 14:51:07 -04:00
toaster
d16021febd :shitsfree: 2018-09-20 17:45:19 +01:00
TehRealSalt
a3089a546f Spindash boost dust, pogo spring sfx 2018-09-19 20:13:48 -04:00
TehRealSalt
43f8b46ba0 Merge remote-tracking branch 'origin/misc_plus_menustuffs' into sal-misc 2018-09-19 18:45:47 -04:00
TehRealSalt
a9d3789c37 Enable noclip cam again.
It's just... TOO good, despite the couple of issues with it
2018-09-18 23:56:26 -04:00
TehRealSalt
c043c79fd2 Spark fix
(please don't spread these fixes out across different branches :boi:)
2018-09-18 15:51:27 -04:00
toaster
15bf75d560 Update a bunch of icons - SDL_icon.xpm and other targets' .icos. 2018-09-18 19:37:03 +01:00