vivlim/Kart-Public
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
6515 commits 50 branches 7 tags 75 MiB
Commit graph

971 commits

Author SHA1 Message Date
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 b9abd8b9bc fix EOL in k_kart.c 2019-03-05 11:29:00 -05:00
Alam Arias 56e8f09ae8 fixed compiling for MSVC 2017 2019-03-04 16:33:06 -05:00
fickleheart c6f6783f3e Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays 2019-03-03 20:24:39 -06: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
Latapostrophe 54ae277bff Expose battlefullscreen and battlecomebacktimer huds to lua 2019-02-17 23:39:00 +01:00
fickleheart c260e27cd9 Support netreplays in titledemos 
TDEMO###, where ### is a number from 1 to 255.
 2019-02-17 13:13:45 -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
wolfs 97aeb13db3 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 fc6086cfd8 Merge branch 'master' into next 2019-02-16 06:00:31 -06:00
wolfy852 07e56e550e New visuals for ping and fps display alike [REDO] 2019-02-15 21:08:08 -06:00
Steel Titanium de9e25d5b3
Add missing ifdefs 2019-02-14 20:59:07 -05:00
wolfy852 3a3dd42b89 Add pogospring to itemenabled 2019-02-13 05:37:13 -06:00
wolfy852 1ba39672d4 Fix drift sparks not generating on offroad with Hyudoro, Invincibility, or sneaker boosts 2019-02-10 22:55:27 -06:00
fickleheart 6da810a994 Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays 
# Conflicts:
#	src/g_game.c
#	src/k_kart.c
 2019-02-06 20:47:35 -06:00
toaster 970a8ee89d 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 1c3fe3ce83 Kill me 2019-02-06 01:31:42 -05:00
Alam Arias cc363086f9 fixup EOL in kart files 2019-02-05 15:36:30 -05:00
Sal b36f73ee46 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 fd529f9363 fickle suggestions 2019-02-03 23:23:41 -05:00
toaster 55bb82eae8 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 503e4f977f Show WANTED and minimap in battle splits even when p1 is nuked. 2019-02-03 23:37:19 +00:00
toaster 068ee93422 gotta break a few eggboxes to fix a crash 2019-02-03 23:09:09 +00:00
Sally Cochenour 98af218d2c Merge branch 'next' into ingame-player-cap 2019-02-03 17:23:50 -05:00
Sally Cochenour a6ac6ecdc5 Missed this 2019-02-03 17:15:33 -05:00
Sally Cochenour 59730c5db6 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 06b3e265f5 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart-Public.git into next 2019-02-02 21:12:49 +00:00
Sally Cochenour d9f16d2aaf Offroad code cleanup 2019-02-02 01:43:32 -05:00
Sally Cochenour 6a14d79cf0 Offroad spark fix & sink 2019-02-02 00:58:51 -05:00
fickleheart 28b9c5fc7d Fix P3 getting the wrong split flags in 3p splitscreen 2019-02-01 20:20:14 -06:00
Sally Cochenour 34b027e8ba Shift around flashing bump stuff 2019-01-30 15:57:46 -05:00
Sally Cochenour 9984f0e217 Reorganize these checks 2019-01-30 15:43:45 -05:00
Sally Cochenour f3644505be Increase target cone for Race 2019-01-30 15:41:15 -05:00
Sally Cochenour 3cb468aec8 Add delay to Jawz target switching, set Jawz target when fired 2019-01-30 15:39:29 -05:00
Sally Cochenour a3cd131017 Don't bump while flashing 2019-01-30 15:02:24 -05:00
Sally Cochenour a81546177d Speed updates based on number of orbiting items 2019-01-30 14:24:04 -05:00
Sally Cochenour bc4832aa40 Slower orbit, always have 1 orbit item deploy behind you, and higher gravity for Orbinaut/Jawz 2019-01-30 14:14:24 -05:00
Latapostrophe 4c19c36fbb Small optimization + item throwing + battle stuff 2019-01-30 15:25:41 +01:00
Sally Cochenour c1fde7bfb7 Thin the rest of this screen's stuff too 2019-01-30 01:21:20 -05:00
Sal 51fa9b7359 Merge branch 'item-experiment' into 'next' 
Item experiment

See merge request KartKrew/Kart-Public!39
 2019-01-30 01:19:16 -05:00
