Commit graph

4938 commits

Author SHA1 Message Date
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
James R
286866d2b6 d'oh 2019-02-24 17:59:13 -08:00
James R
e35f65eee2 Try to fix compiler errors 2019-02-24 17:47:33 -08: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
James R
04980044a1 I am pretty dumb 2019-02-21 22:54:09 -08: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
James R
1b2813b9d5 Document the playdemo command 2019-02-20 19:25:56 -08:00
james
c32d7f6745 Add race placement criteria to view command 2019-02-20 19:13:32 -08:00
james
fc8dc63f95 Add setviews command 2019-02-20 19:05:40 -08:00
James R
0e1d7ec6c6 Remove jitters in view command 2019-02-20 18:58:17 -08: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
fickleheart
766ceabf91 Maybe this is a better way to work around the DrawMasked crash... 2019-02-19 19:26:32 -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
fickleheart
7a80195ed7 Fix count limiter not always working right for titledemo netreplays 2019-02-19 17:33:02 -06: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
324108d120 Force intermission to 10 seconds on replays 2019-02-18 21:33:15 -06:00
fickleheart
188552e069 Allow viewing karma bombs during replays 2019-02-18 21:23:05 -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
fickleheart
9da5b9ae6a Crash fix I think (CHERRY PICK INTO BASE) 2019-02-18 21:08:11 -06:00
fickleheart
96972c9ae9 Remove debug print 2019-02-18 20:54:37 -06:00
fickleheart
0d31981dc2 For now, only use netreplays on the title if available 2019-02-18 20:52:21 -06:00
fickleheart
a2b5b76b98 Let titledemos play while game is unfocused 2019-02-18 20:51:28 -06:00
fickleheart
3a3b623e34 Use generic resync message for RNG desyncs 2019-02-18 20:51:02 -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
fickleheart
c260e27cd9 Support netreplays in titledemos
TDEMO###, where ### is a number from 1 to 255.
2019-02-17 13:13:45 -06:00
fickleheart
a6dff0a324 Whoops, saving the wrong file list 2019-02-17 11:52:23 -06:00
fickleheart
d1d270c09d Don't force loading files for replays 2019-02-17 10:04:48 -06:00
fickleheart
ed7afc4267 Missed a ResetView line 2019-02-17 10:03:34 -06:00
fickleheart
28b4d4a152 Merge remote-tracking branch 'remotes/james/netreplays-autoaddons' into new_netreplays 2019-02-17 08:52:21 -06:00
james
1785adffc2 Expose splitscreenplayer (from Got_AddPlayer) as splitscreen in player_t 2019-02-16 23:25:50 -08:00
fickleheart
a6bc581520 Fix duplicated player views from ResetViews 2019-02-16 22:24:37 -06:00
fickleheart
c00abd1683 Remove unnecessary ResetViews call 2019-02-16 22:19:17 -06:00
fickleheart
b6cc96ad68 Fix replays crashing upon completion 2019-02-16 22:19:05 -06:00
fickleheart
1c5e525db1 Fix views getting automatically changed in netreplays 2019-02-16 22:06:47 -06:00
fickleheart
3bd47b3beb Fix multiplayer ghosts crashing the game sometimes 2019-02-16 21:55:08 -06:00
fickleheart
be353c9260 Reset views away from spectators 2019-02-16 21:07:11 -06:00
fickleheart
6e44952d50 Fuck you 2019-02-16 20:53:15 -06:00
fickleheart
7a7ea255bf Merge remote-tracking branch 'remotes/james/netreplays-viewcommand' into new_netreplays
# Conflicts:
#	src/g_game.c
2019-02-16 20:20:11 -06:00
fickleheart
276373123e Add cvar for netreplay saving options 2019-02-16 18:29:51 -06: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
35be2e0be6 Don't prevent exiting games while recording at all 2019-02-16 16:16:35 -06:00
fickleheart
450efc3180 Merge remote-tracking branch 'remotes/james/netreplays-responder-fix' into new_netreplays 2019-02-16 15:50:46 -06:00
fickleheart
fcfce0bd49 Double default replay size 2019-02-16 15:49:54 -06:00
fickleheart
ca401aac8a Try to keep the RNG seed in sync 2019-02-16 14:24:00 -06:00
fickleheart
b006ac447f Remove debug-related code 2019-02-16 13:58:32 -06:00
fickleheart
e7488f8d76 Backwards compat for old replays 2019-02-16 13:49:31 -06:00
fickleheart
4bea570143 Resync items and bumpers in replays 2019-02-16 13:42:21 -06:00
fickleheart
08296d372d ??? 2019-02-16 13:10:58 -06:00
fickleheart
78adae109a [WIP, CRASHES] Save ghost data in netreplays 2019-02-16 12:42:24 -06:00
fickleheart
1fa32a4b9d Improve replay resyncing code
Notably, it should no longer cause immediate
desync warnings if a track starts on a slope.
2019-02-16 11:52:35 -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
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
James R
462e4fb863 Add support for an optional file list embeded in demos
Ghosts are also supported. The playback function can read demos without this
file list--it is a flag.
2019-02-14 14:02:47 -08:00
james
1b604273d4 Wait for HU_Responder and friends to finish eating before viewpoint control 2019-02-13 20:21:09 -08:00
james
97aeb27eda Fix "Return to title" doing NOTHING during recording 2019-02-13 20:20:31 -08:00
james
fb4cd26aed Support splitscreen views in netreplays with less than four players
The first view is also not changed if there are no players to view.
2019-02-13 16:22:32 -08:00
wolfy852
3a3dd42b89 Add pogospring to itemenabled 2019-02-13 05:37:13 -06:00
james
4a2d187472 view command: match names case-insensitively 2019-02-12 19:16:36 -08: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
fickleheart
dd75c1621c Fix compile warnings 2019-02-06 21:03:05 -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
fickleheart
e140127180 Format for better consistency with the codebase 2019-02-06 20:25:45 -06:00
fickleheart
61bb44463f Fix views not setting properly when adding multiple at once 2019-02-06 20:25:27 -06:00
fickleheart
f10237ea3d Merge remote-tracking branch 'remotes/james/netreplays-scoreshud' into new_netreplays 2019-02-06 19:48:57 -06: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
james
bbd2d84642 Show scores but not "Player 1" in netreplays 2019-02-04 21:23:48 -08:00
james
3a8d7af712 Restrict viewn command to netreplays 2019-02-04 20:48:48 -08:00
james
6dc04ab957 Bleh old stuff 2019-02-04 20:29:52 -08:00
james
8f47b55d29 Do not round player numbers in range
(fickle's suggestion.)
2019-02-04 20:16:54 -08:00
james
e52641d15a Expose G_ResetView and amend G_ResetViews
(fickle's suggestion.)
2019-02-04 20:13:30 -08: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
james
ac9356a02b Automatically load splits up to new viewpoint
Basically, you can start viewing your third split and the second one views
another!
2019-02-04 17:58:55 -08:00
james
67d6ee3b12 Shut up when our "new" viewpoint is just the same
Also actually correct for new splits.
2019-02-04 17:54:41 -08: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
James R
ee8948d627 Add support for changing viewpoint via console
This isn't just a shameless console-empowerement. More precise "spying" can
benefit everybody. But especially in net-replays, this is almost necessary.
2019-02-04 03:09:40 -08: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
fickleheart
7aa83635ae Record net replays to replay/online/ 2019-02-03 14:29:54 -06:00
fickleheart
fe7c6c7f83 Add support for encore and battle replays 2019-02-03 13:55:29 -06: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
fickleheart
ce59b705a4 Play generic intermission music after netreplays
Mostly because I kept cycling to other people after the
top half finished and always got the lose music as a
result lol
2019-02-02 10:54:24 -06: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
fickleheart
c407f811af Fix map name not showing right on replay intermission 2019-02-02 00:24:15 -06:00
Sally Cochenour
6a14d79cf0 Offroad spark fix & sink 2019-02-02 00:58:51 -05:00
fickleheart
71d1d10ef6 Play intermission after net replays 2019-02-01 21:06:52 -06:00
fickleheart
e76e3f2281 something 2019-02-01 20:50:33 -06:00
fickleheart
28b9c5fc7d Fix P3 getting the wrong split flags in 3p splitscreen 2019-02-01 20:20:14 -06:00
fickleheart
ba07224a8f Make replays single-view by default unless requested 2019-02-01 20:19:52 -06:00
fickleheart
3724d02e3b Allow changing all players' viewpoints in replays 2019-02-01 19:53:52 -06:00
fickleheart
4de79f13af Refactor view changes a bit 2019-02-01 19:46:58 -06:00
fickleheart
0ab690bc60 Draw player names in netreplays 2019-02-01 19:28:05 -06: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
fickleheart
09eef5f6b1 Make the join sync hack a little more robust 2019-02-01 07:50:42 -06:00
fickleheart
7f7dd0097b wip replay viewpoint stuff heck im tired zzz good night 2019-02-01 01:32:35 -06:00
fickleheart
43c4917e96 Tack on a timestamp to replay filenames 2019-02-01 01:01:14 -06:00
fickleheart
e5be5e80ba Make joins/quits/enters/spectates sync in replays
I'm not 100% sure on joins. That P_RandomByte() call
looks ugly. It'll probably be a source of trouble.
2019-02-01 00:44:35 -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
fickleheart
6a131f368f Fix replay split breaking with less than four viewpoints 2019-01-31 23:03:44 -06:00
wolfy852
9ddea94590 Potentially fix 64-bit builds crashing on certain replays 2019-01-31 19:15:28 -06:00
fickleheart
0c11562209 4p split views test 2019-01-31 00:00: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