Commit graph

4547 commits

Author SHA1 Message Date
Alam Arias
4eb655569e Merge remote-tracking branch 'origin/master' into upstream-merge 2019-03-02 13:27:10 -05:00
Alam Arias
c82fd8acd7 Exported SDL_icon.xpm as srb2icon.png 2019-03-02 13:26:17 -05:00
Alam Arias
47c32fa785 fixed compiling without blua support 2019-03-01 17:46:19 -05:00
Alam Arias
340d769386 Merge remote-tracking branch 'upstream/master' into upstream-merge 2019-03-01 17:33:32 -05:00
Alam Ed Arias
2eb26bc68e Fix building without BLUA support 2019-03-01 17:31:32 -05:00
Monster Iestyn
8d124101f4 Merge branch 'need-more-time' into 'master'
Stop Linux servers from hanging every 34 hours

See merge request STJr/SRB2!465
2019-03-01 11:22:32 -05:00
Alam Arias
65cf8c5da2 Merge remote-tracking branch 'upstream/master' into upstream-merge 2019-03-01 11:10:57 -05:00
wolfy852
cc7112eaf5 Stop Linux servers from hanging every 34 hours 2019-03-01 00:07:58 -06:00
wolfy852
088bfd30d0 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
Alam Ed Arias
3cbb1204ad Merge branch 'apng-oh-shit-fixes' into 'master'
Compiling errors for apng fixed

See merge request KartKrew/Kart-Public!69
2019-02-28 12:00:58 -08:00
wolfs
8a6f4b6405 Merge branch 'apng' into 'master'
Support aPNG in new versions of libpng

See merge request KartKrew/Kart-Public!63
2019-02-28 12:00:58 -08:00
Monster Iestyn
ea0c251a92 Merge branch 'sdl-new-windowicon' into 'master'
SDL:Update XPM icon

See merge request STJr/SRB2!441
2019-02-27 13:34:24 -05:00
fickleheart
0d32f71d05 Change OGL splitscreen hack to match software behavior 2019-02-24 12:26:46 -06:00
fickleheart
f2d7021199 Adjust FOV change for 2p 2019-02-24 11:59:21 -06:00
fickleheart
39603af6a1 Add field-of-view support in software mode 2019-02-23 10:31:37 -06:00
fickleheart
b085355bdd Move fov cvar out of OGL-specific code 2019-02-23 10:18:20 -06:00
Alam Arias
82f2ee4384 Merge remote-tracking branch 'upstream/master' 2019-02-21 22:50:58 -05:00
Steel Titanium
45e9e3f7f9 Disable multi statement macros errors. 2019-02-21 18:48:42 -05:00
james
fbc017165c Remove extra whitespace 2019-02-17 23:09:52 -08:00
james
c689100e65 Create the correct dummy function 2019-02-17 15:50:42 -08:00
james
5d3a657a41 Actually support no apng patch 2019-02-16 14:39:33 -08:00
james
488285e510 Support libpng without the apng patch and fix mingw (?) compiler errors 2019-02-16 14:20:55 -08:00
wolfs
6681257700 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
617d0bf67a 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
43f4888425 Merge branch 'fix_nonet' into 'master'
Fix NONET

See merge request KartKrew/Kart-Public!60
2019-02-16 06:11:43 -05:00
wolfs
fc5a4bd870 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
264adb7c7e Update project files 2019-02-14 21:32:57 -05:00
Steel Titanium
dc433dee62 Add missing ifdefs 2019-02-14 20:59:07 -05:00
james
cb1429b59f Support CMake for apng 2019-02-12 17:01:27 -08:00
james
fd28a1a6b7 Update copyright year 2019-02-11 16:01:02 -08:00
james
b95d443c25 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
ad8e7d8c3c 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
ae3bb592b9 Use less confusing player sorting key names 2019-02-09 18:10:54 -08:00
toaster
f6381c6f00 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
66af5ce558 Do not start sound system when disabled 2019-02-06 17:24:13 -08:00
Sally Cochenour
b5f582ed5a Kill me 2019-02-06 01:31:42 -05:00
Sally Cochenour
3d84c7c6c5 Merge branch 'next' 2019-02-05 22:02:08 -05:00
Sally Cochenour
fc7ad66497 Merge branch 'next' 2019-02-05 21:10:55 -05:00
Sal
91be817f92 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
380bce88a0 remove whitespaces 2019-02-05 15:42:37 -05:00
Alam Arias
57ee9b4177 fixup EOL in kart files 2019-02-05 15:36:30 -05:00
Sally Cochenour
c208147413 Merge branch 'next' into version-prep 2019-02-04 22:22:24 -05:00
Sally Cochenour
4b95aa3da7 why does this trigger ERRORMODE now?! 2019-02-04 22:22:12 -05:00
Sally Cochenour
695471bc67 Update patch.kart hash 2019-02-04 22:02:34 -05:00
Sally Cochenour
41e5b16920 Update version 2019-02-04 22:00:36 -05:00
Sryder
8ba981a9cb The string that got away from my memory 2019-02-04 22:02:40 +00:00
Sryder
d06071943c 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
10af9db31b P_NetKeepAlive should also be here because it potentially pauses mid-game! 2019-02-04 21:54:10 +00:00
Sal
dfe3034560 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
dad3677b9e fickle suggestions 2019-02-03 23:23:41 -05:00