Sal
46400a08ef
Merge branch 'sp_fixes' into 'master'
...
Singleplayer fixes (no, not record attack, the *other* one)
See merge request KartKrew/Kart!46
2018-10-19 15:50:06 -04:00
Sal
ef9ab0290e
Merge branch 'unlock-hard' into 'master'
...
Hard Mode is an unlockable
See merge request KartKrew/Kart!40
2018-10-19 15:49:32 -04:00
toaster
efc37b002b
Some token efforts to make singleplayer mode (accessible only via -warp and map mapxx -force) not COMPLETELY broken.
...
* Fixed the conditionals for `suicide` and `retry` commands - `suicide` is now allowed in singleplayer, and `retry` no longer checks your lives (for now).
* Disable the "traditional" level reload method (which `retry` tried to use), since it was completely broken with the other changes we've made. Mapchanges only.
* Made retries cause a mapchange, per the above.
* Disable the last source of skincolor trampling in the game - loading a level while not netgame or record attacking.
2018-10-17 13:40:17 +01:00
toaster
12d67e62bc
Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into net-screen
2018-10-16 22:13:45 +01:00
toaster
d317dab7f2
[22:03] TehRealSalt: Not organized code-wise, figured toaster would want to help with that since she's the Menu Queen and she probably has better ideas on how to do it
...
The Menu Queen is in the house~ ✨
* Magical, single-page player select and general netgamey stuff, while still remaining both pretty and functional.
* Death to NOFOURPLAYER, now that the cat's out the bag.
* Clean up NONET, assuming people try to make DD builds on release.
* Minor tweaks across the board, mostly places where I wanted to pilfer minor code from and realised it wasn't done optimally originally.
2018-10-16 22:11:47 +01:00
TehRealSalt
bda7d70c15
Quick fix for banana cheat not showing all unlockables
...
Plus, this is generally better, as a mod could let you unlock stuff "out-of-order"
2018-10-15 22:02:10 -04:00
TehRealSalt
e3c85a827d
Merge branch 'master' into net-screen
2018-10-15 21:57:11 -04:00
TehRealSalt
4d893971b5
Show Spectator controls for P2-P3 again
2018-10-15 20:31:26 -04:00
TehRealSalt
7201a254ce
Spectate/Enter menu for online splitscreen
...
Just like the menu option
2018-10-15 20:28:35 -04:00
toaster
6469956d6a
Final weather stuff.
...
* Multiplied rain speed by 3, per Oni's request.
* Disable weather density - force to 1 if weather draw distance, otherwise zero
* Move the ceilingpic check into a more convenient part of the weather spawning loop.
* `drawdist_precip_cons_t` - replaces "Infinite" with "None".
* Disable the lowest normal draw distance (256), given... both kart and srb2 are basically unplayable like that.
* Disable cv_drawdist_nights entirely.
2018-10-14 22:32:34 +01:00
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
mazmazz
85c6715188
musicplus-libopenmpt 2.2 -> 2.1 backport
2018-09-18 12:31:47 -04: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
707d649d67
Merge branch 'musicplus-core' into musicplus-sdlmixerx
2018-09-15 01:17:33 -04:00
mazmazz
b2e3352c5a
Merge branch 'music-cleanup' into musicplus-core
2018-09-15 00:46:02 -04:00
mazmazz
00987dd7e5
Don't call I_StartupSound in SFX toggle
...
* Mixer: make I_StartupSound return early if already set up
* Restartaudio: Add StopSFX call
(cherry picked from commit c64d52c1f9 )
2018-09-14 16:43:48 -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
1b2d28bc7a
More unnecessary if conditions, toggle SFX menu
2018-09-14 13:54:41 -04:00
mazmazz
b767a0bfd1
Sound menu toggle fix: unnecessary if condition
2018-09-14 11:25:25 -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