mazmazz
|
8591455701
|
Implement install building for appveyor (deployer)
|
2018-12-30 03:42:55 -05:00 |
|
mazmazz
|
d36fc9f854
|
Merge branch 'mingw-64bit-cpu-target-revise' into appveyor-64
|
2018-12-29 23:46:16 -05:00 |
|
mazmazz
|
657f6c75c8
|
Add 64-bit DD buildbot
|
2018-12-29 23:16:08 -05:00 |
|
mazmazz
|
555be9c76f
|
Consolidate [%CONFIGURATION%] == [SDL64] into %X86_64%
|
2018-12-29 23:15:09 -05:00 |
|
Steel Titanium
|
07f1d495a4
|
Inclue PNG file
|
2018-12-29 23:10:45 -05:00 |
|
Steel Titanium
|
b6538c966e
|
Update XPM icon
|
2018-12-29 22:52:04 -05:00 |
|
mazmazz
|
0ae3e51c7a
|
Disable UPX by default in appveyor
|
2018-12-29 22:51:10 -05:00 |
|
mazmazz
|
13b143614e
|
Add 64-bit SDL builds to appveyor config
|
2018-12-29 22:17:41 -05:00 |
|
mazmazz
|
deec4550d3
|
Rename M5 to ARCHOPTS; allow override by command line
|
2018-12-29 21:55:35 -05:00 |
|
mazmazz
|
44d2340a5b
|
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 |
|
Digiku
|
1517c16c4d
|
Merge branch 'MSVC-ARM' into 'master'
ARM and ARM64 support with MSVC toolchain
See merge request STJr/SRB2!412
|
2018-12-28 01:05:40 -05:00 |
|
Steel Titanium
|
f61c8fa279
|
Don't set if LINUX64 is defined
|
2018-12-27 21:17:02 -05:00 |
|
Steel Titanium
|
46d3e06576
|
Stupid restrictions
|
2018-12-27 19:00:18 -05:00 |
|
Steel Titanium
|
3ca95acc56
|
More explict check
|
2018-12-27 18:54:10 -05:00 |
|
Steel Titanium
|
faaf298c4f
|
Target nocona for 64-bit builds
|
2018-12-27 00:56:33 -05:00 |
|
james
|
77a5a31135
|
Update capslock state on window re-focus
|
2018-12-26 15:49:57 -08:00 |
|
Digiku
|
1358a8dd8f
|
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
|
7e923333b9
|
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
|
a25c755a6b
|
Also hide Chat Options if NONET
|
2018-12-26 16:41:39 -05:00 |
|
mazmazz
|
7deac7e603
|
Update code versions to 2.1.23
|
2018-12-26 16:31:43 -05:00 |
|
mazmazz
|
bd4874aa53
|
Hide SRB2-CHAT behind #ifndef NONET
|
2018-12-26 16:20:17 -05:00 |
|
Monster Iestyn
|
c181ac84ba
|
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
|
73dc40a0b1
|
Fix saving progress on vanilia
|
2018-12-26 15:47:12 -05:00 |
|
Digiku
|
a473896d2d
|
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
|
91abcd66b7
|
Fix -ANGLE_180 because MSVC complains
-ANGLE_180 evaluates equal to ANGLE_180.
|
2018-12-25 01:14:05 -05:00 |
|
Digiku
|
ab017edd6e
|
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
|
7fe19c2f09
|
Merge branch 'ctf-enemy-flag-sound' into 2122-version
|
2018-12-25 00:27:08 -05:00 |
|
mazmazz
|
818438d5d0
|
Merge remote-tracking branch 'public-gl/master' into 2122-version
|
2018-12-25 00:19:45 -05:00 |
|
mazmazz
|
610d43cc84
|
Merge remote-tracking branch 'public-gl/next' into 2122-version
|
2018-12-25 00:19:42 -05:00 |
|
Digiku
|
d9fdeaaa75
|
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
|
8586643467
|
Merge remote-tracking branch 'public-gl/master' into undo-old-side-discolor-fix
|
2018-12-25 00:09:24 -05:00 |
|
Digiku
|
9c11d58bae
|
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
|
3e712b57c5
|
Support Look Up/Down keys for NiGHTS movement
|
2018-12-24 23:48:03 -05:00 |
|
mazmazz
|
a7ac8179f5
|
Revert "Merge branch 'side-discolor-fix' into 'master'"
This reverts commit f81144d7b1, reversing
changes made to c24d860eea.
|
2018-12-24 20:58:26 -05:00 |
|
mazmazz
|
de0943352a
|
Revert default console backcolor to green; changed from CHAT commit
|
2018-12-24 20:57:11 -05:00 |
|
Digiku
|
90e673a487
|
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
|
59ac969594
|
Define EPSILONs only if not already defined
Fixes OSX buildbot
|
2018-12-24 20:36:28 -05:00 |
|
mazmazz
|
52b6810ee1
|
Remove log message
|
2018-12-24 20:33:59 -05:00 |
|
mazmazz
|
7c3dcd2bf9
|
Use DBL_EPSILON for colormap comparison
|
2018-12-24 20:22:10 -05:00 |
|
Alam Ed Arias
|
fa5ff9c0cf
|
Merge branch 'master' into next
|
2018-12-24 20:15:45 -05:00 |
|
mazmazz
|
732b9a66ca
|
Fix float comparison for colormap maskamt
|
2018-12-24 19:58:05 -05:00 |
|
Alam Ed Arias
|
008fecbba7
|
TravisCI: GCC 8.x needs to pass
|
2018-12-24 19:10:29 -05:00 |
|
mazmazz
|
34964a07a8
|
Fix gcc 8 compile by using strcpy instead of memcpy for PM
|
2018-12-24 18:51:11 -05:00 |
|
Digiku
|
f81144d7b1
|
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
|
e40deb5443
|
Merge remote-tracking branch 'public-gl/master' into 2122-version
|
2018-12-24 17:31:03 -05:00 |
|
mazmazz
|
59cc9dbecf
|
Merge remote-tracking branch 'public-gl/next' into 2122-version
|
2018-12-24 17:30:59 -05:00 |
|
Jimita
|
23b27f5566
|
cleanup
|
2018-12-24 17:21:33 -05:00 |
|
Digiku
|
c24d860eea
|
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
|
7067d47c41
|
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
|
3942736e11
|
Merge branch 'master' into next
|
2018-12-24 16:56:29 -05:00 |
|