Commit graph

4779 commits

Author SHA1 Message Date
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
wolfy852 07e56e550e New visuals for ping and fps display alike [REDO] 2019-02-15 21:08:08 -06:00
Latapostrophe 3349b9b196 forgot to remove this print 2019-02-15 20:53:18 -06:00
wolfy852 6054901c62 Ping kick changes + other quality of life improvements [REDO] 2019-02-15 20:51:44 -06:00
Steel Titanium bcd5176ad1
Update project files 2019-02-14 21:32:57 -05: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
james 9eec83da95 Support CMake for apng 2019-02-12 17:01:27 -08:00
james 329c2ebdc8 Update copyright year 2019-02-11 16:01:02 -08:00
james b43e6a7199 Support libpng versions prior to 1.6 and 1.5
Tested confirmed for...
1.5.30
1.4.22
1.2.59
2019-02-11 15:47:48 -08:00
james 79736e40aa Support aPNG in new versions of libpng
A known issue: iTXt cannot be written (yet). I may do something about that.
For now, this is likely good enough. Who cares about the extra text anyway?
2019-02-10 23:52:02 -08:00
wolfy852 1ba39672d4 Fix drift sparks not generating on offroad with Hyudoro, Invincibility, or sneaker boosts 2019-02-10 22:55:27 -06:00
james b331b51178 Use less confusing player sorting key names 2019-02-09 18:10:54 -08:00
toaster f0d536b7ee Fix NONET. I thought I did this already during development, but I guess it got broken near the end. 2019-02-09 09:58:48 +00:00
james dd45cfc757 Do not start sound system when disabled 2019-02-06 17:24:13 -08: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
Sally Cochenour 094ca5241a Merge branch 'next' 2019-02-05 22:02:08 -05:00
Sally Cochenour 276e2d3335 Merge branch 'next' 2019-02-05 21:10:55 -05:00
Sal 8a5d740c85 Merge branch 'whitespace' into 'next'
Clean up Whitespace

See merge request KartKrew/Kart-Public!56
2019-02-05 19:03:02 -05:00
Alam Arias dc5024f94c remove whitespaces 2019-02-05 15:42:37 -05:00
Alam Arias cc363086f9 fixup EOL in kart files 2019-02-05 15:36:30 -05:00
Sally Cochenour 9a2e65c61c Merge branch 'next' into version-prep 2019-02-04 22:22:24 -05:00
Sally Cochenour 8e41f09c59 why does this trigger ERRORMODE now?! 2019-02-04 22:22:12 -05:00
Sally Cochenour 75b0dd3c1b Update patch.kart hash 2019-02-04 22:02:34 -05:00
Sally Cochenour f46eab6b8a Update version 2019-02-04 22:00:36 -05:00
Sryder 3b61cba1a7 The string that got away from my memory 2019-02-04 22:02:40 +00:00
Sryder 76ea671763 Merge branch 'next' of git@git.magicalgirl.moe:KartKrew/Kart-Public.git into fix-fade-timeout 2019-02-04 21:55:19 +00:00
Sryder caba5cb02e P_NetKeepAlive should also be here because it potentially pauses mid-game! 2019-02-04 21:54:10 +00: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
Sally Cochenour 26accf087e Instant lookback
Still weird snap but this is as good as it'll get short of throwing away all of the camera code
2019-02-03 23:13:42 -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
Sryder dff5cb049f rename PT_WIPETIME to PT_BASICKEEPALIVE to be more obvious what it does 2019-02-02 21:53:27 +00:00
Sryder 1bf584c079 Merge branch 'next' of git@git.magicalgirl.moe:KartKrew/Kart-Public.git into fix-fade-timeout 2019-02-02 21:51:49 +00: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
Sal 3f283fd2a9 Merge branch 'flying-sharks-suck' into 'next'
Flying sharks suck

See merge request KartKrew/Kart-Public!46
2019-02-02 01:45:42 -05: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
toaster b332a3e163 Tweak incorrect capitalisation. 2019-02-01 18:51:15 -05:00
wolfy852 85f3be5889 Comment out type 2019-02-01 15:45:53 -06:00
wolfy852 b5b4e1fcc8 Skip over type
CORRECTLY, this time.
2019-02-01 15:42:29 -06:00
wolfy852 7c18d130f2 Fix replay weirdness
Sryder's Pleasure Castle ghost tries to return to England with this line.
2019-01-31 23:21:00 -06:00
wolfy852 9ddea94590 Potentially fix 64-bit builds crashing on certain replays 2019-01-31 19:15:28 -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 9d51ef8e82 Play hit confirm sound for shields 2019-01-30 14:42:24 -05:00
Sally Cochenour a81546177d Speed updates based on number of orbiting items 2019-01-30 14:24:04 -05:00
Sryder e63b6aee00 Fix Connection Timeouts during Wipes
Keep the connection alive with a specific packet to say we haven't timed out
2019-01-30 19:18:51 +00: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
Sal cf06f108ed Merge branch 'majormods' into 'next'
Allow playing in Record Attack with minor add-ons

