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

4779 commits

Author SHA1 Message Date
fickleheart 52b743a18f Fix join password not recognizing shifted characters 2019-03-06 22:07:28 -06:00
wolfy852 87d60eef86 Kill SF_RUNONWATER 2019-03-06 22:02:56 -06:00
fickleheart b5c4866706 Add -remove option to joinpassword 2019-03-06 21:30:39 -06:00
wolfy852 75661f44d7 Clean up the skin_t struct 2019-03-06 21:18:01 -06:00
wolfy852 3873635629 Merge remote-tracking branch 'remotes/pub/next' into maxskins-bump 2019-03-06 20:13:30 -06:00
Sally Cochenour c18935fbdd Reorder colors, ensure colored names are set properly 2019-03-06 03:15:07 -05:00
Sally Cochenour f5fe073627 Fix floating lob items 2019-03-06 01:53:52 -05:00
fickleheart 264454ca70 hblurgle spburgle this code sucks 2019-03-05 22:27:25 -06:00
Steel Titanium dc1786203d Merge branch 'master' into dontskipframes 2019-03-05 22:11:00 -05:00
Steel Titanium 0f51f3b7e3 Don't skip frames in software mode 2019-03-05 22:07:53 -05:00
Sally Cochenour f230e0d644 Put eggbox sniping behind an #if 
On second thought, the old method is "sneakier"
 2019-03-05 22:06:47 -05:00
Sally Cochenour 171ca1670e Add banana snipe sound effect to eggboxes & sinks 2019-03-05 22:02:41 -05:00
Sally Cochenour a3e00bdb0e uncommited change... 
💢
 2019-03-05 21:25:37 -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
James R f57335deef Check that lumps are okay 2019-03-04 22:13:22 -08:00
James R 62820bb4bf Merge remote-tracking branch 'origin/next' into longdouble 2019-03-04 18:51:11 -08:00
Alam Arias 515fb9adad Merge branch 'master' into next 2019-03-04 17:17:13 -05:00
Alam Arias 5537c62271 Merge remote-tracking branch 'upstream/master' 2019-03-04 17:16:37 -05:00
Alam Ed Arias 67e246cd53 No more errors for VC6 support 2019-03-04 16:46:14 -05:00
Alam Ed Arias 145ccfd405 no more floating constants warnings, and disable bad array bounds warnings 2019-03-04 16:46:14 -05:00
Alam Arias 56e8f09ae8 fixed compiling for MSVC 2017 2019-03-04 16:33:06 -05:00
James R f0a0666223 Use long double suffix 2019-03-02 15:56:44 -08:00
Alam Arias 233033f213 Merge branch 'master' into next 2019-03-02 18:41:58 -05:00
Alam Arias 0d584a3145 Do not error about array bounds, some GCC versions's reporting is broken 2019-03-02 18:39:53 -05:00
Alam Arias b9eb5c399b Just do not warn about unsuffixed float constants 2019-03-02 18:39:10 -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
Alam Arias d4f05e5be9 fixup merged mess for NO-LUA mess 2019-03-02 13:32:47 -05:00
Alam Arias c56cae4d28 Merge remote-tracking branch 'origin/master' into upstream-merge 2019-03-02 13:27:10 -05:00
Alam Arias 24ae6107cf Exported SDL_icon.xpm as srb2icon.png 2019-03-02 13:26:17 -05:00
Alam Arias 2657eb998e fixed compiling without blua support 2019-03-01 17:46:19 -05:00
Alam Arias ae368a3e0f Merge remote-tracking branch 'upstream/master' into upstream-merge 2019-03-01 17:33:32 -05:00
Alam Ed Arias f823768699 Fix building without BLUA support 2019-03-01 17:31:32 -05:00
Monster Iestyn 67e721e983 Merge branch 'need-more-time' into 'master' 
Stop Linux servers from hanging every 34 hours

See merge request STJr/SRB2!465
 2019-03-01 11:22:32 -05:00
