Commit graph

901 commits

Author SHA1 Message Date
Alam Arias
aaccb4edff fixed compiling for MSVC 2017 2019-03-04 16:33:06 -05:00
Sal
506f98f5e2 Merge branch 'color-fixes' into 'next'
Color fixes

See merge request KartKrew/Kart-Public!93
2019-02-27 16:24:03 -05:00
Sal
5f6c63f3b0 Merge branch 'water-update' into 'next'
Water update

See merge request KartKrew/Kart-Public!83
2019-02-27 01:12:35 -05:00
Sally Cochenour
e37417213e Merge branch 'next' into color-fixes 2019-02-27 00:09:39 -05:00
Sally Cochenour
008d9c9dc0 10 new colors
new Crimson (old Crimson was renamed to Scarlet), new Peach (the replacement from last commit was renamed to Cream), Cherry, Nova, Copper, Handheld, Algae, Pastel, Fuchsia, and Toxic. Also, updated Robo-Hood.
2019-02-27 00:08:13 -05:00
Sal
dedf6b5bd1 Merge branch 'wipeout-particle-tweak' into 'next'
Wipeout particle tweak

See merge request KartKrew/Kart-Public!84
2019-02-26 17:50:13 -05:00
Sally Cochenour
d88d8adf4c Fix Super colors from base SRB2 giving a garbage color 2019-02-26 07:14:03 -05:00
Sally Cochenour
e81df9474f Modify a few colors
- The following colors were given either more noticeable highlights or deeper shading for better colorized WANTED poster appearance: Nickel, Black, Beige, Brown, Leather, Salmon, Red, Crimson, Pumpkin, Rosewood, Burgundy, Pinetree, Swamp, Periwinkle, Blue, Blueberry, Dusk, Purple, Lavender, and Byzantium.
- Fixed an off-looking purple tone on Ruby.
- Salmon's outline & shading was made darker, to make it slightly easier on the eyes.
- Peach recieved a complete overhaul, featuring high contrast and yellow highlights.
- Add kartdebugcolorize for taking a quick glance at all of the colorizations
2019-02-26 04:30:51 -05:00
Sally Cochenour
de4eddb98e Revert this minor change 2019-02-22 22:50:13 -05:00
Sally Cochenour
a3c48d7c40 Update item table
Not looking forward to testing...
2019-02-22 22:49:27 -05:00
Sal
ea0da92c22 Merge branch 'ping-stuff-take2' into 'next'
Ping improvements

See merge request KartKrew/Kart-Public!68
2019-02-22 19:13:49 -05:00
Sal
e07d3b2b74 Merge branch 'item-odds-fixup' into 'next'
Simulate fractional precision on item odds

See merge request KartKrew/Kart-Public!70
2019-02-22 18:53:28 -05:00
James
bc1990f7d4 Modify momz underwater for lots of things in k_kart.c 2019-02-19 23:38:16 -05:00
James
e1d2ddf3ce Wipeout particles come from back wheels 2019-02-19 23:01:19 -05:00
Sal
4096212282 Merge branch 'make-bumpcode-perfecter' into 'next'
Make bumpcode perfecter

See merge request KartKrew/Kart-Public!77
2019-02-19 18:09:30 -05:00
fickleheart
4619e8ad82 Add check to all of the friction stuff 2019-02-19 17:05:04 -06:00
fickleheart
0183368a6c Only apply friction changes on the ground 2019-02-19 16:46:48 -06:00
fickleheart
5e8236c74f Add null check too 2019-02-19 16:04:23 -06:00
fickleheart
8348821f30 Remove debugging print 2019-02-18 23:39:08 -06:00
fickleheart
daca5c9ae2 Fix players sometimes snapping backwards on landing after spikeball hits 2019-02-18 23:35:24 -06:00
fickleheart
75c606764f Make extra sure we launch in the correct direction 2019-02-18 23:35:01 -06:00
fickleheart
4a3b192916 Fix bumps sometimes shooting off stupidly fast 2019-02-18 22:36:26 -06:00
fickleheart
60b952ea2a Add some P_MobjWasRemoved checks around code that shrink touches
It's the only place in the vanilla game where K_DropItems
is called that isn't from a direct collision with the player
it's being called on. It's also a syncfail that doesn't happen
anywhere else, and I saw my sync state appear to get slightly
corrupted when it happened. Let's see if this fixes anything...
2019-02-17 22:09:37 -06:00
fickleheart
4df98e6e1f Simulate fractional precision on item odds
This notably prevents some items from disappearing
completely above 8 players in netgames.
2019-02-16 10:33:18 -06:00
wolfs
a1aff2ec9f Merge branch 'fix-battle-boost' into 'next'
Set flashing tics to 0 after boosting

