fickleheart
fcbe62bbe2
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
Steel Titanium
0b11424e3d
Error if the lump is a PNG lump
2019-03-03 19:58:01 -05:00
James R
ca861ba0c5
Use long double suffix
2019-03-02 15:56:44 -08: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
Sally Cochenour
d638d47fad
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
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
86264a545e
Merge branch 'master' into next
2019-03-01 17:32:17 -05:00
Alam Ed Arias
2eb26bc68e
Fix building without BLUA support
2019-03-01 17:31:32 -05:00
Monster Iestyn
4dd9c41b7b
Merge branch 'master' into next
2019-03-01 18:59:32 +00: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
e4062e1dc0
Merge branch 'master' into next
2019-03-01 16:23:51 +00: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
659e8e8162
Merge branch 'master' into next
2019-03-01 16:05:49 +00: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
Monster Iestyn
33c18d831f
Merge branch 'higher-maxnodes' into 'next'
...
Upped MAXNETNODES
See merge request STJr/SRB2!463
2019-03-01 09:15:47 -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
Sal
506f98f5e2
Merge branch 'color-fixes' into 'next'
...
Color fixes
See merge request KartKrew/Kart-Public!93
2019-02-27 16:24:03 -05:00
Steel Titanium
c748882d04
Remove double define
2019-02-27 16:05:43 -05:00
Steel Titanium
f26c1d3168
Merge branch 'next' into banip-command
2019-02-27 16:03:01 -05:00
Steel Titanium
7fc180604b
Upped MAXNETNODES
2019-02-27 15:59:50 -05:00
Steel Titanium
3085847630
Add some parentheses
2019-02-27 15:55:39 -05:00
Steel Titanium
ad6be71d1e
Upped MAXNETNODES
2019-02-27 15:43:29 -05:00
Monster Iestyn
538605117e
Merge branch 'master' into next
2019-02-27 20:35:07 +00:00
Alam Arias
0ea2177a4e
CircleCI: test build SRB2 without network support
2019-02-27 14:37:31 -05:00
Monster Iestyn
4933e1de51
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
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
Monster Iestyn
9ddad37455
Merge branch 'tails-bot-dead-forever-fix' into 'next'
...
Tails bot dead forever fix
See merge request STJr/SRB2!461
2019-02-27 12:39:56 -05:00
Sally Cochenour
ac61451556
Merge branch 'next' into minor-item-tweaks
2019-02-27 01:32:52 -05:00
Sal
d59ea8972d
Merge branch 'hyuu-fix' into 'next'
...
Fix Hyudoro being tangible to Jawz and Orbinauts
See merge request KartKrew/Kart-Public!79
2019-02-27 01:31:52 -05:00
Sally Cochenour
75125b726e
Merge branch 'next' into minor-item-tweaks
2019-02-27 01:22:38 -05:00
Sally Cochenour
53998821a2
Merge branch 'master' into next
2019-02-27 01:22:18 -05:00
Sal
930dd97abf
Merge branch 'software-fov' into 'master'
...
Software FOV
See merge request KartKrew/Kart-Public!88
2019-02-27 01:18:49 -05:00
Sally Cochenour
22cfbd8fd1
Merge branch 'next' into minor-item-tweaks
2019-02-27 01:15:24 -05:00
