fickleheart
|
843bc6bc1b
|
Merge remote-tracking branch 'remotes/upstream/master' into new_netreplays
|
2019-03-03 20:24:39 -06:00 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
fickleheart
|
0d32f71d05
|
Change OGL splitscreen hack to match software behavior
|
2019-02-24 12:26:46 -06:00 |
|
fickleheart
|
f2d7021199
|
Adjust FOV change for 2p
|
2019-02-24 11:59:21 -06:00 |
|
fickleheart
|
39603af6a1
|
Add field-of-view support in software mode
|
2019-02-23 10:31:37 -06:00 |
|
fickleheart
|
b085355bdd
|
Move fov cvar out of OGL-specific code
|
2019-02-23 10:18:20 -06:00 |
|
Alam Arias
|
82f2ee4384
|
Merge remote-tracking branch 'upstream/master'
|
2019-02-21 22:50:58 -05:00 |
|
Alam Ed Arias
|
7a09161e69
|
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
|
45e9e3f7f9
|
Disable multi statement macros errors.
|
2019-02-21 18:48:42 -05:00 |
|
fickleheart
|
030428fc9e
|
Maybe this is a better way to work around the DrawMasked crash...
|
2019-02-19 19:26:32 -06:00 |
|
fickleheart
|
a5a98eec2f
|
Fix count limiter not always working right for titledemo netreplays
|
2019-02-19 17:33:02 -06:00 |
|
Alam Ed Arias
|
2b4cb4b40b
|
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 |
|
fickleheart
|
5e6b3a650c
|
Force intermission to 10 seconds on replays
|
2019-02-18 21:33:15 -06:00 |
|
fickleheart
|
ae3348e24d
|
Allow viewing karma bombs during replays
|
2019-02-18 21:23:05 -06:00 |
|
fickleheart
|
35148c48c0
|
Crash fix I think (CHERRY PICK INTO BASE)
|
2019-02-18 21:08:11 -06:00 |
|
fickleheart
|
b731e63d76
|
Remove debug print
|
2019-02-18 20:54:37 -06:00 |
|
fickleheart
|
b176ca27b3
|
For now, only use netreplays on the title if available
|
2019-02-18 20:52:21 -06:00 |
|
fickleheart
|
bca918cdbf
|
Let titledemos play while game is unfocused
|
2019-02-18 20:51:28 -06:00 |
|
fickleheart
|
97a663745a
|
Use generic resync message for RNG desyncs
|
2019-02-18 20:51:02 -06:00 |
|
james
|
fbc017165c
|
Remove extra whitespace
|
2019-02-17 23:09:52 -08:00 |
|
james
|
c689100e65
|
Create the correct dummy function
|
2019-02-17 15:50:42 -08:00 |
|
fickleheart
|
0b92743244
|
Support netreplays in titledemos
TDEMO###, where ### is a number from 1 to 255.
|
2019-02-17 13:13:45 -06:00 |
|
fickleheart
|
786e8875ae
|
Whoops, saving the wrong file list
|
2019-02-17 11:52:23 -06:00 |
|
fickleheart
|
ed16a35795
|
Don't force loading files for replays
|
2019-02-17 10:04:48 -06:00 |
|
fickleheart
|
c00fcfe2ea
|
Missed a ResetView line
|
2019-02-17 10:03:34 -06:00 |
|