See merge request KartKrew/Kart-Public!67
2019-02-16 08:31:08 -05:00
wolfy852
f8da7f3d8b Don't kill flashing tics for floor boosts 2019-02-16 07:03:56 -06:00
wolfy852
b8dc9127d5 Set flashing tics to 0 after boosting 2019-02-16 06:37:09 -06:00
wolfs
3fdbf2f476 Merge branch 'fix-offroad' into 'next'
Fix drift sparks not generating on offroad with Hyudoro, Invincibility, or sneaker boosts

See merge request KartKrew/Kart-Public!62
2019-02-16 07:02:13 -05:00
wolfy852
eb55cddd35 Merge branch 'master' into next 2019-02-16 06:00:31 -06:00
wolfy852
db280e64a1 New visuals for ping and fps display alike [REDO] 2019-02-15 21:08:08 -06:00
Steel Titanium
dc433dee62 Add missing ifdefs 2019-02-14 20:59:07 -05:00
wolfy852
622402617d Add pogospring to itemenabled 2019-02-13 05:37:13 -06:00
wolfy852
87d749b43d Fix drift sparks not generating on offroad with Hyudoro, Invincibility, or sneaker boosts 2019-02-10 22:55:27 -06:00
toaster
cd53f3da1f Fix off-by-one errors in item odds, and add a little assert to make an assumption in this function that was being violated more explicit. 2019-02-06 13:28:21 +00:00
Sally Cochenour
b5f582ed5a Kill me 2019-02-06 01:31:42 -05:00
Alam Arias
57ee9b4177 fixup EOL in kart files 2019-02-05 15:36:30 -05:00
Sal
dfe3034560 Merge branch 'ingame-player-cap' into 'next'
"In-game player" cap

See merge request KartKrew/Kart-Public!48
2019-02-04 15:44:50 -05:00
Sally Cochenour
dad3677b9e fickle suggestions 2019-02-03 23:23:41 -05:00
toaster
e36328b631 Change order of operations so that fullscreen stuff is done in front of minimap, to match other two/three players in 3/4p. 2019-02-03 23:50:02 +00:00
toaster
fb35fcb831 Show WANTED and minimap in battle splits even when p1 is nuked. 2019-02-03 23:37:19 +00:00
toaster
0d81fb1141 gotta break a few eggboxes to fix a crash 2019-02-03 23:09:09 +00:00
Sally Cochenour
3d64a98684 Merge branch 'next' into ingame-player-cap 2019-02-03 17:23:50 -05:00
Sally Cochenour
f9a535b9b7 Missed this 2019-02-03 17:15:33 -05:00
Sally Cochenour
2c8c994324 In-game player cap & spectator queue
Force everyone beyond a certain point to spectate -- spectators get to queue up. In response to me doing a 1v1 match, tons of people wanting to join to watch, and just relying on honor system to prevent mid-joiners. Spectators are prioritized by how long they've been waiting. I'm thinking of hijacking base SRB2's team scramble for a scramble option later.
2019-02-03 16:43:11 -05:00
toaster
d3f739f64a Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart-Public.git into next 2019-02-02 21:12:49 +00:00
Sally Cochenour
4679e48a3d Offroad code cleanup 2019-02-02 01:43:32 -05:00
Sally Cochenour
838c2aa68d Offroad spark fix & sink 2019-02-02 00:58:51 -05:00
Sally Cochenour
8409a0f42c Shift around flashing bump stuff 2019-01-30 15:57:46 -05:00
Sally Cochenour
f7516f0f00 Reorganize these checks 2019-01-30 15:43:45 -05:00
Sally Cochenour
7ff0245882 Increase target cone for Race 2019-01-30 15:41:15 -05:00