Commit graph

973 commits

Author SHA1 Message Date
Sally Cochenour
a2f0935bee Mine updates
- Increase gravity of super-forward throws
- Revert explosion radius change
- Nerf generic explosion stun (SPB explosion stun is identical)
2019-03-05 20:49:11 -05:00
Sally Cochenour
32a509beb1 SPB updates
- SPB Rush odds are not affected by player count.
- Thunder Shield cannot be rolled with SPB out.
- Reticule is displayed on minimap while SPB is out.
2019-03-05 19:45:20 -05:00
Sally Cochenour
19812c8a2f Misc changes
- Start cooldown deactivates exactly 30 sec, instead of after 30 seconds. Barely affects gameplay but it looks slightly less of a magic number looking at the code.
- Prevent multiple Thunder Shields being out via normal means.
- Slightly loosened up the invincibility item limits -- gives more invincibility items sooner for odd player counts but doesn't affect the numbers for the game's balancing points (4P, 8P)
- Update comments
2019-03-05 17:50:43 -05:00
Sally Cochenour
b785eda252 Merge branch 'next' into minor-item-tweaks 2019-03-05 17:18:27 -05:00
Alam Arias
03783a589d fix EOL in k_kart.c 2019-03-05 11:29:00 -05:00
Alam Arias
aaccb4edff fixed compiling for MSVC 2017 2019-03-04 16:33:06 -05:00
fickleheart
843bc6bc1b Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays 2019-03-03 20:24:39 -06:00
Sally Cochenour
d638d47fad 16 more colors
- Renamed Crimson to Maroon.
- Renamed Scarlet back to Crimson.
- Renamed Nova to Scarlet.
- Added Brick, Flame, Sunset, Popcorn, Camouflage, Caribbean, Plague, Platinum, Rust, Nova, Ultraviolet, Moonslam, Bubblegum, Mauve, Royal, and Fairy
- Updated Maroon, Robo-Hood, and Ketchup
- Shifted positioning of Aqua Super
2019-03-02 15:39:52 -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
Sally Cochenour
22cfbd8fd1 Merge branch 'next' into minor-item-tweaks 2019-02-27 01:15:24 -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
Sally Cochenour
12dd8e49c0 Merge branch 'next' into minor-item-tweaks 2019-02-22 19:30:52 -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
Sally Cochenour
de6c99c9fb Grow cancel
Needs item table changes to make it less OP
2019-02-21 17:04:58 -05:00
James
bc1990f7d4 Modify momz underwater for lots of things in k_kart.c 2019-02-19 23:38:16 -05:00
James
4f9109501e Hyu b gone 2019-02-19 23:15:31 -05:00
James
e1d2ddf3ce Wipeout particles come from back wheels 2019-02-19 23:01:19 -05:00
James
4397db9b65 Reduce explosion radius, lives forever, longer startup 2019-02-19 20:19:01 -05:00
James
a31b204cf2 Mines can be punted
Setting behind leaves a longer startup animation window so that it can be punted more easily
2019-02-19 18:38:54 -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
James
fcb82af329 Some items have 30 sec cooldown on match start 2019-02-18 00:23:40 -05:00
James
d272342db7 Shrink timer is consistent 20sec 2019-02-18 00:17:58 -05: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
wolfy852
096cd50bae Merge branch 'upsidedown-brain' into next
# Conflicts:
#	src/k_kart.c
#	src/k_kart.h
2019-02-17 20:45:12 -06:00
Latapostrophe
9a12967020 Expose battlefullscreen and battlecomebacktimer huds to lua 2019-02-17 23:39:00 +01:00
fickleheart
0b92743244 Support netreplays in titledemos
TDEMO###, where ### is a number from 1 to 255.
2019-02-17 13:13:45 -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