stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-28 05:11:34 +00:00
Code Issues Projects Releases Packages Wiki Activity
5642 commits 60 branches 11 tags 94 MiB
Commit graph

926 commits

Author SHA1 Message Date
fickleheart
9ff8b73936 Merge remote-tracking branch 'remotes/internal/upsidedown-brain' into HEAD 
# Conflicts:
#	src/k_kart.c
#	src/p_mobj.c
 2019-03-11 21:59:45 -05:00
Latapostrophe
0e6083cf02 Fix what was discussed, minus the rocksneaker math which is still shady, but let's not break what currently works 2019-03-11 18:53:23 +01:00
colette
eec76cf4ec Merge branch 'remove-pinvin' into 'next' 
Kill invincibility item caps

See merge request KartKrew/Kart-Public!108
 2019-03-09 22:16:25 -05:00
Latapostrophe
b621723d23 Fix boost / rocket sneakers for antigrav 2019-03-09 17:25:42 +01:00
TehRealSalt
4faaa932ec Fix macro expansion warning Sryder got 2019-03-08 19:06:27 -05:00
TehRealSalt
87e91ebb2c Kill invincibility item caps 
It's a holdover from another era, our item changes have stacked up enough that we don't really need this cap anymore
 2019-03-08 18:36:25 -05:00
Sal
4f8665c785 Merge branch 'colors-roundtwo' into 'next' 
16 more colors

See merge request KartKrew/Kart-Public!101
 2019-03-07 21:25:03 -05:00
Sally Cochenour
c18935fbdd Reorder colors, ensure colored names are set properly 2019-03-06 03:15:07 -05:00
Sally Cochenour
4e570739fe Make smoke opaque to reduce lag 2019-03-05 20:56:02 -05:00
Sally Cochenour
36a7e88e63 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
5760e106e5 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
ae14d967ea 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
ea40a1b153 Merge branch 'next' into minor-item-tweaks 2019-03-05 17:18:27 -05:00
Alam Arias
56e8f09ae8 fixed compiling for MSVC 2017 2019-03-04 16:33:06 -05:00
Sally Cochenour
b95d0ac279 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
c41bc51e83 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
4ecd71d026 Merge branch 'next' into minor-item-tweaks 2019-02-27 01:15:24 -05:00
Sal
f08c8d018e 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
9c14a2c58f Merge branch 'next' into color-fixes 2019-02-27 00:09:39 -05:00
Sally Cochenour
44462d0dd7 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
592ae58c79 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
7de2cf8d39 Fix Super colors from base SRB2 giving a garbage color 2019-02-26 07:14:03 -05:00
Sally Cochenour
a993cffb69 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
c543c35b91 Revert this minor change 2019-02-22 22:50:13 -05:00
Sally Cochenour
f91eb68b70 Update item table 
Not looking forward to testing...
 2019-02-22 22:49:27 -05:00
Sally Cochenour
014466cc67 Merge branch 'next' into minor-item-tweaks 2019-02-22 19:30:52 -05:00
Sal
5e9a11d467 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
2389bfd4cc 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
a6dd439e99 Grow cancel 
Needs item table changes to make it less OP
 2019-02-21 17:04:58 -05:00
James
38ad726e55 Modify momz underwater for lots of things in k_kart.c 2019-02-19 23:38:16 -05:00
James
09c3fd4329 Hyu b gone 2019-02-19 23:15:31 -05:00
James
68b8ec8162 Wipeout particles come from back wheels 2019-02-19 23:01:19 -05:00
James
f822eb94cf Reduce explosion radius, lives forever, longer startup 2019-02-19 20:19:01 -05:00
James
2f4d3eb087 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
66c4354115 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
a59a1c53b0 Add check to all of the friction stuff 2019-02-19 17:05:04 -06:00
fickleheart
8988927d16 Only apply friction changes on the ground 2019-02-19 16:46:48 -06:00
fickleheart
580e12a32a Add null check too 2019-02-19 16:04:23 -06:00
fickleheart
838ed005d2 Remove debugging print 2019-02-18 23:39:08 -06:00
fickleheart
caf7888eed Fix players sometimes snapping backwards on landing after spikeball hits 2019-02-18 23:35:24 -06:00
fickleheart
9c1749d269 Make extra sure we launch in the correct direction 2019-02-18 23:35:01 -06:00
fickleheart
a4c8388f3b Fix bumps sometimes shooting off stupidly fast 2019-02-18 22:36:26 -06:00
James
4c3871cb6d Some items have 30 sec cooldown on match start 2019-02-18 00:23:40 -05:00
James
1bce9d281d Shrink timer is consistent 20sec 2019-02-18 00:17:58 -05:00
fickleheart
6f3b10313f 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
b9264821a2 Merge branch 'upsidedown-brain' into next 
# Conflicts:
#	src/k_kart.c
#	src/k_kart.h
 2019-02-17 20:45:12 -06:00
fickleheart
e2b392805a 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
32d1f75199 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
76893f4644 Don't kill flashing tics for floor boosts 2019-02-16 07:03:56 -06:00
wolfy852
c370a86f48 Set flashing tics to 0 after boosting 2019-02-16 06:37:09 -06:00