vivlim
/
Kart-Public
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
5,723 Commits 50 Branches 7 Tags 75 MiB
Commit Graph

5723 Commits

Author SHA1 Message Date
James R aa4ce2b2d1 Check error on select 2019-04-26 13:06:26 -07:00
James R 4d739fe7a5 Unfuck MS connecting and error reporting 
Reconnect if the socket is closed.
Report the proper error from SO_ERROR and report an error from getsockopt.
 2019-04-26 12:59:21 -07:00
wolfs f2ec722b12 Merge branch 'room-list-first' into 'master' 
Show room list instead of server list if you haven't selected a room yet

See merge request KartKrew/Kart-Public!127
 2019-04-26 06:39:31 -04:00
wolfs 4dff8b4a11 Merge branch 'no-audio-option' into 'master' 
`-noaudio` option to cover `-nomusic` and `-nosound`

See merge request KartKrew/Kart-Public!129
 2019-04-26 06:37:02 -04:00
wolfs e6ba65bac9 Merge branch 'save-showjoinaddress' into 'master' 
Save showjoinaddress to config

See merge request KartKrew/Kart-Public!132
 2019-04-25 23:17:07 -04:00
Steel Titanium 21e8a2c537 Save showjoinaddress to config 2019-04-25 23:13:09 -04:00
Sal e76d33f9ba Merge branch 'under_the_weather' into 'master' 
Under the weather

See merge request KartKrew/Kart-Public!125
 2019-04-19 16:40:25 -04:00
Sal 96b7d94eb8 Merge branch 'd_clisrv-shitsprinkles' into 'master' 
Support splitscreen PLAYERINFO and don't expose clients' IP addresses

See merge request KartKrew/Kart-Public!126
 2019-04-19 16:40:12 -04:00
James R 387a701db5 Add a "-noaudio" parm to cover "-nomusic" and "-nosound" 2019-04-18 23:50:29 -07:00
James R 4b05199b9f Show rooms list in server browser initially 
If you haven't selected a room yet, you're
shown the room list instead of server list.
 2019-04-18 22:41:50 -07:00
James R d7e964bd54 Support splitscreen PLAYERINFO and don't expose clients' IP addresses 2019-04-14 21:14:01 -07:00
toaster 972e6e9cf5 Precipitation being drawn at infinite distance when set to zero is incorrect behaviour. This is likely the consequence of a bad merge, but I don't care enough to check for certain. 2019-04-14 14:41:39 +01:00
Sal db18492836 Merge branch 'clear-all-controls' into 'master' 
Clear P3 and P4 controls too when clearing all controls

See merge request KartKrew/Kart-Public!117
 2019-04-11 12:20:48 -04:00
Sal 5079dbbc3b Merge branch 'dedicated-end-vote-fix' into 'master' 
Fix dedicated servers not ending the vote

See merge request KartKrew/Kart-Public!121
 2019-04-11 12:20:08 -04:00
James R ab17769f89 Let dedicated servers end vote time too! 2019-04-04 16:13:31 -07:00
Alam Arias a3284df681 Merge remote-tracking branch 'upstream/master' 2019-03-27 19:13:41 -04:00
Alam Ed Arias 4d34841a53 CircleCI: use libpng-dev 2019-03-27 18:51:20 -04:00
Alam Ed Arias e6c6f048e4 CircleCI: Debian Jessie is dead, long live Debian Stretch 2019-03-27 18:23:03 -04:00
Alam Arias 7ad1b3ac6f TravisCI: remove xcode7.3 on DPL mac build 2019-03-26 21:20:17 -04:00
Alam Arias 14cd6c1b48 mistype in merge of TavisCI config 2019-03-26 11:54:54 -04:00
Alam Arias 68ee8737e8 Merge commit 'upstream/master~0' 2019-03-26 10:50:36 -04:00
Alam Arias 7d98adf6dc Merge commit 'upstream/master~1' 2019-03-26 09:48:13 -04:00
Monster Iestyn 9ef98471a4 Merge branch 'buildbot' into 'master' 
Buildbot changes

See merge request STJr/SRB2!477
 2019-03-26 09:44:56 -04:00
