scrawl
5a19d4ec45
implement water script functions and save water height in CellStore
2012-03-29 15:50:15 +02:00
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
e6303fc3f4
Merge branch 'master' into water
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.hpp
2012-03-28 21:37:20 +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
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
scrawl
28dfba55e0
delete fix
2012-03-26 20:29:07 +02:00
Lukasz Gromanowski
5185a28b60
Issue #225 : Initialize all class members in constructor.
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
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
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
Marc Zinnschlag
9ec1e55aaf
Merge remote branch 'scrawl/minimap' into next
2012-03-24 10:31:42 +01:00
Chris Robinson
fa70a72b75
Remove some unused sound manager fields and constructor parameters
2012-03-24 00:22:54 -07:00
scrawl
a6259a1b0d
bugfixes
2012-03-23 17:37:56 +01:00
scrawl
7a3034701f
functional HUD map
2012-03-23 16:51:56 +01:00
scrawl
a1f80e029e
abstracted some code to be reused for hud
2012-03-23 16:16:31 +01:00
scrawl
789fbb460f
move implementation to .cpp
2012-03-23 15:34:54 +01:00
scrawl
ce63d29d4a
rotate hud player arrow
2012-03-23 15:26:24 +01:00
scrawl
06fa310e29
player arrow rotated correctly
2012-03-23 15:00:48 +01:00
scrawl
b8f962a68d
Merge branch 'next' into shaders
2012-03-23 10:26:20 +01:00
scrawl
770b0f2106
gui changes
2012-03-23 10:25:55 +01:00
scrawl
9c3e1f48f0
player arrow
2012-03-23 09:00:00 +01:00
Chris Robinson
1ccddefe28
Properly report the default device when opening sound fails
2012-03-23 00:31:01 -07:00
scrawl
8e299bd25b
remove unuseful std::cout
2012-03-23 08:16:32 +01:00
scrawl
2dd329938a
automatically zoom in on the player while moving
2012-03-23 08:16:04 +01:00
Chris Robinson
2f0af42261
Use the ALC_ENUMERATE_ALL_EXT extension with OpenAL when available
2012-03-22 23:51:00 -07:00
Chris Robinson
277597c567
Fix DEFAULT_OUTPUT for OpenAL_Output
2012-03-22 18:44:55 -07:00
Chris Robinson
2e28819243
Avoid trying to play an ambient sound if there's no chance for any to play
2012-03-22 18:39:10 -07:00
scrawl
6067053f08
Merge branch 'next' into water
...
Conflicts:
CMakeLists.txt
2012-03-22 21:41:32 +01:00