mazmazz
bddafbeece
Merge branch 'internal-musicplus-jingle' into musicplus-aug2019
2019-08-04 02:41:37 -04:00
mazmazz
fd4d3a6a69
Mixer X menu touchup
2019-08-04 02:30:34 -04:00
mazmazz
b99f06c0c9
Merge remote-tracking branch 'origin/master' into musicplus-sdlmixerx
2019-08-04 01:10:21 -04:00
mazmazz
dd9efebab5
Merge remote-tracking branch 'origin/master' into internal-musicplus-jingle
2019-08-03 23:38:49 -04:00
Alam Ed Arias
a8637d034e
SDL2: more consts
2019-07-29 19:22:14 -04:00
Alam Ed Arias
1a643b1bd9
SDL2: more const in xpm code
2019-07-29 19:08:55 -04:00
Alam Ed Arias
ed0754382f
Merge remote-tracking branch 'private/master' into newicon
2019-07-29 19:04:19 -04:00
Alam Ed Arias
b77780e1e7
Fix building with MSVC
2019-07-29 19:02:45 -04:00
Alam Ed Arias
e50dc7c779
Merge branch 'public_next' into private
2019-07-29 18:31:01 -04:00
Alam Ed Arias
66f84efd02
SDL2: fixed compiling mixer interface with MSVC
2019-07-29 17:56:35 -04:00
Steel Titanium
98adcb1de3
Change it back to const char
2019-07-28 18:19:00 -04:00
Steel Titanium
74cbf2b4f3
Update mac icon
2019-07-28 17:06:01 -04:00
Steel Titanium
9813cbc857
More icon stuff
2019-07-27 01:13:54 -04:00
Steel Titanium
64bb70bef4
Fix crash with GME sounds when being freed
2019-07-27 01:13:54 -04:00
Steel Titanium
c35afa2c96
Merge branch 'master' into musicplus-sdlmixerx
2019-07-22 22:20:08 -04:00
Steel Titanium
af959ee309
Some fixup
2019-07-22 22:01:05 -04:00
Steel Titanium
181ecee202
Let's not use this
2019-07-16 19:26:16 -04:00
Steel Titanium
3ffb7b6192
New icons
...
Also update IMG_xpm.c
2019-07-16 19:20:00 -04:00
Monster Iestyn
c8cfc3110f
Merge branch 'public_next'
2019-07-16 18:28:49 +01:00
Steel Titanium
4e839596a1
Fix crash with GME sounds when being freed
2019-07-14 14:55:04 -04:00
Monster Iestyn
5c54022a89
Add static keyword to these variables for correctness
2019-07-14 16:23:01 +01:00
Steel Titanium
60cb2de6a0
Seperate declarations from code
2019-07-09 15:51:11 -04:00
Steel Titanium
21c6836fe0
Some few comments
2019-07-09 00:56:22 -04:00
Steel Titanium
164e797670
Better loading code for modules
2019-06-29 20:35:31 -04:00
mazmazz
5b0f7d2850
Merge branch 'master' into musicplus-sdlmixerx
2019-06-29 19:31:01 -04:00
mazmazz
923dc34215
Merge branch 'public-notpublic-musicplus-jingle' into internal-musicplus-jingle
2019-06-29 18:33:45 -04:00
mazmazz
6244489fd0
Merge branch 'public-musicplus-jingle' into public-notpublic-musicplus-jingle
2019-06-29 18:10:44 -04:00
mazmazz
dc0a92ea62
Merge remote-tracking branch 'origin/master' into internal-md3-vanilla
2019-06-29 17:51:30 -04:00
mazmazz
521d8fd8c1
Merge remote-tracking branch 'public-gl/master' into md3-vanilla
2019-06-29 15:02:07 -04:00
Steel Titanium
58bb05be00
Merge branch 'public-musicplus-libopenmpt' of https://git.magicalgirl.moe/STJr/SRB2 into public_libopenmpt
...
# Conflicts:
# .travis.yml
# src/m_menu.c
# src/sdl/Srb2SDL-vc10.vcxproj
# src/sdl/Srb2SDL.props
2019-06-11 17:48:00 -04:00
Monster Iestyn
e7e3b0ef38
Merge branch 'public_next'
...
# Conflicts:
# src/doomdef.h
# src/hardware/hw_draw.c
# src/m_misc.c
# src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
2019-06-09 20:04:08 +01:00
Monster Iestyn
f5d883bd12
Merge branch 'next' into 2.1.24-prep
...
# Conflicts:
# debian-template/control
# debian/changelog
2019-06-07 23:18:31 +01:00
Alam Ed Arias
ea08ba3fba
Merge branch 'master' into next
2019-06-07 18:07:32 -04:00
Alam Ed Arias
83b8a98df4
Merge branch 'gme-msvc' into 'master'
...
Add GME to MSVC 10 solution
See merge request STJr/SRB2!448
2019-06-07 18:06:51 -04:00
Steel Titanium
3c08ee1313
Merge branch 'master' into travis-deployer
...
# Conflicts:
# .travis.yml
2019-06-07 16:56:19 -04:00
Monster Iestyn
6f6d912fa6
Update version to 2.1.24
2019-06-07 15:48:33 +01:00
Steel Titanium
81dec89aeb
Merge branch 'next' into public-musicplus-libopenmpt
2019-06-03 15:36:50 -04:00
Steel Titanium
c8a5597492
Update libopenmpt to 0.4.4
2019-05-23 22:05:28 -04:00
Steel Titanium
ce1c1d8c88
Forgot some references
2019-05-20 23:31:23 -04:00
Steel Titanium
bf3d5f4188
circleci: Fix compiling error
2019-05-20 23:22:23 -04:00
Steel Titanium
91767a7740
Merge branch 'master' into public-musicplus-libopenmpt
2019-05-20 21:33:10 -04:00
Monster Iestyn
66bc287688
Merge branch 'public_next'
2019-05-16 15:58:17 +01:00
Monster Iestyn
600a373739
Merge branch 'master' into next
2019-05-13 16:07:30 +01:00
Steel Titanium
8a14427420
Merge branch 'perpetual-modifier-updates' into 'master'
...
Set modifiers in a non-reactive manner
See merge request STJr/SRB2!456
2019-05-13 00:36:06 -04:00
wolfy852
8f05d75926
Don't skip frames when connecting or paused
2019-05-08 09:39:45 -05:00
mazmazz
904b00e921
Remove song_length tag search
...
Because songs without this tag will skiplag when loading.
2019-05-02 19:14:23 -04:00
mazmazz
3e5b0c4531
Remove MP3 widechar tag searching
...
1. It's slow, 2. It's incorrect
2019-05-02 19:13:56 -04:00
mazmazz
3d90488d17
Merge remote-tracking branch 'public-gl/master' into md3-vanilla
2019-05-02 17:43:40 -04:00
Monster Iestyn
7ae6d5ee8c
Merge branch 'public_next'
...
# Conflicts:
# src/doomstat.h
# src/g_game.c
2019-03-28 14:19:02 +00:00
Monster Iestyn
7441dd7d9b
Merge branch 'master' into next
2019-03-25 18:08:36 +00:00
mazmazz
8317155c40
Merge branch 'public-gl-next' into public-musicplus-jingle
2019-03-15 18:42:19 -04:00
mazmazz
9ec98c588f
Merge branch 'public_next'
2019-03-14 22:15:34 -04:00
mazmazz
aea18f36ba
Remove MP3 warning
2019-03-13 19:51:45 -04:00
mazmazz
93626c2293
Merge remote-tracking branch 'public-gl/next' into public-musicplus-core
2019-03-13 19:45:07 -04:00
Steel Titanium
9542a47f7f
New -noxinput and -nohidapi command line parameters.
2019-03-03 22:57:09 -05:00
Monster Iestyn
a93e96c75b
Merge branch 'public_next'
...
# Conflicts:
# src/sdl12/Srb2SDL-vc10.vcxproj
# src/sdl12/Srb2SDL-vc9.vcproj
# src/sdl12/macosx/Srb2mac.pbproj/project.pbxproj
# src/sdl12/macosx/Srb2mac.xcodeproj/project.pbxproj
2019-03-02 20:51:15 +00:00
Monster Iestyn
67e721e983
Merge branch 'need-more-time' into 'master'
...
Stop Linux servers from hanging every 34 hours
See merge request STJr/SRB2!465
2019-03-01 11:22:32 -05:00
wolfy852
97de2ae4f6
Stop Linux servers from hanging every 34 hours
2019-03-01 00:07:58 -06:00
wolfs
5620d0188e
Merge branch 'apng' into 'master'
...
Support aPNG in new versions of libpng
See merge request KartKrew/Kart-Public!63
2019-02-28 12:00:58 -08:00
Monster Iestyn
7a0d8b408e
Merge branch 'public_next'
...
# Conflicts:
# src/d_main.c
# src/dehacked.c
# src/m_menu.c
# src/m_menu.h
2019-02-27 22:36:01 +00:00
Monster Iestyn
d76e946b3e
Merge branch 'sdl-new-windowicon' into 'master'
...
SDL:Update XPM icon
See merge request STJr/SRB2!441
2019-02-27 13:34:24 -05:00
james
356249dade
Set modifiers in a non-reactive manner
2019-01-17 16:47:01 -08:00
mazmazz
66e6a6f940
Merge remote-tracking branch 'public-gl/master' into md3-vanilla
2019-01-07 04:06:45 -05:00
Steel Titanium
7d1e59d4ba
Some few changes
2019-01-05 23:42:25 -05:00
mazmazz
578a4fe80d
Merge remote-tracking branch 'public-gl/master' into travis-deployer
2019-01-05 09:08:34 -05:00
Marco Z
882355d24b
Specify HAVE_LIBGME, paths, and depends only for Win32/x64 MSVC
2019-01-04 21:18:55 -05:00
Marco Z
88c4a54cea
Add GME to VC10 SRB2SDL project
2019-01-04 20:43:42 -05:00
mazmazz
87c015e340
MUS_MODPLUG fix
2019-01-04 18:39:09 -05:00
mazmazz
1bfc4c02e4
CMake fixes for OpenMPT
2019-01-03 21:17:18 -05:00
mazmazz
4a17e9ed9b
Remove dynamic openmpt loading
2019-01-03 20:52:09 -05:00
Marco Z
caab60e9f0
Fix MSVC compile errors
2019-01-03 20:34:10 -05:00
Marco Z
6d2ef74b21
Add libopenmpt to VC10 project
2019-01-03 20:28:00 -05:00
mazmazz
a851c5d7da
Add libopenmpt to cmake
2019-01-02 03:45:40 -05:00
mazmazz
953f5b6297
Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt
2019-01-02 02:15:29 -05:00
mazmazz
109dd70a53
Merge remote-tracking branch 'public-gl/master' into public-musicplus-core
2019-01-02 02:15:16 -05:00
mazmazz
6166fad045
Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt
2019-01-02 02:14:49 -05:00
mazmazz
075f28b7c8
WIP 20190101 merge
...
d_netcmd.c
filesrch.c
m_menu.c
p_setup.c
p_spec.c
r_data.c
r_main.c
r_things.c
w_wad.c
w_wad.h
2019-01-02 01:09:15 -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
mazmazz
7916e020d2
Fix loop_point and song_length floating point comparisons
2019-01-01 10:47:16 -05:00
mazmazz
b7bb570f97
Merge remote-tracking branch 'public-gl/master' into public-musicplus-core
2019-01-01 10:41:40 -05:00
mazmazz
78fa72514f
Implement deployer scripts for Travis -- OSX and Linux package building
2018-12-30 15:22:50 -05:00
Steel Titanium
0ebe5b258c
Inclue PNG file
2018-12-29 23:10:45 -05:00
Steel Titanium
a7b96ab83d
Update XPM icon
2018-12-29 22:52:04 -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
Arthur
587ffa9ada
Removed gr_voodoocompatibility as even low-power mobile devices do not have this limitation
...
No longer using byte2float in DrawPolygon -- use the surface color data directly
Vertex Buffer Objects for non-interpolated model frames
Removed some old unused paletted texture stuff
2018-12-27 00:35:29 -05:00
mazmazz
74d6921f47
Merge tag 'SRB2_release_2.1.23' into md3-vanilla-ssn
2018-12-26 22:55:25 -05:00
james
0b857f127f
Update capslock state on window re-focus
2018-12-26 15:49:57 -08:00
mazmazz
894c139bf1
Update code versions to 2.1.23
2018-12-26 16:31:43 -05:00
mazmazz
7fc79f0b88
Merge remote-tracking branch 'public-gl/master' into 2122-version
2018-12-24 17:31:03 -05:00
mazmazz
ed410575d6
Only SetWindowGrab if !disable_mouse; toggle cursor visibility
2018-12-23 22:09:16 -05:00
Steel Titanium
46d1a866d8
Another attempt to lock the mouse
2018-12-23 18:54:15 -05:00
mazmazz
c0a0c5ac5d
Merge remote-tracking branch 'public-gl/next' into 2122-version
2018-12-23 18:09:14 -05:00
Arthur
b19252651f
Removed all glBegin/glEnd references
...
MD2/MD3 now works, with the exception of WAD textures for some odd reason
2018-12-23 17:00:11 -05:00
Monster Iestyn
2d675750cf
fix inconsistent "tabbing" in the VS project files from when I added in lua_blockmaplib.c
2018-12-23 21:52:49 +00:00
Steel Titanium
40a037f603
A more through out attempt to lock the mouse
2018-12-23 14:54:14 -05:00
mazmazz
b49cf11fb6
Merge remote-tracking branch 'public-gl/next' into 2122-version
2018-12-22 23:41:55 -05:00
Steel Titanium
66e13cf1cc
SDL:Auto grab input
2018-12-22 23:28:59 -05:00
Alam Ed Arias
0ed9665a79
Added static library of SDL2 and SDL2_mixer for ARM systems
2018-12-22 20:48:15 -05:00
Alam Ed Arias
102fd11cb4
More work to cleanup the ARM builds
2018-12-22 19:50:32 -05:00
mazmazz
8707b2f40a
Center window on current monitor during vidmode change
2018-12-22 01:43:58 -05:00
Alam Arias
b6a917cda1
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
Digiku
58a2cec70f
Merge branch 'float_equal' into 'master'
...
Clear Float equal warnings
See merge request STJr/SRB2!383
2018-12-20 16:58:37 -05:00
Digiku
f405f1ae30
Merge branch 'cmake-dllpath-fix' into 'master'
...
Update CMake paths for Windows DLLs
See merge request STJr/SRB2!406
2018-12-20 16:53:06 -05:00
mazmazz
0519d8c52d
Update CMake paths for Windows DLLs
2018-12-20 16:46:40 -05:00
mazmazz
9d212b340b
Update code versions to 2.1.22
2018-12-20 02:35:27 -05:00
Arthur
3ed0edbcfe
Common model format, with MD2/MD3 loading
2018-12-18 17:52:45 -05:00
Alam Ed Arias
6fd66bdb49
Clear float equal warnings
2018-12-14 20:34:06 -05:00
mazmazz
c49a5ed8d2
Better I_InitJoystick log message
2018-12-14 06:14:21 -05:00
mazmazz
70d6845d6c
Fix menu where cv_usejoystick.value > I_JoyNum and selecting an unused controller and the "used!" prompt pops up erroneously
2018-12-14 05:57:10 -05:00
mazmazz
e548f6f139
Don't override an already-active controller
...
* Menu improvements to tell the user that they can't set a controller if it's already active
2018-12-14 05:02:41 -05:00
mazmazz
3b6de810e1
Lots of changes to better support hotplugging and unstable device indexes
...
* Don't save cv_usejoystick/2 because hotplugging changes can be made invalid by next run
* Properly set cv_usejoystick/2 for menu toggling
* Force-disable a player's joystick if setting another player's joystick to the same device
* Properly set cv_usejoystick/2 value of BOTH target player AND other players when hotplugging and unplugging
2018-12-14 03:58:07 -05:00
mazmazz
6b9fe87b60
Properly handle unstable device indexes for hotplug
2018-12-14 01:45:18 -05:00
mazmazz
44d6a1d236
Attempt to handle unstable device IDs
2018-12-14 00:22:25 -05:00
mazmazz
216e710b87
Improve hotplug edge case with changing device indexes; return proper joy_open output on error
2018-12-13 23:52:04 -05:00
mazmazz
14cde2d227
Change joystick log messages to DBG_GAMELOGIC
2018-12-13 23:26:07 -05:00
mazmazz
e81f05c496
Handle unstable device index when hotplugging controller
2018-12-13 23:09:05 -05:00
mazmazz
bcd747c1cd
Adjust SDL_JOYDEVICEREMOVED handler by checking the player's joy device explicitly
2018-12-13 22:26:13 -05:00
mazmazz
47ee3525af
Indentation
2018-12-08 14:10:56 -05:00
mazmazz
01f1933f69
Force directsound to fix wrong-pitch sound effects
2018-12-08 14:05:58 -05:00
mazmazz
60afce5771
Disable XINPUT before initing the joy subsystem
2018-12-06 14:03:46 -05:00
mazmazz
6694b7d679
Controller hotplugging by always keeping joy subsystem on (thanks WOLFS)
...
(with log messages)
2018-12-06 10:54:58 -05:00
Monster Iestyn
e353e2ef70
Merge branch 'next' into 21-version
2018-12-04 17:19:36 +00:00
Monster Iestyn
f2b0db5a1c
Merge branch 'master' into next
2018-12-04 17:18:19 +00:00
Digiku
631f6ed406
Merge branch 'joystick-juggling' into 'master'
...
Joystick juggling
See merge request STJr/SRB2!355
2018-12-04 11:51:55 -05:00
Monster Iestyn
d1a8e3acdb
Merge branch 'tiny-makefile-fix' into 'master'
...
Tiny Makefile Fix
See merge request STJr/SRB2!289
2018-12-04 08:09:27 -05:00
mazmazz
60feae1014
Update OSX icon
2018-12-03 23:09:54 -05:00
mazmazz
8851f39b84
Use static joyname instead of malloc
2018-12-03 12:35:12 -05:00
mazmazz
19d19543b7
Copy string from SDL_JoystickNameForIndex before the subsystem is shut down
2018-12-03 05:37:07 -05:00
Monster Iestyn
a63ba7084a
Disable the axis parts of I_GetJoystickEvents and its player2 counterpart.
...
(This is what I should have done in the first place)
2018-12-02 17:42:51 +00:00
Monster Iestyn
ce4e63a366
Miserable half-attempt to support hats in I_GetEvent, I've disabled it for now since I couldn't really figure out how to pull this off ...yet
2018-12-02 17:12:05 +00:00
Monster Iestyn
33c1ac33f5
Merge branch 'next' into 21-version
...
# Conflicts:
# src/d_netcmd.c
2018-12-02 15:45:07 +00:00
Monster Iestyn
11cb163435
Backport the Blockmap library I made two years ago
2018-11-30 17:11:11 +00:00
Sryder
bc1f08f89d
Fix 2 of the Unsuffixed Float Constant warnings
...
The other one is related to M_PI for me, which I'm still not sure about where it's getting it from
2018-11-29 22:12:14 +00:00
Monster Iestyn
11cb2e05ba
Merge branch 'cmake-use-internal-libs' into 'master'
...
CMake: Use internal libs.
See merge request STJr/SRB2!325
2018-11-25 09:33:50 -05:00
mazmazz
ea7162a76a
Update source copyrights to 2018
2018-11-25 07:35:38 -05:00
Monster Iestyn
08af33c51f
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
mazmazz
36e020c366
Update version to 2.1.21
2018-11-23 06:58:45 -05:00
Steel Titanium
fe43deacec
Merge branch 'master' into responsefile-fix
2018-11-22 23:02:20 -05:00
Steel Titanium
6020abab94
Fix the not found errors on DLLs
2018-11-22 22:44:47 -05:00
Steel Titanium
ff9c41ca5f
Merge branch 'master' into cmake-use-internal-libs
2018-11-21 20:05:08 -05:00
Monster Iestyn
224c0fccdb
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
cfaa017e7d
stray #if to #ifdef
2018-11-19 20:52:01 -05:00
Alam Ed Arias
f81d01edca
Merge branch 'vc-xpm-fix' into 'master'
...
Remove unnecessary SDLCALL from IMG_xpm.c declarations
See merge request STJr/SRB2!327
2018-11-14 11:00:20 -05:00
Alam Ed Arias
f73ea4f984
Clean up warnings
2018-11-14 10:52:16 -05:00
Marco Z
8777d5c6c9
Comment context for declaration changes; remove extern terms
2018-11-14 08:15:38 -05:00
Marco Z
51768e7dd1
Remove unnecessary SDLCALL from xpm declarations
2018-11-14 08:06:07 -05:00
Monster Iestyn
f3b59c1731
Fix VC project files to include hw_clip.c/h
2018-11-14 12:11:57 +00:00
Steel Titanium
d0b64222f7
Merge branch 'master' into cmake-use-internal-libs
2018-11-13 19:46:43 -05:00
mazmazz
894ee02f3f
Fix x64 build issue
2018-11-13 17:12:18 -05:00
mazmazz
f2bfed7892
Merge branch 'musicplus-core' into musicplus-sdlmixerx
2018-11-13 14:34:40 -05:00
mazmazz
8f87bf82cd
Merge branch 'master' into musicplus-core
2018-11-13 13:46:30 -05:00
Monster Iestyn
e4f157786c
Merge branch 'public_next'
...
# Conflicts:
# src/Makefile
# src/doomtype.h
# src/hardware/hw_clip.c
# src/hardware/hw_main.c
# src/sdl12/sdl_sound.c
2018-11-10 19:18:34 +00:00
Monster Iestyn
51df32dd3d
Merge branch 'gcc-compiling-cleanup' into 'master'
...
Compiling cleanup and fixes
See merge request STJr/SRB2!311
2018-11-10 13:56:17 -05:00
Monster Iestyn
268bde3fdf
Merge branch 'public_next'
...
# Conflicts:
# src/d_netcmd.c
# src/d_netcmd.h
# src/dehacked.c
# src/g_game.h
# src/hardware/hw_draw.c
# src/hardware/hw_main.c
# src/lua_baselib.c
# src/lua_hook.h
# src/lua_hooklib.c
# src/lua_hudlib.c
# src/lua_libs.h
# src/lua_maplib.c
# src/lua_script.c
# src/m_misc.h
# src/p_mobj.c
# src/s_sound.c
# src/sdl12/mixer_sound.c
# src/w_wad.c
2018-11-10 15:41:57 +00:00
Monster Iestyn
0bdbdd1b1e
Remove FUNCMATH from functions with a void return value or args, or examine variables other than their args (which could be modified)
2018-11-08 16:26:55 +00:00
Steel Titanium
5a0cfc10f4
Update copyright info on some files
2018-11-01 14:47:19 -04:00
Steel Titanium
0f9611df76
Merge remote-tracking branch 'upstream/master' into cmake-use-internal-libs
2018-10-30 21:06:06 -04:00
Monster Iestyn
b5c4b476a6
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
a288b95458
Merge remote-tracking branch 'public-gitlab/master' into public-music-cleanup
2018-10-19 22:04:26 -04:00
Monster Iestyn
d4e11762fa
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
6184f91dd3
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
291ebf302c
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
Sryder
497314fdc4
Tiny fix so that joystick2 being closed can let the JoystickSubSystem close before game close.
...
No memory leak here, just a very tiny thing I noticed.
2018-10-09 19:43:18 +01:00
Monster Iestyn
1115f41f8e
Merge branch 'zlib-split' into 'master'
...
Makefile: Split zlib and libpng
See merge request STJr/SRB2!285
2018-10-08 07:20:27 -04:00
Steel Titanium
232a7ae7b7
Change order of the ifdef
2018-10-07 14:52:25 -04:00
Steel Titanium
def090c9f0
Move the ifdef
2018-10-07 14:45:03 -04:00
Sryder
fb6c329870
Fix the crashing bug hopefully
...
A value of 1 in freesrc for Mix_LoadWAV_RW and Mix_LoadMus_RW calls SDL_RWclose on the RWops anyway.
For Mix_LoadWAV_RW the RWops is freed right after the data is loaded (because it makes a copy of the data in memory)
For Mix_LoadMUS_RW the RWops is freed when Mix_FreeMusic is called (because the data is not a copy)
So setting 1 on freesrc doesn't actually free the RWops immediately on Mix_LoadMus_RW *unless* it failed to load any music.
2018-10-07 10:37:45 +01:00
Sryder
02597e0bf9
Fix compiler warnings.
2018-10-07 09:26:18 +01:00
Sryder
d072dd2725
I think that should be NULL, not 0 actually.
2018-10-07 00:22:23 +01:00
Sryder
7b417b573c
Mix_QuickLoad_RAW sets a flag in the Mix_Chunk so that Mix_FreeChunk doesn't actually Free the sound.
...
Checks for the flag when freeing, and if it's 0, we free the data manually after Mix_FreeChunk.
I went back to Z_Malloc and Z_Free for this because they still work after this.
2018-10-07 00:15:42 +01:00
Sryder
725a65c1f7
Call SDL_RWclose after an SDL_RWFromMem call to close the RWops.
2018-10-07 00:15:11 +01:00
Steel Titanium
49cb1ffe9f
Restore deleted endif
2018-10-04 22:38:59 -04:00
Steel Titanium
79f5f4885c
Split zlib and libpng
2018-10-04 19:47:19 -04:00
Steel Titanium
f88708bb75
Fix the weird indentation
2018-09-21 12:05:52 -04:00
Steel Titanium
68ec811909
Rearrange the code.
...
Thanks again MonsterIestyn!
2018-09-21 11:26:08 -04:00
Steel
af58ba9ae3
Remove this that somehow slipped in.
2018-09-21 07:21:49 -04:00
Steel
be74b4e58b
Fix up errors with buildbots
2018-09-21 07:16:54 -04:00
Steel Titanium
378495cb2b
Add some stuff
2018-09-20 18:33:50 -04:00
Steel Titanium
a53f036149
Use MemAvailable instead
2018-09-20 18:30:46 -04:00
mazmazz
d8addda298
MP Jingle: Add fade timing hack after ending a non-looping song
2018-09-20 18:30:21 -04:00
mazmazz
551237350e
MP Mixer X: Fix double->UINT32 cast (buildbots)
2018-09-20 08:30:31 -04:00
mazmazz
4b4bd638a9
MP libopenmpt: Add doomdef.h header to load_libraries, resolve CONS_Printf (buildbots)
2018-09-20 08:23:29 -04:00
mazmazz
b38f6f6125
MP Libopenmpt: Fix UINT32->double cast (buildbots)
2018-09-20 07:42:35 -04:00
mazmazz
2896b3e3c4
MP Libopenmpt: SDL header in load_libraries
2018-09-20 07:39:53 -04:00
mazmazz
d5b3d74e6f
MP Libopenmpt: Separate loading into sdl/load_libraries.c
2018-09-19 23:18:06 -04:00
mazmazz
6f1a5cbfc9
Merge branch 'musicplus-core' into musicplus-sdlmixerx
2018-09-19 20:06:56 -04:00
mazmazz
37addc02e6
MP Core Mixer: Old-style function dec fixes (buildbots)
2018-09-19 19:41:38 -04:00
mazmazz
de47ab63f2
MP Core Mixer fade: Use fixed instead of double calc (fixes buildbots)
2018-09-19 19:40:24 -04:00
mazmazz
7cc0b6cf95
Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt
2018-09-19 19:32:49 -04:00
mazmazz
affbc89602
Merge branch 'public-musicplus-core' into public-musicplus-jingle
2018-09-19 19:24:57 -04:00
mazmazz
96fa8996db
MP Core Mixer fade: Use fixed instead of double calc (fixes buildbots)
2018-09-19 19:18:35 -04:00
mazmazz
ade637798b
MP Core Mixer: Old-style function dec fixes (buildbots)
2018-09-19 19:06:24 -04:00
mazmazz
af89cf92e2
Merge branch 'public-musicplus-core' into public-musicplus-jingle
2018-09-19 18:55:00 -04:00
mazmazz
86f3fadd5e
Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt
2018-09-19 18:54:58 -04:00
mazmazz
3e9b253438
Merge branch 'musicplus-core' into musicplus-sdlmixerx
2018-09-19 18:53:41 -04:00
mazmazz
494c5290cf
MP Core Mixer: Unused param fixes (buildbots)
2018-09-19 18:26:59 -04:00
mazmazz
974b1d340a
MP Core Mixer: Unused param fixes (buildbots)
2018-09-19 18:26:33 -04:00
mazmazz
26749d275c
Merge branch 'public-musicplus-core' into public-musicplus-libopenmpt
2018-09-18 22:24:44 -04:00
mazmazz
00bbb60e69
Mixer: Add back var_cleanup in I_LoadSong
...
Because musicplus-libopenmpt deleted it, I added a cautionary note to ALWAYS clean up your vars!
2018-09-18 22:24:07 -04:00
mazmazz
f99b6a89ed
Mixer: Add back var_cleanup in I_LoadSong
...
Because musicplus-libopenmpt deleted it, I added a cautionary note to ALWAYS clean up your vars!
2018-09-18 22:15:53 -04:00
