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
5851 commits 1 branch 12 tags 205 MiB
Commit graph

413 commits

Author SHA1 Message Date
toaster
254adfc154 Merge branch 'hellattack' into 'master' 
Hell Attack

See merge request KartKrew/Kart!35
 2018-10-10 13:33:57 -04:00
TehRealSalt
511944a1f1 Merge branch 'master' into net-screen 2018-10-09 15:43:38 -04:00
TehRealSalt
7a8dc91b6a Fix tabbing 2018-10-09 15:28:52 -04:00
TehRealSalt
1bce22cf72 Merge branch 'master' into sal-cleanup 2018-10-08 00:22:44 -04:00
toaster
8478243082 Access to map hell maps in record attack. Currently dependent on 50 emblems. 
Also: temporarily cleaned up the M_CanShowLevelInList record attack conditions to automatically match what we want, instead of requiring us to apply a bunch of vanilla flags just to emulate our "available unless explicitly hidden" MP mechanism like is currently in maps.kart.
 2018-10-06 21:08:09 +01:00
TehRealSalt
37b5a9327c Merge branch 'master' into net-screen 2018-10-05 16:13:25 -04:00
TehRealSalt
1955ff0dd0 Merge branch 'master' into sal-cleanup 2018-10-04 18:51:45 -04:00
toaster
5006a54bf7 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into toast_misc 2018-10-03 21:04:34 +01:00
TehRealSalt
63ed629c35 Merge branch 'master' into net-screen 2018-10-01 19:46:25 -04:00
TehRealSalt
9e068f8c03 Address toast review 
- Re-add highlighting to the header text, and shift it back up slightly
- Move the viewpoint loop break out of a while and into the main loop
 2018-10-01 19:23:38 -04:00
TehRealSalt
e307393b0f Change dummysplitplayers into splitplayers, unhide it, and set it when joining and not just hosting 
Silly oversight
 2018-09-30 18:07:05 -04:00
TehRealSalt
ee7865a8bd I have no idea if this is an actual problem or not, but this was in the back of my mind from day 1 2018-09-30 17:17:33 -04:00
TehRealSalt
f9ed3bc219 Sorta messy menu to set splitscreen 
Now this branch is completely functional!
 2018-09-30 17:09:59 -04:00
TehRealSalt
2d7b130a7f Temporary testing measure 
set splitscreen = 3 on host or connect
 2018-09-30 11:22:56 -04: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
TehRealSalt
40f887fc7e Scale fixes 2018-09-27 17:17:04 -04:00
TehRealSalt
771367c5d7 New bindable keys 
You can now remap Change Viewpoint, Screenshot, and Toggle GIF Recording to other keys, mainly for gamepads

They also pushed me to my breaking point and I couldn't tolerate the control menu anymore, thanks to toaster for the scrolling backport
 2018-09-27 16:55:21 -04:00
toaster
ff773a79c0 Disable cv_joinnextround behind #define VANILLAJOINNEXTROUND. 2018-09-27 21:38:19 +01:00
TehRealSalt
2d5e603974 ESC rebind works on both bound keys 2018-09-26 20:51:25 -04:00
toaster
9c6a1aaac0 Manual has more pages and less terrible large-size support. 2018-09-25 22:33:22 +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
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
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
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
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
748028e8d5 Condense this re: wolfs 2018-09-20 22:16:04 -04:00
toaster
d16021febd :shitsfree: 2018-09-20 17:45:19 +01:00
toaster
cb98c0c3f8 Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into misc_plus_menustuffs 
# Conflicts:
#	src/k_kart.c
 2018-09-17 11:19:17 +01:00
TehRealSalt
30c37ee440 Revert this now that we have ESC functionality 
(I mean. I still think this feels nicer than pressing the menu button, but...)
 2018-09-15 20:13:29 -04:00
mazmazz
c64d52c1f9 Don't call I_StartupSound in SFX toggle 
* Mixer: make I_StartupSound return early if already set up
* Restartaudio: Add StopSFX call
 2018-09-14 16:39:10 -04:00
mazmazz
e7d87ea486 Menu sound toggle fixes (and add starpost sfx to menu) 2018-09-14 11:24:28 -04:00
mazmazz
89dcae23a2 Play the opposite type music (Digital/MIDI) when toggling between them in menu 
* S_MusicInfo method to retrieve name, flags, and looping

