Commit graph

5543 commits

Author SHA1 Message Date
Sryder
d06071943c 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
10af9db31b P_NetKeepAlive should also be here because it potentially pauses mid-game! 2019-02-04 21:54:10 +00:00
Sal
dfe3034560 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
Sal
e073f22d1a Merge branch 'insta-lookback' into 'master'
Lookback camera switches instantly

See merge request KartKrew/Kart-Public!51
2019-02-04 15:44:32 -05:00
James R
8a1c6114a7 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
dad3677b9e fickle suggestions 2019-02-03 23:23:41 -05:00
Sally Cochenour
475b35fa33 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
Sal
965eacd59e Merge branch 'split_is_just_a_synonym_for_disappear' into 'next'
Split is just a synonym for disappear

See merge request KartKrew/Kart-Public!50
2019-02-03 21:46:59 -05:00
toaster
e36328b631 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
fb35fcb831 Show WANTED and minimap in battle splits even when p1 is nuked. 2019-02-03 23:37:19 +00:00
Sal
d9f3fde39a Merge branch 'break_a_few_eggs' into 'next'
Break a few eggs

See merge request KartKrew/Kart-Public!49
2019-02-03 18:11:34 -05:00
toaster
0d81fb1141 gotta break a few eggboxes to fix a crash 2019-02-03 23:09:09 +00:00
Sally Cochenour
3d64a98684 Merge branch 'next' into ingame-player-cap 2019-02-03 17:23:50 -05:00
Sally Cochenour
f9a535b9b7 Missed this 2019-02-03 17:15:33 -05:00
Sally Cochenour
2c8c994324 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
5836b0818a Record net replays to replay/online/ 2019-02-03 14:29:54 -06:00
fickleheart
a7d78cf273 Add support for encore and battle replays 2019-02-03 13:55:29 -06:00
Sryder
243240de64 rename PT_WIPETIME to PT_BASICKEEPALIVE to be more obvious what it does 2019-02-02 21:53:27 +00:00
Sryder
21e61fea90 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
d3f739f64a Merge branch 'master' of https://git.magicalgirl.moe/KartKrew/Kart-Public.git into next 2019-02-02 21:12:49 +00:00
fickleheart
3618de853e 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
5d2d4ccf18 Merge branch '64-crash-fix' into 'master'
Fix Record Attack ghosts crashing x64 builds

See merge request KartKrew/Kart-Public!45
2019-02-02 01:45:54 -05:00
Sal
a87185cfb3 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
4679e48a3d Offroad code cleanup 2019-02-02 01:43:32 -05:00
fickleheart
3440c23705 Fix map name not showing right on replay intermission 2019-02-02 00:24:15 -06:00
Sally Cochenour
838c2aa68d Offroad spark fix & sink 2019-02-02 00:58:51 -05:00
Sal
ef96e6bc3b Merge branch 'nice_catch_TAG173' into 'next'
Tweak incorrect capitalisation

See merge request KartKrew/Kart-Public!47
2019-02-02 00:26:23 -05:00
fickleheart
ee35987a31 Play intermission after net replays 2019-02-01 21:06:52 -06:00
fickleheart
c85785f29c something 2019-02-01 20:50:33 -06:00
fickleheart
46c5e6f533 Fix P3 getting the wrong split flags in 3p splitscreen 2019-02-01 20:20:14 -06:00
fickleheart
7d5649ad97 Make replays single-view by default unless requested 2019-02-01 20:19:52 -06:00
fickleheart
0906e02d99 Allow changing all players' viewpoints in replays 2019-02-01 19:53:52 -06:00
fickleheart
2a7bde2366 Refactor view changes a bit 2019-02-01 19:46:58 -06:00
fickleheart
684ca46d8f Draw player names in netreplays 2019-02-01 19:28:05 -06:00
toaster
b7ea18bb4e Tweak incorrect capitalisation. 2019-02-01 18:51:15 -05:00
wolfy852
7d05d41cf3 Comment out type 2019-02-01 15:45:53 -06:00
wolfy852
6cdc1f4f24 Skip over type
CORRECTLY, this time.
2019-02-01 15:42:29 -06:00
fickleheart
e6380ecf3e Make the join sync hack a little more robust 2019-02-01 07:50:42 -06:00
fickleheart
ff8e14b997 wip replay viewpoint stuff heck im tired zzz good night 2019-02-01 01:32:35 -06:00
fickleheart
37b500a75d Tack on a timestamp to replay filenames 2019-02-01 01:01:14 -06:00
fickleheart
e3e72988d4 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
e5885aad6f 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
e1c2bc0fa9 Fix replay split breaking with less than four viewpoints 2019-01-31 23:03:44 -06:00
wolfy852
d2a286efd7 Potentially fix 64-bit builds crashing on certain replays 2019-01-31 19:15:28 -06:00
fickleheart
8837fac760 4p split views test 2019-01-31 00:00:28 -06:00
Sally Cochenour
8409a0f42c Shift around flashing bump stuff 2019-01-30 15:57:46 -05:00
Sally Cochenour
f7516f0f00 Reorganize these checks 2019-01-30 15:43:45 -05:00
Sally Cochenour
7ff0245882 Increase target cone for Race 2019-01-30 15:41:15 -05:00
Sally Cochenour
50b23b7512 Add delay to Jawz target switching, set Jawz target when fired 2019-01-30 15:39:29 -05:00
Sally Cochenour
33ac694729 Don't bump while flashing 2019-01-30 15:02:24 -05:00