Commit graph

10042 commits

Author SHA1 Message Date
mazmazz
f3f37bdaa9 Deployer: Fix tag toggle logic error; rename to DPL_TAG_ENABLED for back compat 2020-06-09 19:18:28 -04:00
mazmazz
72c10010ba Travis: Fix CCACHE not being restored in OSX 2020-06-09 18:09:19 -04:00
mazmazz
929892f2e3 CMAKE: Fix toggle fullscreen breakage due to missing define
This is lazy. The correct solution is to eliminate the define in the program code
2020-06-09 17:31:49 -04:00
mazmazz
87f11e2e2a Travis: Fix OS X maximum log length error 2020-06-09 17:13:51 -04:00
mazmazz
cd7d8b1353 Travis: Cache fixes to prevent ballooning 2020-06-09 16:48:39 -04:00
mazmazz
eb57419eb5 Travis OS X: Use MacPorts for program depends 2020-06-09 16:48:32 -04:00
mazmazz
06e330459b CMAKE: Fix OS X ccache scripts 2020-06-09 11:11:40 -04:00
mazmazz
8b7cfab2f2 DEPLOYER: Add Windows "installer" (7z SFX) 2020-06-09 08:11:04 -04:00
mazmazz
757887ea63 TRAVIS: OSX fixes: Library issues, MACOSX_DEPLOYMENT_TARGET 2020-06-08 20:19:48 -04:00
mazmazz
06ddf5b7f7 TRAVIS DEPLOYER: Improve trigger conditions
* DPL_DEPLOY_TAG -- Control whether to trigger on release tag
* DPL_UPLOAD_{package}_{target} -- Toggle per target whether to upload a package
* Actually make negation accurate with target-specific vars
2020-06-08 19:16:50 -04:00
mazmazz
8c4930ca35 Travis Windows: Specifiy GCC version specifically (10.1.0-3) 2020-06-08 15:22:34 -04:00
mazmazz
4ea41dfe33 TRAVIS: Silence brew update 2020-06-08 14:26:15 -04:00
mazmazz
2204929362 Deployer: Trigger GitHub/FTP fix 2020-06-08 12:41:18 -04:00
mazmazz
cb55129de0 Remove AppVeyor Deployer 2020-06-08 12:00:21 -04:00
mazmazz
f1871ba69d Deployer v2 for Travis
General build:
* OSX: Build all brews ourselves
* OSX: Enable caching for brews
* OSX: Enable CCACHE
* New Windows buildbot

Deployments:
* Ordered deploying buildbots first
* Overhauled DPL variables
* Specify asset paths in one variable, delimited by ;
* Enabled Github Releases deployment
* Dummied out Debian package builds
* Added environment targeting for core2 CPU
2020-06-08 12:00:20 -04:00
mazmazz
01ff46326f Merge remote-tracking branch 'stjr-gl/master' into cmake-adjustments 2020-06-08 11:57:57 -04:00
Digiku
70eb5ba634 Merge branch 'buffer-offset-fix' into 'master'
Strike null-pointer-arithmetic error in BUFFER_OFFSET

See merge request STJr/SRB2!989
2020-06-08 11:56:48 -04:00
Digiku
a41e68362e Merge branch 'openmpt-deprecated-fix' into 'master'
Fix OPENMPT deprecation error, openmpt_module_ctl_set

See merge request STJr/SRB2!990
2020-06-08 10:37:46 -04:00
mazmazz
f3c1db0650 CMAKE: Fix OSX CCache error 2020-06-08 03:08:58 -04:00
mazmazz
efba50c83c CMAKE: Add SRB2_DEBUG_INSTALL to toggle *.debug in install/package 2020-06-08 00:38:13 -04:00
mazmazz
aef9a1b522 CMAKE: Add CCACHE support 2020-06-08 00:35:31 -04:00
mazmazz
a5f7f9a534 Fix OPENMPT deprecation error, openmpt_module_ctl_set 2020-06-08 00:09:29 -04:00
mazmazz
2cefe82950 Fix OSX null-pointer-arithmetic error 2020-06-08 00:08:07 -04:00
mazmazz
c63ead5abb CMAKE: Configurable CPACK generator 2020-06-08 00:01:15 -04:00
mazmazz
ded6285249 CMAKE improvements: optional asset install; exe.debug for RelWithDebInfo 2020-06-08 00:01:15 -04:00
mazmazz
a449fa4a1d Added SDL Mixer X to CMAKE (Windows only) 2020-06-08 00:01:15 -04:00
Monster Iestyn
d2fefb6b9a use void rather than VOID, because the logging init code isn't exclusively Win32, whoops 2020-06-06 20:49:12 +01:00
Monster Iestyn
982d1db5d8 Merge branch 'cppcheck-fixes' into 'master'
Cppcheck fixes