Sally Cochenour 70a70b8a97 Merge branch 'master' into offroad-stuff 2019-01-29 20:22:15 -05:00
Latapostrophe 4261e0b61a Start of a fix for antigrav 2019-01-30 00:30:48 +01:00
Sally Cochenour 9e8b038719 Merge branch 'master' into item-experiment 2019-01-29 15:07:04 -05:00
Sally Cochenour fc512318bd Merge branch 'next' into item-experiment 2019-01-29 15:06:58 -05:00
Sally Cochenour 80d1c303e3 Reduce frequency of Eggman items, give some of those points to Orbinaut or Banana 2019-01-28 12:47:23 -05:00
Sally Cochenour 38ca2ab98a Sparks can't be started in offroad 2019-01-27 23:25:03 -05:00
Sally Cochenour 0ef442c004 Change offroad leniency from 1 second to 0.5 seconds, don't make friction more forgiving in offroad 2019-01-27 23:18:40 -05:00
Sally Cochenour 5518a19945 Wipeout slowdown in offroad is static 2019-01-27 22:28:44 -05:00
Sally Cochenour c53144ecd6 Wipeout slowdown is x2 strength 2019-01-27 21:58:44 -05:00
Sally Cochenour 8a97b28936 Wipeout slowdown timer is set to 20 tics if below, instead of adding up per bump. 2019-01-27 21:58:17 -05:00
Sally Cochenour dd2b895e80 Remove offroad leniency bias 
Everyone now has flat, equal 1-second leniency
 2019-01-27 21:57:18 -05:00
Sally Cochenour e9887b2675 Apply to TAB rankings too 2019-01-27 21:11:49 -05:00
Sally Cochenour 55c6ab2581 Scale number of allowed invuln items w/ player count 
0-5 players: 1 invincibility/grow allowed out at once
6-9 players: 2 invincibilities (how it was before)
10-13 players: 3 invincibilities
14+ players: 4 invincibilites
 2019-01-27 17:51:46 -05:00
Sally Cochenour e0f7ab6ad4 Merge branch 'master' into item-experiment 2019-01-27 15:14:56 -05:00
Sal 910df92d5a Merge branch 'expose-more-lua-stuff' into 'next' 
More Lua stuff + PlayerCmd hook

See merge request KartKrew/Kart-Public!28
 2019-01-26 13:19:41 -05:00
wolfy852 4f38982968 Use SHORT on just the vars 2019-01-18 16:17:54 -06:00
wolfy852 de316f1ee1 Fix SHORT being used as a cast instead of a macro 2019-01-18 15:38:06 -06:00
TehRealSalt 4c8737da08 Final v1.0.2 commit (probably) 
- Update chars.kart hash, AGAIN!
- Fix spectators being visible on minimap when F12ing people
- Optimize how splitscreen players are drawn on top of the minimap
- Remove duplicated cvar registrations
- Move cv_resynchattempts and cv_netticbuffer from D_ClientServerInit to D_RegisterServerCommands and D_RegisterClientCommands respectively, so they can save to config properly
- Increase "Frequent" gametype switch frequency even more
- "SRB2" version dehacked warning ignores srb2.srb
 2019-01-18 04:30:38 -05:00
wolfy852 31c911e88f Fix position numbers being off in 1P 2019-01-16 19:53:09 -06:00
TehRealSalt 146f2a1c0a Don't show COOL for spectators 2019-01-16 01:55:07 -05:00
TehRealSalt 5e1aa0302f SHOULD be == 1, not < 2!!!! 2019-01-16 01:13:01 -05:00
fickleheart 0121d47049 Merge remote-tracking branch 'internal/master' into new-turnhax-and-latency-stuff 2019-01-15 19:55:42 -06:00
Sal f2b7d9f373 Merge branch 'unfuck-splitscreen-hud' into 'next' 
Cleaner splitscreen hud

See merge request KartKrew/Kart-Public!6
 2019-01-15 03:47:29 -05:00
TehRealSalt 5cd8691a71 Don't draw multiple WANTED posters in splitscreen 2019-01-15 03:41:33 -05:00
Latapostrophe c2aa6d4de6 Expose some more Kart functions, freeplay and rankings bumpers are now hud stuff you can toggle, + experimental playercmd hook 2019-01-13 14:40:48 +01:00