Steel Titanium
|
d475bcb0b7
|
Some few changes
|
2019-01-05 23:42:25 -05:00 |
|
mazmazz
|
2c2a96b554
|
MUS_MODPLUG fix
|
2019-01-04 18:39:09 -05:00 |
|
mazmazz
|
0efc1b968f
|
Flip HAVE_OPENMPT on by default for non-Windows makefile
|
2019-01-04 01:48:04 -05:00 |
|
mazmazz
|
c2687a4289
|
CMake fixes for OpenMPT
|
2019-01-03 21:17:18 -05:00 |
|
mazmazz
|
c0ca2c8980
|
Remove dynamic openmpt loading
|
2019-01-03 20:52:09 -05:00 |
|
Marco Z
|
51976778e2
|
Fix MSVC compile errors
|
2019-01-03 20:34:10 -05:00 |
|
Marco Z
|
213927b264
|
Add libopenmpt to VC10 project
|
2019-01-03 20:28:00 -05:00 |
|
mazmazz
|
c31abf458f
|
Add mingw-compiled libopenmpt 0.4.0 DLLs
|
2019-01-03 16:07:32 -05:00 |
|
mazmazz
|
91d0c090d6
|
Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt
|
2019-01-02 05:06:09 -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
|
05b27b5127
|
Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt
|
2019-01-02 04:02:13 -05:00 |
|
mazmazz
|
6086a9f238
|
Merge branch 'public-musicplus-le-changemusic' into public-musicplus-core
|
2019-01-02 03:47:51 -05:00 |
|
mazmazz
|
7a60a739e1
|
Add libopenmpt to cmake
|
2019-01-02 03:45:40 -05:00 |
|
mazmazz
|
04fc9a8605
|
Revised MinGW Makefile logic for OpenMPT
|
2019-01-02 02:37:48 -05:00 |
|
mazmazz
|
235db51696
|
Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt
|
2019-01-02 02:15:29 -05:00 |
|
mazmazz
|
e244b34093
|
Merge remote-tracking branch 'public-gl/master' into public-musicplus-core
|
2019-01-02 02:15:16 -05:00 |
|
mazmazz
|
1dd2899521
|
Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt
|
2019-01-02 02:14:49 -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
|
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 |
|
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 |
|
Steel Titanium
|
73dc40a0b1
|
Fix saving progress on vanilia
|
2018-12-26 15:47:12 -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 |
|
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 |
|
mazmazz
|
8586643467
|
Merge remote-tracking branch 'public-gl/master' into undo-old-side-discolor-fix
|
2018-12-25 00:09:24 -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 |
|
mazmazz
|
34964a07a8
|
Fix gcc 8 compile by using strcpy instead of memcpy for PM
|
2018-12-24 18:51:11 -05:00 |
|