scrawl
f497813043
formatting, added Water::setHeight
2012-03-29 15:49:24 +02:00
scrawl
39b3afb98f
use camera height instead of player height for underwater check
2012-03-29 05:03:34 +02:00
scrawl
42c5d515e6
fixed interior water level
2012-03-29 04:50:40 +02:00
scrawl
e6303fc3f4
Merge branch 'master' into water
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.hpp
2012-03-28 21:37:20 +02:00
Marc Zinnschlag
f2075c7f4f
temporarily silence warnigns in OGRE headers
2012-03-28 21:40:06 +02:00
scrawl
8bbb02a1bd
ogre 1.8 fixes
2012-03-28 21:30:59 +02:00
Marc Zinnschlag
34d9ad0cbd
Merge remote branch 'chris/sound' into next
2012-03-28 18:14:35 +02:00
Marc Zinnschlag
2b2eb34f8f
Merge remote branch 'corristo/master' into next
2012-03-28 18:07:21 +02:00
Chris Robinson
bedf56a237
Merge remote branch 'zini/next' into sound
2012-03-28 06:27:34 -07:00
Chris Robinson
be337ef7cc
Return SoundPtr objects from playSound[3D]
...
Note that each Sound object currently contains "precious" resources even after
the sound is stopped. The reference should be reliquished as soon as it's no
longer needed (the SoundManager will make sure the sound continues to play
until it's finished).
2012-03-28 06:08:25 -07:00
Chris Robinson
293f33914e
Use a deque fpr OpenAL's free sources
2012-03-28 05:35:51 -07:00
Chris Robinson
a3291ef360
Add a sound method to update the volume
2012-03-28 05:19:35 -07:00
Chris Robinson
7008bd2fe1
Store some sound properties in the Sound class
2012-03-28 04:58:47 -07:00
Chris Robinson
c072babd17
Better handle bad OpenAL source counts
2012-03-28 04:56:40 -07:00
Chris Robinson
089c340935
Switch the map so the SoundPtr is used as a key
2012-03-28 04:37:00 -07:00
Nikolay Kasyanov
66b31d3d43
Bug #229 (Fixed): On OS X Launcher cannot launch game if path to binary contains spaces
2012-03-28 12:04:42 +04:00
Marc Zinnschlag
6c8be7205a
build fix
2012-03-27 20:13:48 +02:00
Marc Zinnschlag
a996cfed71
Merge remote branch 'ace/win-fixes' into next
2012-03-27 20:11:46 +02:00
Chris Robinson
c6c06f1140
Return SoundPtr objects from the playSound and streamSound methods
2012-03-27 05:59:09 -07:00
Chris Robinson
f0db2ab82f
Split stopSound3D into separate functions to deal with stopping all sounds on an object
2012-03-27 03:20:50 -07:00
Chris Robinson
033faba9c4
Make a function parameter const
2012-03-27 03:00:04 -07:00
Chris Robinson
c2611d035c
Use a pair to match the MWWorld::Ptr object and sound ID, instead of nested maps
2012-03-27 02:50:45 -07:00
Marc Zinnschlag
9863195f09
Merge remote branch 'lgro/valgrind' into next
2012-03-27 11:14:09 +02:00
Marc Zinnschlag
e56731d25e
Merge remote branch 'scrawl/deletefix' into next
2012-03-27 11:10:15 +02:00
Alexander "Ace" Olofsson
55f1053b4f
Windows fixes for compiling and linking
2012-03-27 00:36:53 +02:00
Lukasz Gromanowski
be94da1527
Issue #225 : Initialize class members in constructor.
2012-03-27 00:34:06 +02:00
Lukasz Gromanowski
6d6ed909bf
Issue #225 : Deallocate memory used by actors animations.
2012-03-27 00:31:15 +02:00
scrawl
bf421d2873
use vector instead of array
2012-03-27 00:18:09 +02:00
Lukasz Gromanowski
f8afc22f04
Issue #225 : Corrected wrong delete operator introduced by one of previous commit.
2012-03-26 23:16:59 +02:00
Nikolay Kasyanov
362e6cb9ed
Removed predefined SDK path. Found that it's generally not good idea to force it. Also -Wno-unused-but-set-parameter only set for gcc 4.6 or newer
2012-03-26 23:21:51 +04:00
Marc Zinnschlag
2362d0a029
possible EOL problem
2012-03-26 20:40:04 +02:00
scrawl
28dfba55e0
delete fix
2012-03-26 20:29:07 +02:00
Lukasz Gromanowski
2b9845a5b6
Issue #225 : Free memory allocated for sending into HardwareVertexBuffer.
...
Free memory allocated for sending into HardwareVertexBuffer in NIFLoader class.
2012-03-26 19:09:55 +02:00
Lukasz Gromanowski
5185a28b60
Issue #225 : Initialize all class members in constructor.
2012-03-26 19:09:55 +02:00
Lukasz Gromanowski
d3b88b9e34
Issue #225 : Added cleanup of allocated memory in BulletNifLoader and BulletShapeLoader.
2012-03-26 19:09:55 +02:00
Lukasz Gromanowski
a7ac0e526e
Issue #225 : Added cleanup of parts of PhysicEngine.
...
Added cleanup of CMotionState inserted to RigidBody,
and btSortedOverlappingPairCache inserted to btDbvtBroadphase
in PhysicEngine.
2012-03-26 19:09:55 +02:00
Lukasz Gromanowski
633e80cded
Issue #225 : Added cleanup of maps used in PhysicEngine.
2012-03-26 19:09:55 +02:00
Chris Robinson
0d552c10bc
Use an empty MWWorld::Ptr object for non-3D sounds
2012-03-26 04:10:47 -07:00
Chris Robinson
7b3ecc290e
Fix compilation with older OpenAL headers
2012-03-26 01:12:06 -07:00
Chris Robinson
f8f749dbec
Merge remote branch 'zini/next' into sound-rewrite
2012-03-26 00:02:21 -07:00
Marc Zinnschlag
d993766ee1
Merge remote branch 'pvdk/garamond' into next
2012-03-25 11:05:41 +02:00
Chris Robinson
3e98e28059
Use a better method to get a more even randomization
2012-03-24 21:05:03 -07:00
Chris Robinson
2bc81a778b
Merge remote branch 'zini/next' into sound-rewrite
2012-03-24 17:27:10 -07:00
scrawl
f959a5cbeb
auto adjust size of map window title bar
2012-03-24 23:24:19 +01:00
Nikolay Kasyanov
8e76451cda
Fix launcher style installation on OS X again
2012-03-25 02:00:49 +04:00
Pieter van der Kloet
426c278505
Changed the OpenMW default font from Comic sans to EB Garamond
2012-03-24 22:02:55 +01:00
Pieter van der Kloet
155cd76f37
Changed Launcher font to EB Garamond and added license info
2012-03-24 20:43:35 +01:00
Marc Zinnschlag
4a2ade2372
Merge remote branch 'kromgart/master' into next
2012-03-24 16:57:06 +01:00
Chris Robinson
71d3f9bd51
Get the object reference's position once when updating its sounds
2012-03-24 08:12:04 -07:00
Chris Robinson
5cb90ab704
Add some dummy copy constructors and assignment operators to prevent implicit versions from being used
2012-03-24 03:49:03 -07:00
