Monster Iestyn
50710c3f10
fix inconsistent "tabbing" in the VS project files from when I added in lua_blockmaplib.c
2018-12-23 21:52:49 +00:00
Alam Ed Arias
e6cf509a84
More work to cleanup the ARM builds
2018-12-22 19:50:32 -05:00
Alam Arias
5765b3e034
Added ARM/ARM64 to whole vc10 sln
...
Added ARM/ARM64 to zlib, libpng
Added ARM/ARM64 to srb2dd/srb2sdl
2018-12-21 16:47:10 -05:00
Arthur
b762dc7bca
Common model format, with MD2/MD3 loading
2018-12-18 17:52:45 -05:00
Alam Ed Arias
f43dc96d73
Fix float-equal warning in Win32 interface
2018-12-16 14:01:28 -05:00
Monster Iestyn
2e12cf411d
Backport the Blockmap library I made two years ago
2018-11-30 17:11:11 +00:00
mazmazz
c91b2b4456
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
Monster Iestyn
0bff44e22b
Add myargmalloc boolean to detect whether we allocated myargv ourselves or not, so we don't free myargv if we didn't
2018-11-23 19:12:48 +00:00
Steel Titanium
0c30cd0fa1
Merge branch 'master' into responsefile-fix
2018-11-22 23:02:20 -05:00
Monster Iestyn
eb4eef6104
Merge branch 'public_next'
...
# Conflicts:
# src/Makefile.cfg
# src/d_clisrv.c
# src/p_setup.c
# src/r_segs.c
# src/r_things.c
2018-11-20 14:33:10 +00:00
mazmazz
59a913935e
Changed Mixer X sources to 2.2.0; added x64 gcc support
2018-11-19 20:51:54 -05:00
Steel Titanium
a84c49d7d6
Some small changes
2018-11-14 21:01:54 -05:00
Steel Titanium
ae2b331a11
Fix up compiling on DD version
2018-11-14 18:00:10 -05:00
Steel Titanium
a817c84836
Merge branch 'master' of https://git.magicalgirl.moe/STJr/SRB2 into mingw-64bit
2018-11-14 17:28:41 -05:00
Alam Ed Arias
45c8920bb1
Clean up warnings
2018-11-14 10:52:16 -05:00
Monster Iestyn
3350096b2f
Fix VC project files to include hw_clip.c/h
2018-11-14 12:11:57 +00:00
Marco Z
af0fdfe6e5
Missed #ifdef HAVE_LIBGME in win_snd
2018-11-13 22:50:08 -05:00
Steel Titanium
be3fac2908
Fix up 64-bit MINGW
2018-11-13 20:32:18 -05:00
mazmazz
86f48304ba
Win32 boolean fixes
2018-11-13 17:24:19 -05:00
mazmazz
4b63f20e9d
Merge branch 'musicplus-core' into musicplus-sdlmixerx
2018-11-13 14:34:40 -05:00
mazmazz
df7d23f00d
Merge branch 'master' into musicplus-core
2018-11-13 13:46:30 -05:00
Monster Iestyn
a0c822fec8
Merge branch 'public_next'
...
# Conflicts:
# src/d_main.c
# src/m_menu.c
# src/s_sound.c
# src/sdl/sdl_sound.c
2018-10-20 15:31:48 +01:00
mazmazz
bf93dace76
Merge remote-tracking branch 'public-gitlab/master' into public-music-cleanup
2018-10-19 22:04:26 -04:00
Monster Iestyn
0b70c725c8
Merge branch 'public_next'
...
# Conflicts:
# src/nds/i_sound.c
# src/r_data.c
# src/sdl12/mixer_sound.c
# src/sdl12/sdl_sound.c
# src/win32ce/win_snd.c
2018-10-19 22:46:19 +01:00
Sryder
4132b39b9a
Add an int to I_PlaySound to tell an interface which channel number SRB2 is using.
...
I've voided this out on other sound interfaces than SDL Mixer ones because I'm both not sure whether they need it, and not sure how to make them work with it if they do.
2018-10-13 23:01:11 +01:00
Monster Iestyn
89d7c55878
Merge branch 'public_next'
...
# Conflicts:
# src/Makefile
# src/lua_script.c
# src/p_user.c
# src/sdl/i_system.c
# src/v_video.c
# src/w_wad.c
2018-10-10 14:51:34 +01:00
Steel Titanium
0c9e8cff07
Change win_snd.c also
2018-10-07 15:00:48 -04:00
Steel Titanium
413d5e46c6
Really fix DD compiling this time.
2018-10-04 22:56:11 -04:00
Steel Titanium
8368647b29
Fix DD compiling
2018-10-04 22:44:26 -04:00
mazmazz
95db2ea276
MP Core Win32: Fix FadeSong unused callback param (buildbots)
2018-09-20 08:42:28 -04:00
mazmazz
9fd7fac3ae
MP Core Win32: Fix FadeSong unused callback param (buildbots)
2018-09-20 08:41:40 -04:00
mazmazz
f771c12701
MP Libopenmpt: Make explicit OPENMPT=1 for non-windows platforms
2018-09-19 23:03:35 -04:00
mazmazz
fa22f65610
Merge branch 'musicplus-core' into musicplus-sdlmixerx
2018-09-19 18:53:41 -04:00
mazmazz
15dc28144b
Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt
2018-09-18 22:24:44 -04:00
mazmazz
77381cd984
musicplus-jingle 2.2 -> 2.1 backport
2018-09-18 15:10:00 -04:00
mazmazz
0f2b4da1a9
MusicPlus core: Win32 DD compile fixes
2018-09-18 14:09:24 -04:00
mazmazz
4ce05ceadf
MusicPlus core: Win32 DD compile fixes
2018-09-18 14:09:13 -04:00
mazmazz
85c6715188
musicplus-libopenmpt 2.2 -> 2.1 backport
2018-09-18 12:31:47 -04:00
mazmazz
32c48af258
MusicPlus Core (positioning and fading) 2.2 -> 2.1 backport
2018-09-18 10:22:17 -04:00
mazmazz
707d649d67
Merge branch 'musicplus-core' into musicplus-sdlmixerx
2018-09-15 01:17:33 -04:00
mazmazz
b2e3352c5a
Merge branch 'music-cleanup' into musicplus-core
2018-09-15 00:46:02 -04:00
mazmazz
69359d4db0
srb2dd music cleanup fixes
...
(cherry picked from commit 5822cbbbe4
2018-09-14 13:57:22 -04:00
mazmazz
5822cbbbe4
srb2dd music cleanup fixes
2018-09-14 13:24:15 -04:00
mazmazz
d288dd2b5c
GME fix: play song in I_PlaySong, not I_LoadSong
...
(cherry picked from commit 5f21bf230d9716b7cc5b52e4bf3591ebe01e9f3a)
2018-09-14 10:45:39 -04:00
mazmazz
223160ffbd
Refactor I_MusicType MusicPlaying and MusicPaused other targets
...
(cherry picked from commit 9e6eebeb8d6b4119d87e9678bb6b0687e3dc5217)
2018-09-14 10:45:39 -04:00
mazmazz
03c5f5635d
Refactoring and reordering other targets
...
(cherry picked from commit cf065e106f68fb8af3b0568eba188c8235b1656e)
2018-09-14 10:43:46 -04:00
mazmazz
bcc99d705d
I_MusicPlaying, I_MusicPaused other targets
...
(cherry picked from commit d5ec38815968e267aceb59a48a6cb6d3292c0b69)
2018-09-14 10:28:35 -04:00
mazmazz
a8ce3d3002
Consolidate I_SetDigMusicVolume and I_SetMIDIMusicVolume other targets
...
(cherry picked from commit 9fb9386f84b3739fe765a78bcb9683eb7e98bc36)
2018-09-14 10:23:47 -04:00
mazmazz
32ab93a012
Added I_GetMusicType and removed midimode variable: other targets
...
(cherry picked from commit 14b393ab16736bb44dab6fd4a90b7bdd8ff782e0)
2018-09-14 09:55:45 -04:00
mazmazz
5a4e6cf924
Loose ends other targets
...
(cherry picked from commit 9a5fc5f66a31baf713c6f32f7a696b933da6907b)
2018-09-14 09:41:08 -04:00
