Christoph Oelckers
e691341541
Merge branch 'master' of https://github.com/rheit/zdoom
2014-07-09 09:16:30 +02:00
Christoph Oelckers
e1729a9ec2
- fixed compilation with VC++2005 solution.
...
hu_stuff.h defined some callbacks for qsort without STACK_ARGS which causes problems with this solution's Release setting which uses __fastcall calling convention.
2014-07-09 09:15:51 +02:00
Chris Robinson
1aaaac900d
Merge remote-tracking branch 'zdoom/master' into openal
2014-07-01 22:14:49 -07:00
Edoardo Prezioso
d83f048858
- Miscellaneous CMakeLists.txt fixes.
...
- fixed a CMake warning about uninitialized use of the variable CROSS_EXPORTS in the tools subfolder when CMAKE_CROSSCOMPILING is off;
- fixed a variable typo: CMAKE_CURRENTY_BINARY_DIR instead of CMAKE_CURRENT_BINARY_DIR;
- in src/CMakeLists.txt, fixed a missing merge of a portion of code from maint branch to master.
2014-07-01 19:13:05 +02:00
Christoph Oelckers
dd05e564cf
- this needed more fixes...
2014-06-29 14:32:50 +02:00
Christoph Oelckers
d0e551060d
- fixed: When the 3D floor init code was updated 5 years ago for Vavoom's latest changes to its 3D-floor implementation it accidentally set the 3D-floor's alpha as its desaturation.
2014-06-29 12:50:42 +02:00
Chris Robinson
90fa215da2
Replace another std::vector with a TArray
2014-06-28 23:30:58 -07:00
Chris Robinson
48df515dd1
Merge remote-tracking branch 'zdoom/master' into openal
2014-06-28 23:29:48 -07:00
Christoph Oelckers
7d7f146ce1
- fixed: transferring a translation to a missile needs to check if the missile was spawned successfully.
2014-06-28 15:21:19 +02:00
Chris Robinson
ae95a2d5cf
Fix creating effect map entries
...
TMap apparently doesn't clear the memory for new entries like std::map...
2014-06-28 05:41:11 -07:00
Blzut3
c4bc5f7b97
Merge pull request #78 from alexey-lysiuk/fix_osx_build
...
Fix OS X build
2014-06-28 04:49:37 -04:00
Chris Robinson
6e64545725
Simplify some branching
2014-06-28 01:32:06 -07:00
Chris Robinson
7f3be7bf14
Show the name of unsupported sound formats with OpenAL
2014-06-28 01:25:25 -07:00
alexey.lysiuk
65203760a8
Fix incorrect actor flag handling on big endian platforms
2014-06-28 11:00:08 +03:00
alexey.lysiuk
7b69c60af1
Use correct 'true' keyword
2014-06-28 11:00:01 +03:00
alexey.lysiuk
e6d468eb38
Use byte swapping functions from <libkern/OSByteOrder.h> on OS X
...
Remove inclusion of Core Foundation headers to avoid type conflicts with LZMA SDK.
2014-06-28 10:59:56 +03:00
Chris Robinson
afcada4a3b
Remove an unused field
2014-06-28 00:46:45 -07:00
Chris Robinson
7908116fef
Use a separate function to update an openal stream's volume
2014-06-28 00:37:12 -07:00
Chris Robinson
c73d97af44
Use TArray and TMap instead of std::vector and std::map
2014-06-28 00:33:15 -07:00
Chris Robinson
a630c47e6a
Remove a redundant call
2014-06-27 22:09:03 -07:00
Chris Robinson
d55dfcdb1d
Pass the correct size to LoadSoundVoc
2014-06-27 22:05:11 -07:00
Chris Robinson
6f8545e694
Use a TArray for SoundDecoder::readAll
2014-06-27 21:51:05 -07:00
Chris Robinson
a16f9d061c
Work around a libsndfile bug related to converting float samples to shorts
...
Do the conversion ourselves to ensure it's properly clamped.
2014-06-27 01:29:34 -07:00
Braden Obrzut
d941203ab0
- Fixed edward-san's typo.
...
- Cleared a warning.
2014-06-26 20:37:11 -04:00
Chris Robinson
1a40c95f84
Rename some FMOD references to be generic sound system
...
Since they relates to other sound backends as well, there's no need to single
out FMOD in these places.
2014-06-26 16:58:18 -07:00
Braden Obrzut
19415668ec
Merge branch 'gcc_aggressive_optimization' of github.com:edward-san/zdoom into edward-san-gcc_agressive_optimization
2014-06-26 18:11:32 -04:00
Braden Obrzut
1ae53473ff
Merge branch 'edward-san-cmake_gcc_compatible'
2014-06-26 17:54:48 -04:00
Braden Obrzut
cb9877e7ff
- Using USE_WINDOWS_DWORD on other platforms can cause problems.
2014-06-26 17:52:26 -04:00
Christoph Oelckers
270541f942
fixed compilation with latest LZMA SDK on Windows.
...
LZMA SDK recently added an #include <windows.h> to its headers, meaning it's no longer safe to include its headers globally in platform independent files.
The following changes were necessary:
- rename DWORD type in zipdir.c
- add USE_WINDOWS_DWORD and reorder includes in file_7z.cpp
- wrap LZMA decoder stream into a local struct that's declared anonymously in files.h and adjust files.cpp for this change.
2014-06-26 09:43:51 +02:00
Chris Robinson
0adfdf31dd
Fix calling SetPosition when not playing
2014-06-25 21:50:52 -07:00
Chris Robinson
a6900b48ba
Use AL_SOFT_deferred_updates to sync updates when availeble
2014-06-25 21:48:13 -07:00
Chris Robinson
c6bb52c866
Get the length from sounds when possible
2014-06-25 21:14:35 -07:00
Chris Robinson
fd25ec2a62
Implement GetPosition for OpenAL streams, and display it in the stats
2014-06-25 20:03:24 -07:00
Chris Robinson
d761dd1ff6
Merge remote-tracking branch 'zdoom/master' into openal
2014-06-25 17:37:20 -07:00
Chris Robinson
3d33f565a4
Use a proper, more unique, pointer formatter for the open callback
2014-06-25 17:10:17 -07:00
Edoardo Prezioso
1a3ac9d0b3
- Simplify CMake GCC and Clang checking.
...
Introduce the variable 'ZD_CMAKE_COMPILER_IS_GNUC(XX)_COMPATIBLE' and replace any occurrence of '"${CMAKE_C(XX)_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C(XX)_COMPILER_ID}" STREQUAL "Clang"' with it. This makes it possible to add more GCC compatible compilers in just one place.
2014-06-26 01:23:41 +02:00
Christoph Oelckers
8aff59e704
Merge branch 'language_sdl' of https://github.com/edward-san/zdoom
2014-06-25 22:06:24 +02:00
alexey.lysiuk
0be30c782c
Fix LZMA compilation on GCC with position-independent code (PIC) generation enabled
...
EBX register is used Global Offset Table in PIC
http://www.greyhat.ch/lab/downloads/pic.html
2014-06-25 20:11:05 +03:00
Chris Robinson
7f5b538110
Implement SetPosition for OpenAL streams
2014-06-25 04:59:18 -07:00
Chris Robinson
9c12abeb2d
Better report the amount buffered in an OpenAL stream
2014-06-25 04:53:08 -07:00
Chris Robinson
0017e1e6e8
Use a FileReader to handle music resources and audio decoding
...
Instead of the previous method where there'd be a filename and offset, and/or a
memory pointer, this uses a class to access resource data regardless of its
underlying form.
2014-06-25 04:25:36 -07:00
djcj
bdddea541f
update lzma to v9.22 beta
2014-06-24 11:22:55 +02:00
Edoardo Prezioso
0e3bee6f30
- Enable 'language' feature on unix targets.
...
The sdl version of the function 'SetLanguageIDs' is very limited, comparing to the win32 counterpart, as it will try to accept only the language codes (ie 'enu', 'fr', 'ptb', etc). If a different string is provided, zdoom will default its language to English.
2014-06-23 20:02:40 +02:00
Chris Robinson
075c5d872d
Always use the pitch multiplier when underwater
2014-06-22 22:22:45 -07:00
Chris Robinson
b2f9430fb1
Use the correct diffusion value for reverb
...
I don't know what the Density and Diffusion values correspond to, but
EnvDiffusion is the actual diffusion setting.
2014-06-22 19:38:47 -07:00
Chris Robinson
a434af92ee
Handle sounds marked as 'area sounds'
...
Note, the area radius is 128 units for it to actually do something, unlike FMOD
where it's only 32.
2014-06-22 19:35:09 -07:00
Christoph Oelckers
4f599b7b4d
Merge branch 'master' of https://github.com/binarycrusader/zdoom
2014-06-22 09:00:23 +02:00
Christoph Oelckers
e56e525d0f
- A_FireCustomMissile transfer tranlsation flag, code submission by jpalomo
2014-06-22 08:55:21 +02:00
Shawn Walker
6164807e97
- fix x64 visual studio linking for common controls
2014-06-21 22:49:42 -07:00
Shawn
640a6156e5
Merge pull request #1 from rheit/master
...
Sync with zdoom trunk
2014-06-21 20:38:05 -07:00