Alam Arias
|
ef603143c9
|
fix VCHELP
|
2019-03-09 18:09:38 -05:00 |
|
Alam Arias
|
18233eba23
|
Merge branch 'master' into ping-stuff-take2
|
2019-03-09 18:05:30 -05:00 |
|
Latapostrophe
|
dca6d8094a
|
Change default showping from Warning to Always
|
2019-03-09 22:01:52 +01:00 |
|
wolfs
|
a80548b2a2
|
Merge branch 'archiveworld-sigsegv-fix' into 'master'
Fix SIGSEGV from sending lindefs/sidedefs in savegame
See merge request KartKrew/Kart-Public!99
|
2019-03-07 01:18:38 -05:00 |
|
James R
|
99d2af5669
|
Check that lumps are okay
|
2019-03-04 22:13:22 -08:00 |
|
Alam Arias
|
58b4b8b9e7
|
Merge remote-tracking branch 'upstream/master'
|
2019-03-04 17:16:37 -05:00 |
|
Alam Ed Arias
|
ca407e2be7
|
CircleCi: we need SSH for buildbot
|
2019-03-04 16:51:39 -05:00 |
|
Alam Ed Arias
|
9dbdc6a3a5
|
No more errors for VC6 support
|
2019-03-04 16:46:14 -05:00 |
|
Alam Ed Arias
|
4b0e8db4c1
|
no more floating constants warnings, and disable bad array bounds warnings
|
2019-03-04 16:46:14 -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 |
|
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 |
|
wolfy852
|
277216af2b
|
I don't think these old interfaces even compile but let's not kill them off
|
2019-02-22 18:13:22 -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 |
|
wolfy852
|
8f276f7791
|
...remove this forgotten comment too while I'm at it.
|
2019-02-19 18:54:24 -06:00 |
|
wolfy852
|
733c472e1f
|
Reorganization + kill old interfaces
|
2019-02-19 18:52:57 -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 |
|
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 |
|
james
|
5d3a657a41
|
Actually support no apng patch
|
2019-02-16 14:39:33 -08:00 |
|
james
|
488285e510
|
Support libpng without the apng patch and fix mingw (?) compiler errors
|
2019-02-16 14:20:55 -08:00 |
|
wolfy852
|
5172deb345
|
Fix compiler warnings
|
2019-02-16 08:32:14 -06:00 |
|