mazmazz
|
c5e9d6c97f
|
DD Compile fixes
|
2019-01-02 06:48:06 -05:00 |
|
mazmazz
|
5807384dbd
|
Remove S_MusicExists lua
|
2019-01-02 06:26:18 -05:00 |
|
mazmazz
|
0724d042bc
|
Add safe lua music functions
S_MusicExists
S_SetInternalMusicVolume
S_StopFadingMusic
S_FadeMusic
S_FadeOutStopMusic
|
2019-01-02 04:58:03 -05:00 |
|
mazmazz
|
6086a9f238
|
Merge branch 'public-musicplus-le-changemusic' into public-musicplus-core
|
2019-01-02 03:47:51 -05:00 |
|
mazmazz
|
e244b34093
|
Merge remote-tracking branch 'public-gl/master' into public-musicplus-core
|
2019-01-02 02:15:16 -05:00 |
|
Alam Ed Arias
|
13e3a975d8
|
Merge branch 'master' into next
|
2019-01-01 23:00:39 -05:00 |
|
Digiku
|
764e6e7659
|
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
|
4560b4cb41
|
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
|
5149fb7d66
|
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
|
7d66f912d0
|
Make AppVeyor installer paths consistent with Travis installer paths(assets/deployer/installer -> assets/installer)
|
2019-01-01 11:51:17 -05:00 |
|
Digiku
|
80dc98624b
|
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 |
|
mazmazz
|
8dc37a850b
|
Fix loop_point and song_length floating point comparisons
|
2019-01-01 10:47:16 -05:00 |
|
mazmazz
|
2326a58bc7
|
Merge remote-tracking branch 'public-gl/master' into public-musicplus-core
|
2019-01-01 10:41:40 -05:00 |
|
Digiku
|
2374750d3c
|
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
|
f2aa86cab2
|
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
|
77eea3c41d
|
Use optional asset archive instead of file
|
2018-12-31 17:31:25 -05:00 |
|
mazmazz
|
61e8685713
|
Increase ChangeControl text buffer to resolve buffer overflow with System Menu/GIF control config
|
2018-12-31 01:43:47 -05:00 |
|
Steel Titanium
|
c2332170eb
|
Update libgme to 0.6.2
|
2018-12-30 22:49:11 -05:00 |
|
mazmazz
|
262dc5dac6
|
Rename ASSET_PATCH_DLL_GET to PACKAGE_PATCH_DLL_GET
|
2018-12-30 10:43:17 -05:00 |
|
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 |
|