See merge request KartKrew/Kart-Public!31
2019-01-29 23:19:57 -05:00
Sal 036c1ee929 Merge branch 'expose-serversort' into 'master'
Expose serversort to console

See merge request KartKrew/Kart-Public!43
2019-01-29 23:16:43 -05:00
Sally Cochenour 70a70b8a97 Merge branch 'master' into offroad-stuff 2019-01-29 20:22:15 -05:00
Sally Cochenour eda13915a8 Merge branch 'next' into offroad-stuff 2019-01-29 20:22:11 -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
Steel Titanium e118ec9399 Remove CV_HIDEN flag for serversort 2019-01-29 13:27:43 -05:00
Sally Cochenour 1e61cc6152 Better cpusleep
- Default to 1, which means potential for a 1-frame loss every once in a while but no longer a complete cpu hog
- New minimum is 0, since -1 just did the exact same thing as 0.
2019-01-28 14:12:08 -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
toaster d3bf1d55ef You will never have Lua consoleplayer.
(This is a quick, cheap hack to make splitscreen not almost impossible to support in major mods like Wipezones.)
2019-01-28 17:28:15 +00:00
toaster ada4ce622f * Did some reviewing, turns out there's literally no reason to disable savemoddata when majormods gets tripped and it's just a stupid thing vanilla did for modifiedgame for some reason that we almost inherited with our new solution?
* Adjusted the save system to acknowledge the new status quo. Instead of trying to save modifiedgame in the file like some sort of extremely boneheaded honour system everyone and their mothers hacks around, we just use it to determine whether the save is for a mod with savedata or not (this keeps backwards compatibility based on how we were using it, anyways, especially with the *force* parameter...)
* Added a menu message for attempting to play a demo set on a map that isn't loaded, as opposed to letting it I_Error.
* Minor tweaks to addons menu representing modded status.
2019-01-28 16:32:07 +00: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 1f90a04623 Thin names for 9+ player intermission 2019-01-27 17:52:53 -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
Sryder 2c6799c52a Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart-Public.git into next 2019-01-26 21:46:20 +00:00
ThatAwesomeGuy173 eb29063ef1 Use actual characters instead of ASCII codes as per Sryder's suggestion 2019-01-26 14:15:37 -07:00
Sryder 90bdf11346 Merge branch 'no-cheese' into 'next'
No respawn cheese

See merge request KartKrew/Kart-Public!32
2019-01-26 16:08:36 -05:00
toaster ce09566e11 Do a bit more cleanup. Notably, prevent skins setting a bunch of things in preperation for this branch hitting the mainstream.
Also, make SF_RUNONWATER set off majormods. I was under strong pressure to remove it and almost did but honestly it's kind of endearing and I think like one character in Releases uses it..?
2019-01-26 19:13:49 +00:00
Latapostrophe f8fd2c5190 Changed condition to being mid-air, changed print and changed the kick to a return 2019-01-26 19:40:12 +01: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
toaster 1a21c5efbe Code cleanup as requested by Sal and Sryder.
* majormods and savemoddata cannot coexist as true values, so going through and making situations that involve both only reference one.
* Clean up comments in `dehacked.c`.
2019-01-26 16:58:45 +00:00
Latapostrophe 9028783190 Only prevent respawn if spun out in midair and added a Got_Respawn check to kick cheaters 2019-01-26 17:40:05 +01:00
Latapostrophe 72133b7498 No more ghetto check, and some more descriptive comments on the Hook 2019-01-26 16:55:26 +01:00
ThatAwesomeGuy173 fb6570cade I accidentally the numpad
also reduced the range of usable characters
2019-01-26 02:41:05 -07:00
Steel Titanium 74bf3164f8 Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into polyobj_fix_vanilia 2019-01-26 00:51:39 -05:00
ThatAwesomeGuy173 bcddbdbfbf Allow letters to be used in the "Specify IPv4 Address:" field 2019-01-25 21:50:58 -07:00
Sryder d959dd6934 Should hopefully fix the MD2 crash reported
I wasn't able to replicate it personally, but this should hopefully avoid it crashing where the RPT given pointed out.
2019-01-21 22:48:57 +00:00
toaster d045af07b1 Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart-Public.git into majormods 2019-01-21 21:56:49 +00:00
toaster e9d95f07c1 Fix everything Sal wanted changed. 2019-01-21 21:51:54 +00:00
toaster fdbf750f48 Fix incorrect condition for setting savemoddata to false. 2019-01-21 21:48:52 +00:00
Sryder 29f31cd9f8 Fix the netticbuffer command crashing 64-bit builds 2019-01-21 20:40:28 +00:00
Alam Arias 7b182d37b9 Merge remote-tracking branch 'upstream/master' into upstream-merge 2019-01-20 17:03:17 -05:00