See merge request STJr/SRB2!967
2020-06-06 15:28:48 -04:00
Monster Iestyn
56b8ea3587 added liolib.c to the VC10 project files, since it was missing from them 2020-06-06 17:38:35 +01:00
Monster Iestyn
cb7423b97e sdl/i_main.c: while we're here, split all the logging initialisation code into a separate function, to make main function more clean 2020-06-03 20:47:49 +01:00
Monster Iestyn
b11d58aef5 clean up BUGTRAP code in win32/win_main.c to avoid unmatched }
(though that said we don't officially care about the win32 folder files anymore)
2020-06-03 20:47:49 +01:00
Monster Iestyn
5349a0bf62 V_Init: count to NUMSCREENS, not NUMSCREENS+1 (though I can't help thinking this one might have been deliberate somehow?) 2020-06-03 20:47:49 +01:00
Monster Iestyn
bb1a2dbba7 sdl/i_main.c: fix wrong placement of #endif for LOGMESSAGES code 2020-06-03 20:47:49 +01:00
Monster Iestyn
8092d30376 Polyobj_rotate and related: change "origin" to vector2_t since all it needs is x/y and not any of the new stuff for vertex_t 2020-06-03 20:47:49 +01:00
Monster Iestyn
7340442839 P_XYMovement: initialise slopemom to all zeros 2020-06-03 20:47:49 +01:00
Monster Iestyn
adb11eec1b dehacked.c: use actual size of descriptions buffers rather than MAXLINELEN, which is way too large 2020-06-03 20:47:49 +01:00
Monster Iestyn
d11ba67288 G_ReadMetalTic: Make sure all three values for GZT_XYZ are read in the right order 2020-06-03 20:47:49 +01:00
Monster Iestyn
879a2bd20a G_GhostTicker/G_ReadMetalTic: type should default to MT_NULL, not -1
This way, if for some reason the ghost has no skin, nothing should spawn at all
2020-06-03 20:47:49 +01:00
SteelT
5542893548 Merge branch 'nowipe-fixes' into 'master'
NOWIPE fixes for colormap and title card wipes

See merge request STJr/SRB2!962
2020-05-28 11:30:01 -04:00
mazmazz
272362a86f Fix NOWIPE bugs with colormap fade and title card 2020-05-25 00:20:23 -04:00
mazmazz
8fee9a51ce Add NOWIPE behavaior for colormap fades 2020-05-25 00:19:41 -04:00
MascaraSnake
9d06cb4be4 Merge branch 'fix-window-icon' into 'master'
Fix window icon being reset when switching renderers on non-Windows platforms

See merge request STJr/SRB2!898
2020-05-13 04:14:51 -04:00
MascaraSnake
0e2fb59650 Merge branch 'ogl-gif-fix' into 'master'
Fix OpenGL only recording the first frame of unoptimized GIFs

See merge request STJr/SRB2!928
2020-05-13 04:09:58 -04:00
Monster Iestyn
0f4ada3d12 Merge branch 'gcc10-fixes' into 'master'
GCC 10 compiling fixes

See merge request STJr/SRB2!937
2020-05-12 14:47:49 -04:00
Monster Iestyn
8c88c3dbb4 added missing extern keyword for ntemprecords in doomstat.h (definition is in g_game.c) 2020-05-12 18:43:49 +01:00
Monster Iestyn
064f4bcf34 added missing extern keyword for ms_RoomId in mserv.h (the definition is already in the .c file in this case) 2020-05-12 18:42:16 +01:00
Monster Iestyn
dab212dc56 turn all non-extern variables in s_sound.h into externs (and put their real definitions in the .c file) 2020-05-12 18:40:51 +01:00
Monster Iestyn
89cd756cd8 make savegamename in doomdef.h an extern, put the actual definition in d_main.c 2020-05-12 18:37:15 +01:00
Steel Titanium
feced5ec3c Merge branch 'master' into next 2020-05-11 18:20:09 -04:00
SteelT
78fe9af56a Merge branch 'splitscreen-titlecards-fix' into 'master'
Fix splitscreen Title Card act name regression

See merge request STJr/SRB2!934
2020-05-11 18:18:22 -04:00