TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-03-25 07:09:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'development' into defineconsolemethod

Browse source 
Conflicts:
	Engine/source/materials/materialDefinition.cpp
This commit is contained in:
Daniel Buckmaster 2014-12-26 13:22:16 +11:00
commit ae284a89ec
129 changed files with 3742 additions and 1038 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Engine/source/core/ogg/oggVorbisDecoder.cpp
View file

@ -174,7 +174,7 @@ U32 OggVorbisDecoder::read( RawData** buffer, U32 num )
S32 val = S32( pcmData[ c ][ n ] * 32767.f );
if( val > 32767 )
val = 32767;
else if( val < -34768 )
else if( val < -32768 )
val = -32768;
*samplePtr = val;