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 |
|
Monster Iestyn
|
d76e946b3e
|
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
|
fd7711c35b
|
Merge branch 'software-fov' into 'master'
Software FOV
See merge request KartKrew/Kart-Public!88
|
2019-02-27 01:18:49 -05:00 |
|
James R
|
286866d2b6
|
d'oh
|
2019-02-24 17:59:13 -08:00 |
|
James R
|
e35f65eee2
|
Try to fix compiler errors
|
2019-02-24 17:47:33 -08:00 |
|
fickleheart
|
1499a47541
|
Change OGL splitscreen hack to match software behavior
|
2019-02-24 12:26:46 -06:00 |
|
fickleheart
|
9d30a0f2bc
|
Adjust FOV change for 2p
|
2019-02-24 11:59:21 -06:00 |
|
fickleheart
|
4143c31176
|
Add field-of-view support in software mode
|
2019-02-23 10:31:37 -06:00 |
|
fickleheart
|
d6b9a75230
|
Move fov cvar out of OGL-specific code
|
2019-02-23 10:18:20 -06:00 |
|
James R
|
04980044a1
|
I am pretty dumb
|
2019-02-21 22:54:09 -08:00 |
|
Alam Arias
|
8db5bda230
|
Merge remote-tracking branch 'upstream/master'
|
2019-02-21 22:50:58 -05:00 |
|
Alam Ed Arias
|
7667122912
|
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
|
c1deea0714
|
Disable multi statement macros errors.
|
2019-02-21 18:48:42 -05:00 |
|
James R
|
1b2813b9d5
|
Document the playdemo command
|
2019-02-20 19:25:56 -08:00 |
|
james
|
c32d7f6745
|
Add race placement criteria to view command
|
2019-02-20 19:13:32 -08:00 |
|
james
|
fc8dc63f95
|
Add setviews command
|
2019-02-20 19:05:40 -08:00 |
|
James R
|
0e1d7ec6c6
|
Remove jitters in view command
|
2019-02-20 18:58:17 -08:00 |
|