Alam Arias 3d8e25e440 Merge remote-tracking branch 'upstream/master' into upstream-merge 2019-03-01 11:10:57 -05:00
Sal 9210ab8497 Merge branch 'higher-maxnetnodes' into 'next' 
Upped MAXNETNODES

See merge request KartKrew/Kart-Public!94
 2019-03-01 06:29:52 -05:00
wolfy852 8e51cb18ba Merge branch 'master' into next 2019-03-01 00:13:47 -06:00
wolfy852 97de2ae4f6 Stop Linux servers from hanging every 34 hours 2019-03-01 00:07:58 -06:00
wolfy852 cbb3145236 Stop Linux servers from hanging every 34 hours 
This drastically increases the amount of time Linux servers can stay up for before hanging.
 2019-02-28 18:51:57 -06:00
Alam Ed Arias 7cd60a544a Merge branch 'apng-oh-shit-fixes' into 'master' 
Compiling errors for apng fixed

See merge request KartKrew/Kart-Public!69
 2019-02-28 12:00:58 -08:00
wolfs 5620d0188e Merge branch 'apng' into 'master' 
Support aPNG in new versions of libpng

See merge request KartKrew/Kart-Public!63
 2019-02-28 12:00:58 -08: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
Steel Titanium 5975d3fb30 Add some parentheses 2019-02-27 15:55:39 -05:00
Steel Titanium 3b9c4fff52 Upped MAXNETNODES 2019-02-27 15:43:29 -05:00
Monster Iestyn d76e946b3e Merge branch 'sdl-new-windowicon' into 'master' 
SDL:Update XPM icon

See merge request STJr/SRB2!441
 2019-02-27 13:34:24 -05:00
Sally Cochenour 135190616a Merge branch 'next' into minor-item-tweaks 2019-02-27 01:32:52 -05:00
Sal 60ae6a6470 Merge branch 'hyuu-fix' into 'next' 
Fix Hyudoro being tangible to Jawz and Orbinauts

See merge request KartKrew/Kart-Public!79
 2019-02-27 01:31:52 -05:00
Sally Cochenour 4f01202bb5 Merge branch 'next' into minor-item-tweaks 2019-02-27 01:22:38 -05:00
Sally Cochenour c6be0c24d1 Merge branch 'master' into next 2019-02-27 01:22:18 -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
Sally Cochenour 84251d003d Merge branch 'next' into compiler-garbage 2019-02-26 18:09:26 -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
Sal ea0a87d49c Merge branch 'clang-fix' into 'next' 
use fixed_t so abs() would work

See merge request KartKrew/Kart-Public!86
 2019-02-26 17:49:28 -05:00
Sally Cochenour 22434949e5 Extend pingtable by 1 for the servermaxping entry 2019-02-26 17:44:35 -05:00
Sally Cochenour 1d3adb0491 Remove mixed declaration that triggers ERRORMODE on my setup 2019-02-26 17:33:10 -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
fickleheart 1499a47541 Change OGL splitscreen hack to match software behavior 2019-02-24 12:26:46 -06:00
fickleheart 9d30a0f2bc Adjust FOV change for 2p 2019-02-24 11:59:21 -06:00
fickleheart 4143c31176 Add field-of-view support in software mode 2019-02-23 10:31:37 -06:00
fickleheart d6b9a75230 Move fov cvar out of OGL-specific code 2019-02-23 10:18:20 -06: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
Alam Arias d5a4759121 signed and unsigned compare 2019-02-22 21:13:00 -05:00
Alam Arias cec79dee87 if you going to use abs(), you need to work in signed types 2019-02-22 21:04:53 -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
wolfy852 d9759df874 I don't think these old interfaces even compile but let's not kill them off 2019-02-22 18:13:22 -06:00
Sally Cochenour b2d4ec501c Add parentheses 2: Move parentheses 2019-02-22 19:11:50 -05:00
Sally Cochenour df503c7f19 Add parentheses 2019-02-22 19:07:54 -05:00
Sal 6152657885 Merge branch 'expose-splitscreen' into 'next' 
Expose splitscreenplayer in player_t

