TehRealSalt
37b5a9327c
Merge branch 'master' into net-screen
2018-10-05 16:13:25 -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
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
toaster
ff773a79c0
Disable cv_joinnextround behind #define VANILLAJOINNEXTROUND.
2018-09-27 21:38:19 +01: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
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
TehRealSalt
27f7e5bb4a
Small fix
2018-08-31 13:23:05 -04:00
TehRealSalt
af0035aaba
Toggles for kitchen sink, ten banana, & quad orbinaut, and a screen that they can fit on
2018-08-31 13:18:19 -04:00
toaster
c95e6f01d3
disable encore ruby/flip on record attack menu with kartencore on
2018-08-29 22:02:42 +01:00
toaster
1b1f057e82
* Prettier record attack screen!
...
* Uses the in-game timer element to draw its times.
* This includes showing them time emblems-to-get!
* good night sweet prince
* Make the emblem time use the same ' and " as the normal time.
2018-08-29 21:37:47 +01:00
toaster
c15fcaf51d
* Add support for .kart files.
...
* Wrap behind-the-scenes `addfile/exec` contents in quotation marks to allow for files with spaces in them.
2018-08-29 14:19:08 +01:00
toaster
530983e435
Addons menu.
...
Bitch.
2018-08-28 21:08:47 +01:00
toaster
b637ae3d73
Additional oversight corrected.
2018-08-15 16:59:28 +01:00
toaster
0b772c2477
Merge branch 'sonicitems' into encore
2018-08-15 16:12:42 +01:00
toaster
42e63fc32e
Added "Random" to the level selection list, for those days when you know you *want* to race but don't have any idea what to do.
2018-08-15 16:12:36 +01:00
toaster
3e63209d68
Make some minor tweaks to the two server setup menus (splitscreen and not-splitscreen).
...
I wouldn't have done this, but I was already in the code to fix the bugs, so I hit something that was bugging me[/sonic adventure voice] as well
2018-08-15 15:22:50 +01:00
toaster
bb3bb48fe6
* Disable inverting on encore level select pictures at unanimous request of last night's netgame.
...
* Also, correct their alignment in y_inter.c.
2018-08-14 15:32:17 +01:00
toaster
e8c436ab76
* Encore on the voting screen! Appears randomly once unlocked in the same slot as that which sometimes represents a gametype change (odds inflated for testing purposes).
...
* A better representation of an Encore level, now with inverted graphics (a special remapping we can now use elsewhere whenever if we want!) and a floating Ruby!
* Decouple encore's setting from cv_kartencore on mapload. Instead, bake it into D_MapChange and related, which will only some of the time be fed by cv_kartencore's value.
* Encore mode now has a special mapheader palette setting, "encorepal", rather than using the same one as non-encore.
2018-08-11 22:23:40 +01:00
toaster
132dd5828a
* For testing purposes, show Encoremaps on the level select icons.
...
* HOWEVER, we should seriously address this again later, because the antialiasing DOES result in some unfortunate bullshit...
* Encoremap maces per Oni's request and Sal's suggestion
2018-08-10 21:11:45 +01:00
toaster
670ad8cbd1
Merge branch 'sonicitems' into encore
...
# Conflicts:
# src/st_stuff.c
2018-08-10 15:35:00 +01:00
toaster
471796d8a3
Fix all actionable comments in my review of sonicitems.
2018-08-09 22:59:52 +01:00
toaster
36ec90ed21
* Make Encore Mode an unlockable, rather than freely available.
...
* Make unlockables have a "showing" conditionset, for when you're able to see them on the Extras screen.
* A shorter Encore ruby-pulse fade, for when encore mode is already active!
2018-08-08 20:48:29 +01:00