Commit graph

4534 commits

Author SHA1 Message Date
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
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
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
james c74b05eadc Remove extra whitespace 2019-02-17 23:09:52 -08:00
james 46edc1e330 Create the correct dummy function 2019-02-17 15:50:42 -08: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
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
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
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 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
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
james dd45cfc757 Do not start sound system when disabled 2019-02-06 17:24:13 -08: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
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
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
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
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
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