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

5543 Commits

Author SHA1 Message Date
Alam Arias b9abd8b9bc fix EOL in k_kart.c 2019-03-05 11:29:00 -05:00
Alam Ed Arias 0bf3834174 Merge branch 'netreplays-errors' into 'new_netreplays' 
Try to fix compiler errors

See merge request KartKrew/Kart-Public!90
 2019-03-04 20:46:26 -05:00
Alam Arias 6b5f00eade more unsigned mess 2019-03-04 20:35:13 -05:00
Alam Arias 71d0dfb046 the READ/WRITE marcos do not need ; 2019-03-04 20:27:01 -05:00
Alam Arias dff82fffff Fixed comparing unsigned/signed mess 2019-03-04 20:26:44 -05:00
Alam Arias 489ca12bd3 Avoid ‘ncs’ being used uninitialized 2019-03-04 20:09:20 -05:00
Alam Arias 3a4ed07e02 do not overshadow demorecording 2019-03-04 19:16:46 -05:00
Alam Arias 1bdd1506d9 Fixup max() mess 2019-03-04 19:10:43 -05:00
Alam Arias db3d8eee50 Fixup unsigned mess 2019-03-04 19:07:34 -05:00
Alam Arias 618f8b1267 Merge branch 'master' into new_netreplays 2019-03-04 18:50:58 -05: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
James R d93b9b5eba Remove always true expression 2019-03-03 20:08:28 -08:00
James R 89ea7f548e Use correct signedness in comparison 2019-03-03 20:02:49 -08:00
James R 705ee9980f Merge remote-tracking branch 'origin/new_netreplays' into netreplays-errors 2019-03-03 19:53:25 -08:00
fickleheart 353ea7d671 Merge remote-tracking branch 'remotes/netreplays/docs' into new_netreplays 2019-03-03 21:06:53 -06:00
fickleheart 61893c613c Maintain compat for record attack replays 2019-03-03 20:41:20 -06:00
fickleheart 272ba600e2 Fix missing argument in G_AdjustView call 2019-03-03 20:33:59 -06:00
fickleheart 4b2938a540 Merge remote-tracking branch 'remotes/netreplays/double-cmp-fix' into new_netreplays 2019-03-03 20:29:52 -06:00
fickleheart 38d672620d Merge remote-tracking branch 'remotes/netreplays/view-by-raceplace' into new_netreplays 2019-03-03 20:29:46 -06:00
fickleheart 56269cb62b Merge remote-tracking branch 'remotes/netreplays/setviews-command' into new_netreplays 2019-03-03 20:29:40 -06:00
fickleheart f83e02e3db Merge remote-tracking branch 'remotes/netreplays/jitter-fix' into new_netreplays 2019-03-03 20:29:35 -06:00
fickleheart ebd688f32f Cleanup :3c 2019-03-03 20:25:22 -06:00
fickleheart c6f6783f3e Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays 2019-03-03 20:24:39 -06:00
fickleheart d560fef930 Assign a server player in replays for Lua purposes 
Unfortunately this doesn't seem to help sync much. It
at least prevents constant Lua errors I guess....
 2019-03-03 20:24:35 -06: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