Commit graph

5535 commits

Author SHA1 Message Date
Alam Arias
d464ab5ac5 fixup SOC changes for C 89 mode 2019-03-07 17:34:46 -05:00
Alam Arias
5418bdef01 Always compile in GNU C89 mode 2019-03-07 17:31:13 -05:00
Alam Arias
24f7ea2ce1 Merge remote-tracking branch 'origin/master' into followme 2019-03-07 17:29:47 -05:00
Latapostrophe
e2c72c08cd Fix map load crash and other additions / clean ups 2019-03-07 23:10:07 +01:00
wolfs
a80548b2a2 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
Alam Arias
5475eba690 reorder file loads 2019-03-06 11:36:56 -05:00
Latapostrophe
9fa80c3f57 Merge branch 'followme' of git.magicalgirl.moe:KartKrew/Kart-Public into followme 2019-03-05 12:24:28 +01:00
Latapostrophe
3d5f2e4e67 I'm an idiot. Fix very dumb crash caused by lazy copypaste when trying to apply fallback state on followers 2019-03-05 12:23:23 +01:00
James R
99d2af5669 Check that lumps are okay 2019-03-04 22:13:22 -08:00
Alam Arias
c4c744d27a Merge branch 'next' into followme 2019-03-04 17:17:35 -05:00
Alam Arias
9a8e13af5c Merge branch 'master' into next 2019-03-04 17:17:13 -05:00
Alam Arias
58b4b8b9e7 Merge remote-tracking branch 'upstream/master' 2019-03-04 17:16:37 -05:00
Alam Ed Arias
ca407e2be7 CircleCi: we need SSH for buildbot 2019-03-04 16:51:39 -05:00
Alam Ed Arias
9dbdc6a3a5 No more errors for VC6 support 2019-03-04 16:46:14 -05:00
Alam Ed Arias
4b0e8db4c1 no more floating constants warnings, and disable bad array bounds warnings 2019-03-04 16:46:14 -05:00
Alam Arias
aaccb4edff fixed compiling for MSVC 2017 2019-03-04 16:33:06 -05:00
Latapostrophe
169ec43eec add some Lua support, hit confirm animations and fix some stuff 2019-03-04 21:35:58 +01:00
Latapostrophe
3aadc5ac1b when you change the documentation but forget to update the code to go along 2019-03-03 21:16:56 +01:00
Latapostrophe
d410143ab0 good grief I'm an idiot 2019-03-03 21:16:02 +01:00
Latapostrophe
d8576b0bbc Add more customization options & fix some dumb things 2019-03-03 21:12:21 +01:00
Alam Arias
2967638cf3 remove whitespaces 2019-03-02 19:49:21 -05:00
Alam Arias
6071b78cf3 fixed compiling for MSVC 2019-03-02 18:57:52 -05:00
Alam Arias
980ab4dc77 follower_frame should be unsigned 2019-03-02 18:48:00 -05:00
Alam Arias
2ff308251c Merge branch 'next' into followme 2019-03-02 18:42:21 -05:00
Alam Arias
635a38091e Merge branch 'master' into next 2019-03-02 18:41:58 -05:00
Alam Arias
32d579be4e Do not error about array bounds, some GCC versions's reporting is broken 2019-03-02 18:39:53 -05:00
Alam Arias
350664996e Just do not warn about unsuffixed float constants 2019-03-02 18:39:10 -05:00
Sal
ae6bfe115d 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
Latapostrophe
c3151039b2 leftover comment from earlier experiment 2019-03-02 22:40:58 +01:00
Latapostrophe
b5b1ca6e26 Fix splitscreen, offline and death 2019-03-02 22:39:42 +01:00
Alam Arias
b9b14fb9a3 fixup merged mess for NO-LUA mess 2019-03-02 13:32:47 -05:00
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
Sal
333805ea95 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
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
Alam Arias
112d8edc85 Merge remote-tracking branch 'upstream/master' into upstream-merge 2019-03-01 13:11:16 -05:00
Monster Iestyn
0bfcbca0a2 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
054bd221fc Merge remote-tracking branch 'upstream/master' into upstream-merge 2019-03-01 11:53:57 -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
Monster Iestyn
351a5e28be Merge branch 'apng-backport' into 'master'
aPNG backport from Kart

See merge request STJr/SRB2!464
2019-03-01 11:04:08 -05:00
Sal
7503567d29 Merge branch 'higher-maxnetnodes' into 'next'
Upped MAXNETNODES

See merge request KartKrew/Kart-Public!94
2019-03-01 06:29:52 -05:00
wolfy852
0df85f62ad Merge branch 'master' into next 2019-03-01 00:13:47 -06:00
wolfs
e9f802deb3 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
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