See merge request KartKrew/Kart-Public!74
 2019-02-22 19:04:48 -05:00
James R 0eb30bceb7 Rename splitscreen member to something more meaningful 2019-02-22 15:57:44 -08: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
Sal 0320b17f80 Merge branch 'banip-command' into 'next' 
Ban IP command

See merge request KartKrew/Kart-Public!73
 2019-02-22 18:49:41 -05:00
Sal 447100a9ab Merge branch 'cherrypicks-from-netreplays' into 'next' 
Misc fixes

See merge request KartKrew/Kart-Public!76
 2019-02-22 18:45:44 -05:00
Sally Cochenour 6b6fba841c Banana snipe sfx 2019-02-22 18:43:10 -05:00
Alam Arias f454157af9 Merge branch 'master' into next 2019-02-21 22:54:29 -05:00
Alam Arias 8db5bda230 Merge remote-tracking branch 'upstream/master' 2019-02-21 22:50:58 -05:00
Steel Titanium c1deea0714 Disable multi statement macros errors. 2019-02-21 18:48:42 -05:00
Sally Cochenour a6dd439e99 Grow cancel 
Needs item table changes to make it less OP
 2019-02-21 17:04:58 -05:00
wolfy852 84755ec171 Handle things in a more sensible way 2019-02-20 19:04:18 -06:00
wolfy852 23f1974117 Bump MAXSKINS to 128 
Can't believe people actually need this now.
 2019-02-20 18:55:53 -06:00
Steel Titanium 2d34df535d Merge branch 'next' of git.magicalgirl.moe:KartKrew/Kart-Public into banip-command 2019-02-20 17:59:12 -05:00
James 38ad726e55 Modify momz underwater for lots of things in k_kart.c 2019-02-19 23:38:16 -05:00
fickleheart 879d3aa1a8 Hold on, this works. 2019-02-19 22:21:07 -06:00
wolfy852 f34ed24132 Correct an oversight 2019-02-19 22:20:18 -06:00
James 09c3fd4329 Hyu b gone 2019-02-19 23:15:31 -05:00
wolfy852 4970df47e1 Merge branch 'next' into file-exploit-fix 2019-02-19 22:13:03 -06:00
James 68b8ec8162 Wipeout particles come from back wheels 2019-02-19 23:01:19 -05:00
wolfy852 df1a22d5fd Fix Hyudoro being tangible to Jawz and Orbinauts 2019-02-19 21:27:14 -06:00
James ca87cfbf01 Water skipping speed requirements are stricter 2019-02-19 21:57:56 -05:00
Steel Titanium 0913a623fb Some small changes. 2019-02-19 21:22:35 -05:00
James ff57b4bc22 Missed a line 2019-02-19 20:29:53 -05:00
fickleheart d2c708ba93 Maybe this is a better way to work around the DrawMasked crash... 2019-02-19 19:27:08 -06:00
James f822eb94cf Reduce explosion radius, lives forever, longer startup 2019-02-19 20:19:01 -05:00
wolfy852 30d37ce4ca ...remove this forgotten comment too while I'm at it. 2019-02-19 18:54:24 -06:00
wolfy852 1fb65c72ff Reorganization + kill old interfaces 2019-02-19 18:52:57 -06: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
Alam Arias ed3f9e2464 Merge branch 'master' into next 2019-02-19 17:21:13 -05:00
Sal ee57ab9afe Merge branch 'shrink-removed-checks' into 'next' 
Add some P_MobjWasRemoved checks around code that shrink touches

See merge request KartKrew/Kart-Public!72
 2019-02-19 17:14:08 -05:00
Sal eabe8fbadd Merge branch 'lua-archive' into 'next' 
Fix dedicated server extra lua variables not being synched for joiners

