Commit graph

2940 commits

Author SHA1 Message Date
Sryder
1041315b94 Only do Mobj and RNG consistancy checking when actually in a level.
Mobjs are completely irrelevant outside of levels and the PRNG is not used in a synchronised way in anywhere except when in levels either
2018-07-03 20:53:37 +01:00
TehRealSalt
68e66e67ab Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-07-03 15:38:15 -04:00
SeventhSentinel
60b89a7ac7 (also killed some extra files I accidentally added, oops) 2018-07-03 15:36:37 -04:00
TehRealSalt
a3a25847f1 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-07-03 15:35:39 -04:00
SeventhSentinel
644fcf4925 I forgot about dood balloons, oops 2018-07-03 15:34:14 -04:00
TehRealSalt
129e5dae20 Fix splitscreen joystick 2018-07-03 15:32:26 -04:00
SeventhSentinel
5158508a00 Changed all instances of "balloon" to "bumper"
Also changed "It's you!" to "Select character & color..."
2018-07-03 15:14:47 -04:00
toaster
9dc099609f Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems 2018-07-02 23:29:21 +01:00
TehRealSalt
0fe2652c63 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-07-02 18:25:39 -04:00
TehRealSalt
1b3e6ea79f SPB chances no longer lower if you mash 2018-07-02 18:25:15 -04:00
toaster
d00b45fcae Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems 2018-07-02 23:23:51 +01:00
toaster
2b51fe1866 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems 2018-07-02 23:23:23 +01:00
TehRealSalt
b2bccf2198 Item odds adjustment
Battle no longer does item scaling if you're ahead, only if you're behind. This means less bananas. Also, SPB increased odds, Shrink is less often.
2018-07-02 18:23:18 -04:00
toaster
7329fa6aa7 Intermissions...
* Do the gametype change stuff on the voting screen.
* Make all the picking sound and setting stuff one function, rather than in two seperate places that need to be kept identical.
* Have the timer at the bottom be the highlight colour.
* Map hell! LF2_HIDEINMENU is craftily reused...
* Less allocation and deallocation for the adjacent G_RandMaps.

Other stuff...
* Fix command_map_f not resetting players' score in battle.
* Shiny titlescreen!
* Fix a random bonus newline in one of the quit messages.
2018-07-02 23:23:04 +01:00
TehRealSalt
865cce8ba4 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-07-02 17:58:20 -04:00
TehRealSalt
80dc8927dd Battle finish music, fixed double-wanted bug 2018-07-02 17:57:22 -04:00
Sryder
4c32641b2f Screen for waiting during intermission after connecting 2018-07-02 22:11:03 +01:00
toaster
df607757df On a hunch, looked it up. Turns out it's a common typo, and that a nickle is actually a type of green woodpecker!! :V 2018-07-02 19:06:05 +01:00
TehRealSalt
2bf7d8eb78 Removed Amber & Jade, added Canary & Lime, changed Blueberry & Mint 2018-07-02 13:54:01 -04:00
toaster
0fb35630bf Tweak player setup menu. 2018-07-02 14:43:52 +01:00
toaster
84aa14768f Sorry, Sal! In my defense, you don't need to recompile from scratch for any of this, despite what it may look like, as the skincolour name lists are walled off from the rest of the dehacked lists...
More menu/highlight things:
* Rename "Default" to "Game type", to make clearer what it's doing.
* Tweak race colouring slightly.
* Put a highlight around the level select icon, and make it consistent with voting.
* Allow setting the highlight colour to affect the intermissions.
* Fix bug with gametype colour getting for record attack.

A handful of skincolour things:
* Rename Turqouise to Aqua, because it resembles one of my fav 2.2 colours with that name.
* Fix incomplete Steel Blue -> Steel rename.
* Merge the very similar Blueberry and Sapphire...
* ... so Sapphire can be backported!
* And Ruby too.
2018-07-02 13:20:04 +01:00
TehRealSalt
fcc8c5dce7 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-07-02 03:36:43 -04:00
TehRealSalt
f1b32c6e13 Revamped colors
- The majority of all colors have been tweaked in some capacity to have higher contrast, to either make character highlights or lineart pop out more
- Two new "on trial" colors that may or may not stay: Tangerine, and Dusk. Tangerine is a yellow-orange color to fill the void of yellows. Dusk is a previously removed color that looked freakin' sweet after some cleanup, why wasn't this kept?!
- Turquoise & Frost have been merged. My clean up of Frost ended up looking like a combination of the two.
- Caramel has been removed, Shiny Caramel takes its place.
- Unleashed my inner dream as wanting to have the job of whoever gets to name crayons, and changed all two-word names.
- Todo: reorganize by hue then lum for a nicer invincibility effect, redo and throughly test ColorOpposite table, double check to make sure there aren't any duplicate blendcolors for OGL
2018-07-02 03:30:33 -04:00
toaster
bab7a8d6c1 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems 2018-07-02 01:55:41 +01:00
toaster
7190ee977b Fix Ghost z not being set properly. Again. 2018-07-02 01:55:13 +01:00
toaster
0c03442a69 More menu stuff!
* Center level selection.
	* Re-work Record Attack screen.
	* Re-order MP Main menu, hide in NONET.
	* Combined yeeeah on vote screen.
	* Colour gametype on tab and tally.
	* (unrelated) Don't show "CHECK" if exiting.
