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

5432 Commits

Author SHA1 Message Date
Alam Arias 16d00137b8 Merge remote-tracking branch 'upstream/master' 2019-03-09 20:38:36 -05:00
Alam Ed Arias cd39b951bb partly Revert "TravisCI: remove WFLAGS" 
This reverts commit 8780800e8e.
 2019-03-09 20:36:44 -05:00
Alam Ed Arias 8780800e8e TravisCI: remove WFLAGS 2019-03-09 20:17:14 -05:00
Alam Arias 6fb950002c Merge remote-tracking branch 'upstream/master' 2019-03-09 20:13:41 -05:00
Alam Ed Arias 60ca6ae06b TravisCI: add option for GCC 8.1 2019-03-09 19:41:56 -05:00
wolfs 7dc1d163be Merge branch 'archiveworld-sigsegv-fix' into 'master' 
Fix SIGSEGV from sending lindefs/sidedefs in savegame

See merge request KartKrew/Kart-Public!99
 2019-03-07 01:18:38 -05:00
James R f57335deef Check that lumps are okay 2019-03-04 22:13:22 -08:00
Alam Arias 5537c62271 Merge remote-tracking branch 'upstream/master' 2019-03-04 17:16:37 -05:00
Alam Ed Arias 3fa1751706 CircleCi: we need SSH for buildbot 2019-03-04 16:51:39 -05:00
Alam Ed Arias 67e246cd53 No more errors for VC6 support 2019-03-04 16:46:14 -05:00
Alam Ed Arias 145ccfd405 no more floating constants warnings, and disable bad array bounds warnings 2019-03-04 16:46:14 -05:00
Alam Arias 0d584a3145 Do not error about array bounds, some GCC versions's reporting is broken 2019-03-02 18:39:53 -05:00
Alam Arias b9eb5c399b Just do not warn about unsuffixed float constants 2019-03-02 18:39:10 -05:00
Sal 2a672dbd70 Merge branch 'upstream-merge' into 'master' 
Upstream merge of master

See merge request KartKrew/Kart-Public!96
 2019-03-02 17:32:16 -05:00
Alam Arias d4f05e5be9 fixup merged mess for NO-LUA mess 2019-03-02 13:32:47 -05:00
Alam Arias c56cae4d28 Merge remote-tracking branch 'origin/master' into upstream-merge 2019-03-02 13:27:10 -05:00
Alam Arias 24ae6107cf Exported SDL_icon.xpm as srb2icon.png 2019-03-02 13:26:17 -05:00
Sal 7799732988 Merge branch 'no_lua' into 'master' 
be able to compile without blua support

See merge request KartKrew/Kart-Public!97
 2019-03-02 10:08:20 -05:00
Alam Arias 2657eb998e fixed compiling without blua support 2019-03-01 17:46:19 -05:00
Alam Arias ae368a3e0f Merge remote-tracking branch 'upstream/master' into upstream-merge 2019-03-01 17:33:32 -05:00
Alam Ed Arias f823768699 Fix building without BLUA support 2019-03-01 17:31:32 -05:00
Alam Arias 94bd0e39d5 Merge remote-tracking branch 'upstream/master' into upstream-merge 2019-03-01 13:11:16 -05:00
Monster Iestyn 0051eb7039 Merge branch 'circleci' into 'master' 
CircleCI: test build SRB2 without network support

See merge request STJr/SRB2!462
 2019-03-01 12:56:52 -05:00
Alam Arias 3fe3d1121a Merge remote-tracking branch 'upstream/master' into upstream-merge 2019-03-01 11:53:57 -05:00
Monster Iestyn 67e721e983 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 3d8e25e440 Merge remote-tracking branch 'upstream/master' into upstream-merge 2019-03-01 11:10:57 -05:00
Monster Iestyn 27adf300b2 Merge branch 'apng-backport' into 'master' 
aPNG backport from Kart

See merge request STJr/SRB2!464
 2019-03-01 11:04:08 -05:00
wolfs d3e2e37c66 Merge branch 'need-more-time' into 'master' 
Stop Linux servers from hanging every 34 hours

See merge request KartKrew/Kart-Public!95
 2019-03-01 01:12:32 -05:00
wolfy852 97de2ae4f6 Stop Linux servers from hanging every 34 hours 2019-03-01 00:07:58 -06:00
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
Alam Ed Arias 7cd60a544a 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 5620d0188e 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
Alam Arias d865b5660a CircleCI: test build SRB2 without network support 2019-02-27 14:37:31 -05:00
Monster Iestyn e86d0836a3 Merge branch 'updatelibgme' into 'master' 
Update game-emu-music lib to 0.6.2

See merge request STJr/SRB2!444
 2019-02-27 13:49:44 -05:00
Monster Iestyn d76e946b3e 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
Sal fd7711c35b Merge branch 'software-fov' into 'master' 
Software FOV

See merge request KartKrew/Kart-Public!88
 2019-02-27 01:18:49 -05: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
Alam Ed Arias 7667122912 Merge branch 'gcc8-statement-warning' into 'master' 
GCC8: Disable multi statement macros errors.

See merge request STJr/SRB2!459
 2019-02-21 22:32:38 -05:00
Steel Titanium c1deea0714 Disable multi statement macros errors. 2019-02-21 18:48:42 -05:00
Alam Ed Arias a6315f895d Merge branch 'apng-oh-shit-fixes' into 'master' 
Compiling errors for apng fixed

See merge request KartKrew/Kart-Public!69
 2019-02-19 12:51:52 -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