See merge request KartKrew/Kart-Public!75
 2019-02-19 17:10:52 -05:00
Sal d85dcd073a Merge branch 'latency-tweaks' into 'next' 
Fix cmd latency occasionally jumping to max

See merge request KartKrew/Kart-Public!78
 2019-02-19 17:05:45 -05:00
fickleheart 580e12a32a Add null check too 2019-02-19 16:04:23 -06:00
James 4480a1c55a Merge branch 'master' into minor-item-tweaks 2019-02-19 16:20:32 -05:00
fickleheart 9c5ae02755 Fix cmd latency occasionally jumping to max 2019-02-19 08:05:35 -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
fickleheart a4ac2b000f Improve replay resyncing code 
Notably, it should no longer cause immediate
desync warnings if a track starts on a slope.
 2019-02-18 21:10:23 -06:00
fickleheart 9eb669a061 Crash fix I think (CHERRY PICK INTO BASE) 2019-02-18 21:09:22 -06:00
Latapostrophe 86a9168e86 Fix dedicated server extra lua variables not being synched for joiners 2019-02-18 22:19:28 +01:00
Latapostrophe 91ce3617ef Fix respawning in reverse gravity 2019-02-18 14:00:36 +01:00
james c74b05eadc Remove extra whitespace 2019-02-17 23:09:52 -08:00
Steel Titanium a2316389d2 Save when quitting the game. 
Also use default reason if not custom reason is given.
 2019-02-18 02:04:58 -05:00
Steel Titanium 6915605444 Save ban list right after banning. 2019-02-18 01:03:39 -05:00
Steel Titanium f39bd03e10 Add command to ban an IP address. 2019-02-18 00:58:08 -05: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
james 46edc1e330 Create the correct dummy function 2019-02-17 15:50:42 -08:00
james 1785adffc2 Expose splitscreenplayer (from Got_AddPlayer) as splitscreen in player_t 2019-02-16 23:25:50 -08:00
james 9d85c2e064 Actually support no apng patch 2019-02-16 14:39:33 -08:00
james 7e77e0c429 Support libpng without the apng patch and fix mingw (?) compiler errors 2019-02-16 14:20:55 -08: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
wolfy852 82dbf45fa4 Fix compiler warnings 2019-02-16 08:32:14 -06:00
wolfy852 04fe5de985 Incomplete: Split files added with -file into their own array 
Compiles with no errors but the game errors on launch. With no files added, it gives "W_InitMultipleFiles: no files found". With files loaded via -file it gives "W_GetNumForName: PLAYPAL not found!"
 2019-02-16 08:16:56 -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
Latapostrophe 24516cbf84 Move ping display in i_video for consistency with showfps display 2019-02-16 13:38:50 +01: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
wolfs c170d01edf Merge branch 'disable-soundsystem' into 'master' 
Do not start sound system when disabled

See merge request KartKrew/Kart-Public!58
 2019-02-16 06:24:12 -05:00
Latapostrophe a119d1cddd Lower default ping timeout + Fix chat arrows being missing while we're at it 2019-02-16 12:19:03 +01:00
wolfs da3772134a Merge branch 'apng' into 'master' 
Support aPNG in new versions of libpng

See merge request KartKrew/Kart-Public!63
 2019-02-16 06:18:22 -05:00
wolfs 5ff03d38f5 Merge branch 'fix_nonet' into 'master' 
Fix NONET

See merge request KartKrew/Kart-Public!60
 2019-02-16 06:11:43 -05:00
wolfs abb3e8e4e3 Merge branch 'fix-no_lua' into 'master' 
Fix NO_LUA

See merge request KartKrew/Kart-Public!66
 2019-02-16 06:10:03 -05:00
Latapostrophe 95bbb0d833 Remove debug stuff 2019-02-15 21:10:18 -06:00
Latapostrophe 7abf8e0f11 Forgot to change this back from testing 2019-02-15 21:08:56 -06:00