stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-11-15 01:01:43 +00:00
Code Issues Projects Releases Packages Wiki Activity
5703 commits 59 branches 11 tags 93 MiB
Commit graph

5703 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
Alam Ed Arias
49dddf54ab CMake: check if CMAKE_SIZEOF_VOID_P is defined on Mac? 2019-03-19 00:04:14 -04:00
Alam Ed Arias
6142becb4d Revert "Update CMakeLists.txt, remove CMAKE_SIZEOF_VOID_P check" 
This reverts commit d03c53930b.
 2019-03-18 23:58:31 -04:00
Alam Ed Arias
d03c53930b Update CMakeLists.txt, remove CMAKE_SIZEOF_VOID_P check 2019-03-18 16:50:17 -04:00
fickleheart
af17038cfb LAT 2019-03-17 21:44:11 -05:00
Sryder
7c3925e1ea Merge branch 'next' of git@git.magicalgirl.moe:KartKrew/Kart-Public.git 2019-03-17 22:59:08 +00:00
fickleheart
e18c6c0e1f Merge branch 'version-prep' 2019-03-17 17:55:38 -05:00
Sryder
ca522b3702 Merge branch 'master' of git@git.magicalgirl.moe:KartKrew/Kart-Public.git into next 2019-03-17 22:54:28 +00:00
fickleheart
ca68042d95 Merge remote-tracking branch 'remotes/james/move-changeviewpoint' into version-prep 2019-03-17 16:37:01 -05:00
fickleheart
f909a055d8 Merge remote-tracking branch 'remotes/james/unpause-resume-sounds' into version-prep 2019-03-17 16:36:52 -05:00
James R
70f40d54cb Resume sounds on unpausing after a window re-focus 2019-03-16 15:50:16 -07:00
James R
5057c37dfb Move change viewpoint control checking so it doesn't take precedence 
Notably over chat.
 2019-03-16 15:42:18 -07:00
fickleheart
4b71ac7b6b Merge branch 'netarchive-fix' into version-prep 2019-03-16 15:00:02 -05:00
fickleheart
b9ae148af6 Merge branch 'colormap-caching-workaround' into version-prep 2019-03-16 14:59:55 -05:00
fickleheart
50c0ed0f07 Fix bad merge in map data archiving code 2019-03-16 14:56:56 -05:00
fickleheart
875506e6cc Don't free this cached colormap! 2019-03-16 12:22:11 -05:00
fickleheart
f18d2a684b Merge branch 'lua-ticcmd-latency' into version-prep 2019-03-16 02:41:19 -05:00
fickleheart
d727492c87 Merge branch 'colormap-caching-workaround' into version-prep 2019-03-16 02:41:14 -05:00
fickleheart
0b1cc92f1a Allow reading ticcmd latency 2019-03-16 02:19:43 -05:00
fickleheart
ebe76f7a1b Remove dumb special case 2019-03-16 01:29:13 -05:00
fickleheart
cd4fc40b9e Cache colormaps everywhere to avoid memory leaks 2019-03-16 00:39:52 -05:00