stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2025-01-07 10:20:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
5950 commits 60 branches 11 tags 94 MiB
Commit graph

5950 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alam Arias
7009e89f22 Merge branch 'next' into followme 2019-03-04 17:17:35 -05:00
Alam Arias
515fb9adad Merge branch 'master' into next 2019-03-04 17:17:13 -05:00
Alam Arias
5537c62271 Merge remote-tracking branch 'upstream/master' 2019-03-04 17:16:37 -05:00
Alam Ed Arias
747995ae6a Merge branch 'master' into next 2019-03-04 17:15:04 -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
56e8f09ae8 fixed compiling for MSVC 2017 2019-03-04 16:33:06 -05:00
Latapostrophe
fb32eafdd4 add some Lua support, hit confirm animations and fix some stuff 2019-03-04 21:35:58 +01:00
Steel Titanium
9542a47f7f New -noxinput and -nohidapi command line parameters. 2019-03-03 22:57:09 -05:00
Steel Titanium
15323328c5 Check using memcmp() 2019-03-03 22:43:21 -05:00
Steel Titanium
3d5d02fc15 Error if the lump is a PNG lump 2019-03-03 19:58:01 -05:00
Latapostrophe
c7a07c6afc when you change the documentation but forget to update the code to go along 2019-03-03 21:16:56 +01:00
Latapostrophe
a9f04d1fb7 good grief I'm an idiot 2019-03-03 21:16:02 +01:00
Latapostrophe
eaff7617a5 Add more customization options & fix some dumb things 2019-03-03 21:12:21 +01:00
Alam Arias
707e3d20e2 remove whitespaces 2019-03-02 19:49:21 -05:00
Alam Arias
c6f494bbd2 fixed compiling for MSVC 2019-03-02 18:57:52 -05:00
James R
f0a0666223 Use long double suffix 2019-03-02 15:56:44 -08:00
Alam Arias
d22cb88bca follower_frame should be unsigned 2019-03-02 18:48:00 -05:00
Alam Arias
23909e9cf8 Merge branch 'next' into followme 2019-03-02 18:42:21 -05:00
Alam Arias
233033f213 Merge branch 'master' into next 2019-03-02 18:41:58 -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
Latapostrophe
8270644933 leftover comment from earlier experiment 2019-03-02 22:40:58 +01:00
Latapostrophe
1967ee2dd5 Fix splitscreen, offline and death 2019-03-02 22:39:42 +01:00
Sally Cochenour
b95d0ac279 16 more colors 
- Renamed Crimson to Maroon.
- Renamed Scarlet back to Crimson.
- Renamed Nova to Scarlet.
- Added Brick, Flame, Sunset, Popcorn, Camouflage, Caribbean, Plague, Platinum, Rust, Nova, Ultraviolet, Moonslam, Bubblegum, Mauve, Royal, and Fairy
- Updated Maroon, Robo-Hood, and Ketchup
- Shifted positioning of Aqua Super
 2019-03-02 15:39:52 -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
c2618fd987 Merge branch 'master' into next 2019-03-01 17:32:17 -05:00
Alam Ed Arias
f823768699 Fix building without BLUA support 2019-03-01 17:31:32 -05:00
Monster Iestyn
c9e8d34b9d Merge branch 'master' into next 2019-03-01 18:59:32 +00: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
008b0bf560 Merge branch 'master' into next 2019-03-01 16:23:51 +00: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
4459ecdd90 Merge branch 'master' into next 2019-03-01 16:05:49 +00: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
Monster Iestyn
4247f47ad9 Merge branch 'higher-maxnodes' into 'next' 
Upped MAXNETNODES

See merge request STJr/SRB2!463
 2019-03-01 09:15:47 -05:00
Sal
9210ab8497 Merge branch 'higher-maxnetnodes' into 'next' 
Upped MAXNETNODES

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