Monster Iestyn 8e78369f83 Merge branch 'dedicated-server-credits-fix' into 'master' 
Dedicated server credits fix

See merge request STJr/SRB2!476
 2019-03-26 09:44:21 -04:00
Monster Iestyn 7758b28164 Merge branch 'mi-side-discolor-fix' into 'master' 
MI's side discolor fix

See merge request STJr/SRB2!475
 2019-03-26 09:43:20 -04:00
Monster Iestyn 8c1c0875a2 Fix credits gamestate in dedicated mode, by properly separating the timer variable code from the drawing code in a semi-hacky way 2019-03-25 21:35:04 +00:00
Alam Ed Arias 73fa35baf0 TravisCI: use stock sdl2_mixer for prebuild bottle 2019-03-25 16:59:47 -04:00
Alam Ed Arias fd284f232e travisCI: add sdl2_mixer from mazmazz's srb2 tap 2019-03-25 16:43:33 -04:00
Alam Ed Arias 9de5055d7f TravisCI: install deps on sdl2_mixer 2019-03-25 16:30:02 -04:00
Alam Ed Arias ec0afaf6c9 TravisCI: try updating homebew 2019-03-25 16:02:30 -04:00
Alam Ed Arias 3472bf857c TravisCI: build custom sdl2_mixer build 2019-03-25 15:51:13 -04:00
Alam Ed Arias 594c906376 use default osx image 2019-03-25 15:48:33 -04:00
Alam Ed Arias 3ab0f675ec TravisCI: move homebrew packages for all mac builds 2019-03-25 15:44:33 -04:00
Alam Ed Arias a8681a5b72 CircleCI: rebuild depend file with BLUA 2019-03-25 15:34:25 -04:00
Alam Ed Arias fe22fdc5a3 P_SuperDamage() is too big for inlining 2019-03-25 15:30:25 -04:00
Alam Ed Arias c4e8a60112 CircleCI: also test compiling without BLUA support 2019-03-25 15:21:52 -04:00
Alam Ed Arias 9a8d36b822 Travis-CI: use a new version of xcode and use homebrew add-on to install packages 2019-03-25 15:16:43 -04:00
Monster Iestyn 147221cf6e R_RenderThickSideRange: clamp lights that fail overflow test, rather than skipping them. 2019-03-25 18:54:47 +00:00
fickleheart ca37b467e0 Clear P3 and P4 controls too when clearing all controls 2019-03-24 17:31:04 -05:00
Alam Arias 32fd6dc834 Merge remote-tracking branch 'upstream/master' 2019-03-23 15:08:45 -04:00
Nev3r b5a1030722 Merge branch 'allow-localhost' into 'master' 
Allow connecting to localhost / 127.0.0.1

See merge request STJr/SRB2!474
 2019-03-23 05:16:44 -04:00
Alam Arias 0aeae058df Merge remote-tracking branch 'upstream/master' 2019-03-22 10:42:07 -04:00
Alam Arias 544f806f92 Merge commit 'upstream/master~1' 2019-03-22 10:18:10 -04:00
Alam Arias 9b930a8e9e Merge commit 'upstream/master~2' 2019-03-22 10:15:32 -04:00
James R ed0f8fd967 Actually allow connecting to "localhost" 
Because IPv6 doesn't seem to work anyway.
 2019-03-20 20:37:00 -07:00
James R f139ffd1dc Let localhost connections 2019-03-20 20:37:00 -07:00
Monster Iestyn ecb6322a52 Merge branch 'sdl-noxinput-nohidapi' into 'master' 
-noxinput and -nohidapi command line parameters.

See merge request STJr/SRB2!468
 2019-03-20 17:33:04 -04:00
Monster Iestyn 828691a7ac Merge branch 'errorifpng' into 'master' 
Error if the lump is a PNG lump

See merge request STJr/SRB2!466
 2019-03-20 16:26:28 -04:00
Alam Ed Arias 1c55daef2a CMake: have funny check for empty CMAKE_SIZEOF_VOID_P 2019-03-19 09:10:25 -04:00
Alam Arias e50eb1f593 Merge remote-tracking branch 'upstream/master' 2019-03-19 01:05:54 -04:00