(cherry picked from commit f6ec93198f0dcfa1d053cca88172c3e3c7ba310c)
 2018-09-14 10:38:32 -04:00
mazmazz
b51cf6c060 Toggle Digi/MIDI music in menu accurately; add S_MusicType 
(cherry picked from commit 4aa100aa575cc7fc14a743085222c806ba2c714a)
 2018-09-14 10:37:08 -04:00
mazmazz
23acc47b39 nodigimusic nomusic nosound -> digital_disabled midi_disabled sound_disabled 
(cherry picked from commit 07738fb0bcf640a4349337373f451fe68e024b2a)
 2018-09-14 10:35:51 -04:00
mazmazz
f41ad3073d Refactoring, music statues 
* S_Init -> S_InitSfxChannels because it did mostly SFX anyway
* S_MusicPlaying, S_MusicPaused, S_MusicName, S_MusicExists new status methods
* I_MusicPlaying, I_MusicPaused

(cherry picked from commit f5f0b5e76c2fd405c8cc895dde653c5ed2652622)
 2018-09-14 10:28:29 -04:00
toaster
8df3e2ffbe Do a bunch of major modifications to the voting system's rule change system! 
* Add `kartvoterulechanges`, or "Voting Rule Changes" on the menu, to allow some user control over event frequency.
	* "Never" - does what it says on the tin.
	* "Sometimes" - 1/8 chance of Encore if host has unlocked it, only gametype change when buffer is full
	* "Frequent" - 1/2 chance of Encore if host has unlocked it, gametype change every 5 maps
	* "Always" - If host has unlocked Encore, alternates between Encore and Gametype. Otherwise, always a gametype change
	* There's probably room for a setting between "Sometimes" and "Frequent", but I didn't want to overload the host with options and these were the ones that made sense.
* Better handling of buffer refreshes, to prevent two of the same map appearing next to each other in the voting unless there literally aren't that many maps.
* Mostly unrelated: Minor bugfix for Y_SetupVoteFinish, preventing music changes/random sounds playing on the You Will Join Next Race screen. (Branch-appropriate, at least.)
 2018-09-11 15:42:53 +01:00
toaster
33ab47dd3a I was getting annoyed by these arrows and their inconsistency, so I made them use the graphics. 2018-09-10 12:41:53 +01:00
toaster
e91d9760a2 More manual pages, plus renaming the option to Tricks & Secrets (F1) - PLUS, the magic of a little animated how-to for leafing through the pages. Requires new patch.kart, as I wanted the leading zeroes and Jeck wanted to add more pages without more commits later... 2018-09-10 12:39:59 +01:00
toaster
2198d60b07 Merge branch 'sal-misc' of https://git.magicalgirl.moe/KartKrew/Kart.git into misc_plus_menustuffs 2018-09-10 11:43:45 +01:00
TehRealSalt
b4bf63b16b Merge branch 'sonicitems' into sal-misc 2018-09-10 03:22:11 -04:00
wolfy852
715711cc7b Change ESC menu override string to "Open/Close Menu (ESC)", adjust menu accordingly 2018-09-09 21:24:19 -05:00
wolfy852
56e615d595 Merge commit 'c92926bfb6e080e39e658086fbc6f44b605348d3' into sonicitems 2018-09-09 17:57:23 -05:00
toaster
605224ff08 Disable the options you MEANT to disable. 2018-09-09 15:44:37 +01:00
toaster
afec11f84e This isn't vanilla, don't be a shit about secrets and addfile (plus it helps that this fixes a crash) 2018-09-09 15:17:41 +01:00
toaster
e7b53c3c09 * User manual! 
* Some visual ordering fixes for the item menu, plus a #define-toggleable option for the bottom right slot to be traversable for ease-of-use purposes (even if it doesn't do anything).
 2018-09-08 17:02:03 +01:00
TehRealSalt
8fa9fef15d Redone stat graph 2018-09-03 00:06:17 -04:00
toaster
1dfe7e3da4 Update arrow rendering to use simple character function rather than overkill string function. 2018-08-31 22:38:56 +01:00
TehRealSalt
b26c30156b Toggle All option 2018-08-31 14:41:37 -04:00