Commit graph

5833 commits

Author SHA1 Message Date
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
Monster Iestyn
ca176b6225 Merge branch 'polyobj_fix_vanilia' into 'master'
Fix rendering gaps on polys with upper/lower textures

See merge request STJr/SRB2!453
2019-02-11 15:05:44 -05: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
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