mazmazz
e1300d5173
Rename ASSET_PATCH_DLL_GET to PACKAGE_PATCH_DLL_GET
2018-12-30 10:43:17 -05:00
mazmazz
941e29780c
Implement install building for appveyor (deployer)
2018-12-30 03:42:55 -05:00
mazmazz
bef0bc82e4
Merge branch 'mingw-64bit-cpu-target-revise' into appveyor-64
2018-12-29 23:46:16 -05:00
mazmazz
e7165444b4
Add 64-bit DD buildbot
2018-12-29 23:16:08 -05:00
mazmazz
0fc07ebaae
Consolidate [%CONFIGURATION%] == [SDL64] into %X86_64%
2018-12-29 23:15:09 -05:00
mazmazz
2aa7ee70fe
Disable UPX by default in appveyor
2018-12-29 22:51:10 -05:00
mazmazz
34534428fd
Add 64-bit SDL builds to appveyor config
2018-12-29 22:17:41 -05:00
mazmazz
3d2e58861d
Rename M5 to ARCHOPTS; allow override by command line
2018-12-29 21:55:35 -05:00
mazmazz
4cfacf5cde
Check for NONX86 in addition to X86_64; move MINGW64 subflags from win32/Makefile.cfg to Makefile
2018-12-29 21:14:50 -05:00
Steel Titanium
d048e7cbec
Don't set if LINUX64 is defined
2018-12-27 21:17:02 -05:00
Steel Titanium
5ba0863876
Stupid restrictions
2018-12-27 19:00:18 -05:00
Steel Titanium
4a05fd5f26
More explict check
2018-12-27 18:54:10 -05:00
Steel Titanium
6dddf61265
Target nocona for 64-bit builds
2018-12-27 00:56:33 -05:00
Digiku
da9447342c
Merge branch '2123-version' into 'master'
...
Update code versions to 2.1.23
See merge request STJr/SRB2!435
2018-12-26 17:14:58 -05:00
Digiku
ebb4c65d92
Merge branch 'srb2-chat-nonet' into 'master'
...
Hide SRB2-CHAT behind #ifndef NONET
See merge request STJr/SRB2!434
2018-12-26 17:13:23 -05:00
mazmazz
60bdc056f8
Also hide Chat Options if NONET
2018-12-26 16:41:39 -05:00
mazmazz
894c139bf1
Update code versions to 2.1.23
2018-12-26 16:31:43 -05:00
mazmazz
814db7e371
Hide SRB2-CHAT behind #ifndef NONET
2018-12-26 16:20:17 -05:00
Monster Iestyn
e39c6b47e7
Merge branch 'vanilia-savegame-fix' into 'master'
...
Fix saving game progress on a unmodified game
See merge request STJr/SRB2!433
2018-12-26 16:05:16 -05:00
Steel Titanium
4f18ec60bc
Fix saving progress on vanilia
2018-12-26 15:47:12 -05:00
Digiku
98e46f5b1c
Merge branch 'large-room-msvc-fix' into 'next'
...
Fix -ANGLE_180 because MSVC complains
See merge request STJr/SRB2!432
2018-12-25 01:15:02 -05:00
mazmazz
fa6f791ec3
Fix -ANGLE_180 because MSVC complains
...
-ANGLE_180 evaluates equal to ANGLE_180.
2018-12-25 01:14:05 -05:00
Digiku
26f956acea
Merge branch '2122-version' into 'next'
...
Update code versions to 2.1.22
See merge request STJr/SRB2!402
2018-12-25 00:45:14 -05:00
mazmazz
73a67fc9f5
Merge branch 'ctf-enemy-flag-sound' into 2122-version
2018-12-25 00:27:08 -05:00
mazmazz
842bcfc8a0
Merge remote-tracking branch 'public-gl/master' into 2122-version
2018-12-25 00:19:45 -05:00
mazmazz
a626660564
Merge remote-tracking branch 'public-gl/next' into 2122-version
2018-12-25 00:19:42 -05:00
Digiku
a5b3f0397f
Merge branch 'undo-old-side-discolor-fix' into 'master'
...
Undo old side discolor fix
See merge request STJr/SRB2!431
2018-12-25 00:14:41 -05:00
mazmazz
0b81debf94
Merge remote-tracking branch 'public-gl/master' into undo-old-side-discolor-fix
2018-12-25 00:09:24 -05:00
Digiku
1d474626f4
Merge branch 'nights-pgup-control' into 'next'
...
Support Look Up/Down keys for NiGHTS movement
See merge request STJr/SRB2!430
2018-12-24 23:53:35 -05:00
mazmazz
82a40f0dba
Support Look Up/Down keys for NiGHTS movement
2018-12-24 23:48:03 -05:00
mazmazz
b7edc7f870
Revert "Merge branch 'side-discolor-fix' into 'master'"
...
This reverts commit e721a3d882
, reversing
changes made to 4656a0d02c
.
2018-12-24 20:58:26 -05:00
mazmazz
bfc501a271
Revert default console backcolor to green; changed from CHAT commit
2018-12-24 20:57:11 -05:00
Digiku
cb42702e6b
Merge branch 'float-compare-colormap-fix' into 'master'
...
Fix float comparison for colormap maskamt
See merge request STJr/SRB2!428
2018-12-24 20:55:06 -05:00
mazmazz
10a3e3fec9
Define EPSILONs only if not already defined
...
Fixes OSX buildbot
2018-12-24 20:36:28 -05:00
mazmazz
c65f44e805
Remove log message
2018-12-24 20:33:59 -05:00
mazmazz
e9e5128754
Use DBL_EPSILON for colormap comparison
2018-12-24 20:22:10 -05:00
Alam Ed Arias
4651eddc36
Merge branch 'master' into next
2018-12-24 20:15:45 -05:00
mazmazz
58728ec358
Fix float comparison for colormap maskamt
2018-12-24 19:58:05 -05:00
Alam Ed Arias
89133160ec
TravisCI: GCC 8.x needs to pass
2018-12-24 19:10:29 -05:00
mazmazz
32697ddf61
Fix gcc 8 compile by using strcpy instead of memcpy for PM
2018-12-24 18:51:11 -05:00
Digiku
e721a3d882
Merge branch 'side-discolor-fix' into 'master'
...
Fix colormap bleeding onto sides [by Jimita]
See merge request STJr/SRB2!427
2018-12-24 17:33:34 -05:00
mazmazz
7fc79f0b88
Merge remote-tracking branch 'public-gl/master' into 2122-version
2018-12-24 17:31:03 -05:00
mazmazz
c2dc5788bf
Merge remote-tracking branch 'public-gl/next' into 2122-version
2018-12-24 17:30:59 -05:00
Jimita
4c6334f459
cleanup
2018-12-24 17:21:33 -05:00
Digiku
4656a0d02c
Merge branch 'sdl-autograb' into 'master'
...
SDL:Auto grab input
Closes #46
See merge request STJr/SRB2!416
2018-12-24 17:04:27 -05:00
Digiku
f06fd4149d
Merge branch 'polyobject-crush-fix-waypoint' into 'next'
...
Polyobject crush fix by waypoints [by TehRealSalt]
See merge request STJr/SRB2!426
2018-12-24 17:01:06 -05:00
Alam Ed Arias
c8f4d125b4
Merge branch 'master' into next
2018-12-24 16:56:29 -05:00
Digiku
be9a04e489
Merge branch 'disablespeedadjust-fix' into 'next'
...
Disablespeedadjust fix
See merge request STJr/SRB2!425
2018-12-24 16:31:19 -05:00
Digiku
2e6f382ec3
Merge branch 'bot-respawn-fix' into 'next'
...
Bot respawn fix
See merge request STJr/SRB2!423
2018-12-24 15:53:47 -05:00
TehRealSalt
878b1b2d16
Fix move by waypoints not checking for sector changes
...
It seemed weird at first, but the polyobject sector (backsector) itself DOESN'T need checked (although I still am doing it for safety). Rather, the in-level sector just needs checked.
If someone manually modifies the polyobject sector though, then this bug can still occur... but this fixes it for the most common use-case where this can happen. I'll try to tackle the rarer cases in my next commit.
2018-12-24 14:39:07 -05:00