stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-12-28 13:21:10 +00:00
Code Issues Projects Releases Packages Wiki Activity
5686 commits 60 branches 11 tags 94 MiB
Commit graph

5686 commits

This branch
This branch
All branches
Author SHA1 Message Date
Lachlan Wright
4f1a329ef2 Update k_kart.c 2019-04-10 03:16:46 -04:00
Lachlan Wright
a4722aded8 Add missing entry for SKINCOLOR_BUBBLEGUM in ColorOpposite() 2019-03-27 03:23:32 -04: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
fickleheart
abc479980c Update patch.kart hash again 2019-03-16 00:35:13 -05:00
fickleheart
fd12ff9163 Merge branch 'kartstuff-fix' into version-prep 2019-03-16 00:02:40 -05:00
Steel Titanium
6d751ff302 Remove the define. 2019-03-15 18:46:25 -04:00
Steel Titanium
5a170b9e4e Merge branch 'master' into errorifpng 2019-03-15 16:40:47 -04:00
Sal
bc85256add Merge branch 'kartstuff-fix' into 'master' 
Add missing deh entry for k_starpostflip

See merge request KartKrew/Kart!127
 2019-03-14 17:32:22 -04:00
fickleheart
bae86bbca4 Oh, this was already here... 2019-03-12 08:39:25 -05:00
fickleheart
ee3580098b Add missing deh entry for k_starpostflip 2019-03-12 07:34:47 -05:00
fickleheart
3aa1e78345 Update version and patch hash 2019-03-11 22:40:15 -05:00
fickleheart
9ff8b73936 Merge remote-tracking branch 'remotes/internal/upsidedown-brain' into HEAD 
# Conflicts:
#	src/k_kart.c
#	src/p_mobj.c
 2019-03-11 21:59:45 -05:00
fickleheart
c30c3f7a3a Merge remote-tracking branch 'remotes/upstream/next' into HEAD 2019-03-11 21:53:53 -05:00
fickleheart
fcf072cbeb Merge remote-tracking branch 'remotes/upstream/master' into HEAD 2019-03-11 21:53:47 -05:00
fickleheart
1975a9b885 Prevent music changes from playing when unfocused 2019-03-11 21:48:29 -05:00
wolfs
24b5079f20 Merge branch 'color-flip' into 'next' 
Fix color enums more

See merge request KartKrew/Kart-Public!112
 2019-03-11 19:28:24 -04:00
wolfs
af67c7abf5 Merge branch 'maxskins-bump' into 'next' 
Bump MAXSKINS to 128 + Clean up skin struct

See merge request KartKrew/Kart-Public!82
 2019-03-11 19:28:16 -04:00
wolfy852
8c40f2a10e Remove disableSpeedAdjust 2019-03-11 17:23:41 -05:00
James R
0f9648eac0 Miscellaneous window de-focus options 
Music pausing is now optional.
Sounds may be paused--on by default.
The game itself being paused in off-line mode is now optional.

(showfocuslost now loads from config.)
 2019-03-11 14:57:11 -07:00
James R
bb187c1d27 Make "Focus lost" HUD overlay optional 2019-03-11 12:50:01 -07:00