TehRealSalt
|
0d1c501664
|
Update the SP menu stuff to use MAXSKINS
Co-authoered-by: Steel Titanium (steeltitanium1@gmail.com>
|
2019-01-26 00:22:05 -05:00 |
|
Steel Titanium
|
fad341b0e9
|
Fix skins overflow
|
2019-01-15 14:29:43 -05:00 |
|
Digiku
|
4f0be1b064
|
Update f_finale.c - Small credits update
|
2019-01-07 16:50:59 -05:00 |
|
Digiku
|
1c1331199d
|
Update f_finale.c - Remove Torgo's real name by request
|
2019-01-07 03:41:25 -05:00 |
|
Alam Ed Arias
|
819e4ef2ae
|
Merge branch 'master' into next
|
2019-01-01 23:00:39 -05:00 |
|
Digiku
|
393c64b8bc
|
Merge branch 'expanded-nmuslist' into 'next'
Expand NMUSList to include HUD changes
See merge request STJr/SRB2!388
|
2019-01-01 15:06:04 -05:00 |
|
Digiku
|
5278d1ca20
|
Merge branch 'caps-lock-consistency-fix' into 'master'
Update capslock state on window re-focus
See merge request STJr/SRB2!436
|
2019-01-01 15:05:20 -05:00 |
|
Digiku
|
900a439c11
|
Merge branch 'appveyor-installer-revise' into 'master'
Make AppVeyor installer paths consistent with Travis installer paths
See merge request STJr/SRB2!446
|
2019-01-01 11:52:42 -05:00 |
|
mazmazz
|
528c6f771a
|
Make AppVeyor installer paths consistent with Travis installer paths(assets/deployer/installer -> assets/installer)
|
2019-01-01 11:51:17 -05:00 |
|
Digiku
|
bbd878e520
|
Merge branch 'mingw-64bit-cpu-target-revise' into 'master'
MinGW64:Target nocona for 64-bit builds [revision]
See merge request STJr/SRB2!440
|
2019-01-01 11:15:34 -05:00 |
|
Digiku
|
ce7875b133
|
Merge branch 'appveyor-64' into 'mingw-64bit-cpu-target-revise'
Add 64-bit job to Appveyor
See merge request STJr/SRB2!442
|
2019-01-01 10:14:37 -05:00 |
|
Digiku
|
bd81c3190e
|
Merge branch 'appveyor-deployer' into 'appveyor-64'
Add Windows installer building to AppVeyor
See merge request STJr/SRB2!443
|
2019-01-01 10:14:25 -05:00 |
|
mazmazz
|
f00cfb7b3f
|
Use optional asset archive instead of file
|
2018-12-31 17:31:25 -05:00 |
|
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 |
|
Digiku
|
80e30c6aaa
|
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
|
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 |
|
james
|
0b857f127f
|
Update capslock state on window re-focus
|
2018-12-26 15:49:57 -08: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 |
|