2018-07-02 01:55:01 +01:00
TehRealSalt
e5d59fdc50 Move numingame count after the balloon check 2018-07-01 15:25:10 -04:00
TehRealSalt
46d33d00be Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-07-01 15:17:59 -04:00
TehRealSalt
4fe34aa35d Quick fix 2018-07-01 15:15:45 -04:00
toaster
e9afcdfbed Fix another whoopsie! 2018-07-01 20:03:01 +01:00
toaster
d083181f3b Correct outdated text. 2018-07-01 20:01:48 +01:00
toaster
806f79d5ee Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems 2018-07-01 19:29:29 +01:00
toaster
580c529c5b Menu stuff!
* Bar of levels.
* Colourisation!
* New V_SKYMAP, which hasn't been put in dehacked lists but is otherwise valid!
* New single page statistics screen!
* V_DrawFixedPatch now works at the edge of the screen!

Ghost fixes!
* On minimaps!
* Free memory after use!
* Don't spawn in midair on slopes!
2018-07-01 19:29:13 +01:00
TehRealSalt
18fc952fa7 WANTED 2 2018-07-01 14:11:48 -04:00
TehRealSalt
d4c5a92c7b WANTED 2018-07-01 04:36:09 -04:00
TehRealSalt
2fcd036b2b Fix scale issues with karma hitbox if recently used Grow 2018-06-30 23:49:37 -04:00
TehRealSalt
4e69131997 Reset scores between Battle matches for now
I want to tackle the two intermission screens whenever I do the same for Race
2018-06-30 23:43:45 -04:00
TehRealSalt
b661be498b Reverted scoring back to what it was before, change order-of-operations to allow switcheroos from bombs. 2018-06-30 23:35:38 -04:00
Sryder
f1430ad28f Fix the issue with timing out when joining during intermission 2018-07-01 03:06:34 +01:00
TehRealSalt
ec1ef3e4a4 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-06-30 21:19:54 -04:00
TehRealSalt
c4c1aa78c8 Little things 2018-06-30 21:18:38 -04:00
toaster
baa1024ffb Don't look at this commit too closely until after netgame, I want to surprise yalls!!
* Lots of menu changes!
	* Little arrows next to changeable cvars!
	* Show default value for sliders!
	* Pretty pretty pretty.
	* I don't know how to describe some of these changes.
* Effectively nuke MIDI music support!
* Skiddown at the start of a race is more interesting!
* Spinning in waterslides!
* Tiny bugfix in voting, plus a little celebration...
2018-06-30 23:18:13 +01:00
toaster
01b2468982 Merge branch 'sonicitems' of https://git.magicalgirl.moe/STJr/SRB2.git into sonicitems 2018-06-30 16:01:08 +01:00
toaster
a7b631701c * Completely revamp a bunch of menu stuff!
* Improve control menus significantly - a more layout-neutral, gameplay importance based order, with spacing, and less depth to get to the important stuff.
	* Port over the improved MP main menu from internal, including flattening the IP connect onto its level.
	* Allow for selecting the number of splitscreen players using a menu option, rather than three seperate menu choices.
	* Improve the layout of all of the level/gametype select menus slightly.
* (unrelated) Make fourth player area in 3p splitscreen use the tiling background instead of a pure black area.
* (unrelated) Tweak minimap ordering slightly.
2018-06-30 16:01:03 +01:00
TehRealSalt
65bf40c4c6 Unused vars 2018-06-29 22:17:36 -04:00
TehRealSalt
ea8ac5c35e GO! interupts the start ambience 2018-06-29 20:15:42 -04:00
toaster
cb92c6b679 * Rework min/max cvars to allow for "named" values! They probably won't work if they're inside the range, but...
* Combine the numlaps and usemapnumlaps functionality on the menu into basenumlaps, which numlaps is set to every race start, except when it's map default value (0) in which case it loads the map's lap count.
2018-06-29 17:49:02 +01:00
toaster
ef8a5b2a7f * Properly handle gametype changes when a different-gametype level pops up on the voting screen.
* Defer the change until you're actually modifying the map, in service of the following.
	* Reset score.
	* Call that gametype change function.
* Collary of the above: Don't reset score if you're `map mapxx`ing in the console, unless it's `force`'d.
* Fix the basic, obvious issues that'd prevent us shipping with the new level title system.
	* Correct the non-green resolution support, which was ALMOST there but which I accidentially fucked up one of the signs on.
	* Adjust the subttl position if it'd get overwritten.
	* Draw the gametype with the subttl.
* Adjust the gametype constants for easier gametype_cons_t array access.
2018-06-29 15:14:43 +01:00
SeventhSentinel
2f82227d6e A minor tweak 2018-06-28 21:19:58 -04:00
SeventhSentinel
3bfdfe9412 Splitscreen items
(also fixed Big Ring flags)
2018-06-28 20:54:06 -04:00