Commit graph

3000 commits

Author SHA1 Message Date
SeventhSentinel
d25f0b0d7e Killed another file I accidentally made 2018-07-04 16:12:05 -04:00
TehRealSalt
327446e367 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-07-04 13:51:59 -04:00
TehRealSalt
fbcf566874 WANTED recalculates on hit, tons of spectator changes 2018-07-03 21:12:25 -04:00
toaster
fa2aa98e04 * ACTUALLY fix waiting for players chat.
* Correct minor bug with blink cursor on IP in multiplayer menu.
2018-07-04 00:58:32 +01:00
toaster
81f9657f31 Chat messages in the waiting for players screen! 2018-07-03 22:30:22 +01:00
TehRealSalt
cbfa6bbe83 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-07-03 16:18:39 -04:00
TehRealSalt
d0fe935583 Fix joystick menu drawing
(also it was impossible to pick the 8th joystick, what's up with that?!)
2018-07-03 16:18:17 -04:00
toaster
37a336a4cf Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems 2018-07-03 21:16:57 +01:00
Sryder
6b3f35813a We use the PRNG far too much to not do consistancy checking on it in race 2018-07-03 21:01:46 +01:00
Sryder
0375ea4f0b 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
a6c0a470c6 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-07-03 15:38:15 -04:00
SeventhSentinel
9e23e0a8f8 (also killed some extra files I accidentally added, oops) 2018-07-03 15:36:37 -04:00
TehRealSalt
9a716a7cfe Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-07-03 15:35:39 -04:00
SeventhSentinel
9e44f6e705 I forgot about dood balloons, oops 2018-07-03 15:34:14 -04:00
TehRealSalt
ec6f6cfa70 Fix splitscreen joystick 2018-07-03 15:32:26 -04:00
SeventhSentinel
80c2b56927 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
249bb594d8 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems 2018-07-02 23:29:21 +01:00
TehRealSalt
45ea6cad0a Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-07-02 18:25:39 -04:00
TehRealSalt
e366233af9 SPB chances no longer lower if you mash 2018-07-02 18:25:15 -04:00
toaster
cbb9206c54 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems 2018-07-02 23:23:51 +01:00
toaster
08a2a8f3d1 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems 2018-07-02 23:23:23 +01:00
TehRealSalt
c6f4869700 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
b0d9110e5f 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
2f1601dffd Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-07-02 17:58:20 -04:00
TehRealSalt
6698bb5772 Battle finish music, fixed double-wanted bug 2018-07-02 17:57:22 -04:00
Sryder
c8f61edea5 Screen for waiting during intermission after connecting 2018-07-02 22:11:03 +01:00
toaster
fe8b98ec22 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
3184d2a7b0 Removed Amber & Jade, added Canary & Lime, changed Blueberry & Mint 2018-07-02 13:54:01 -04:00
toaster
0b9b7c3371 Tweak player setup menu. 2018-07-02 14:43:52 +01:00
toaster
e76c328129 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
4ffb80806b Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-07-02 03:36:43 -04:00
TehRealSalt
b3cae5d633 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
6f3febccf5 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems 2018-07-02 01:55:41 +01:00
toaster
ce4136a901 Fix Ghost z not being set properly. Again. 2018-07-02 01:55:13 +01:00
toaster
89cce5c461 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
70c1420a51 Move numingame count after the balloon check 2018-07-01 15:25:10 -04:00
TehRealSalt
fb975e7ae7 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-07-01 15:17:59 -04:00
TehRealSalt
f11ee9421e Quick fix 2018-07-01 15:15:45 -04:00
toaster
d4556cfe25 Fix another whoopsie! 2018-07-01 20:03:01 +01:00
toaster
e4ec7e1567 Correct outdated text. 2018-07-01 20:01:48 +01:00
toaster
39b667b0e3 Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart.git into sonicitems 2018-07-01 19:29:29 +01:00
toaster
776c66514d 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
c00736efac WANTED 2 2018-07-01 14:11:48 -04:00
TehRealSalt
5c7b66cc0f WANTED 2018-07-01 04:36:09 -04:00
TehRealSalt
2f8801902f Fix scale issues with karma hitbox if recently used Grow 2018-06-30 23:49:37 -04:00
TehRealSalt
72ed94bfcf 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
4a9c3618c3 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
5c2110dafe Fix the issue with timing out when joining during intermission 2018-07-01 03:06:34 +01:00
TehRealSalt
e4c96fcd7f Merge branch 'sonicitems' of https://git.magicalgirl.moe/KartKrew/Kart into sonicitems 2018-06-30 21:19:54 -04:00
TehRealSalt
389cd7ea7d Little things 2018-06-30 21:18:38 -04:00