stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-29 05:41:02 +00:00
Code Issues Projects Releases Packages Wiki Activity
5414 commits 60 branches 11 tags 94 MiB
Commit graph

5414 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Sal
13f87088ab 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
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
Sal
6b3046ec18 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
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
Sal
258a426603 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
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
Sal
b0d9ea537f 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
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
Sal
88de3546a5 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
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
594c0838e7 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
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