Commit graph

5416 commits

Author SHA1 Message Date
fickleheart
73639b6504 ??? 2019-02-16 13:10:58 -06:00
fickleheart
0bbff7f6d4 [WIP, CRASHES] Save ghost data in netreplays 2019-02-16 12:42:24 -06:00
fickleheart
b0ea03af2a 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
4f8ef7c3aa Fix compile warnings 2019-02-06 21:03:05 -06:00
fickleheart
1c6046ac43 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
e5cdf6d84d Format for better consistency with the codebase 2019-02-06 20:25:45 -06:00
fickleheart
dab16409ce Fix views not setting properly when adding multiple at once 2019-02-06 20:25:27 -06:00
fickleheart
ae19aa9a33 Merge remote-tracking branch 'remotes/james/netreplays-scoreshud' into new_netreplays 2019-02-06 19:48:57 -06:00
Sally Cochenour
b5f582ed5a Kill me 2019-02-06 01:31:42 -05:00
Sally Cochenour
3d84c7c6c5 Merge branch 'next' 2019-02-05 22:02:08 -05:00
Sally Cochenour
fc7ad66497 Merge branch 'next' 2019-02-05 21:10:55 -05:00
Sal
91be817f92 Merge branch 'whitespace' into 'next'
Clean up Whitespace

See merge request KartKrew/Kart-Public!56
2019-02-05 19:03:02 -05:00
Sal
a57de6ad9a Merge branch 'version-prep' into 'next'
Update version to v1.0.3

See merge request KartKrew/Kart-Public!55
2019-02-05 19:02:54 -05:00
Alam Arias
380bce88a0 remove whitespaces 2019-02-05 15:42:37 -05:00
Alam Arias
57ee9b4177 fixup EOL in kart files 2019-02-05 15:36:30 -05:00
james
460bc3c4ec Show scores but not "Player 1" in netreplays 2019-02-04 21:23:48 -08:00
james
3821918cb5 Restrict viewn command to netreplays 2019-02-04 20:48:48 -08:00
james
cd8cd10dbc Bleh old stuff 2019-02-04 20:29:52 -08:00
james
d7db805891 Do not round player numbers in range
(fickle's suggestion.)
2019-02-04 20:16:54 -08:00
james
b17607c3c3 Expose G_ResetView and amend G_ResetViews
(fickle's suggestion.)
2019-02-04 20:13:30 -08:00
Sally Cochenour
c208147413 Merge branch 'next' into version-prep 2019-02-04 22:22:24 -05:00
Sally Cochenour
4b95aa3da7 why does this trigger ERRORMODE now?! 2019-02-04 22:22:12 -05:00
Sally Cochenour
695471bc67 Update patch.kart hash 2019-02-04 22:02:34 -05:00
Sally Cochenour
41e5b16920 Update version 2019-02-04 22:00:36 -05:00
Sal
9612c0d7c5 Merge branch 'fix-fade-timeout' into 'next'
Fix Encore Fade Timeout

See merge request KartKrew/Kart-Public!52
2019-02-04 21:39:33 -05:00
james
b777ae0ca8 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
f99a7dc36b 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
8ba981a9cb The string that got away from my memory 2019-02-04 22:02:40 +00:00
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