Marc Zinnschlag
|
ca4ad74151
|
more cleanup
|
2012-03-31 21:29:46 +02:00 |
|
Eli2
|
3cc81d74bc
|
Cleanup, replaced if with switch
|
2012-03-31 19:50:21 +02:00 |
|
Chris Robinson
|
575474ff69
|
Pass the mode flags to the sound output play methods
|
2012-03-31 08:14:39 -07:00 |
|
Chris Robinson
|
b2d7dca8c3
|
Merge remote branch 'zini/master' into sound
|
2012-03-31 07:46:56 -07:00 |
|
Chris Robinson
|
977e7ac9a3
|
Remove the Play_Single flag. It's not correct.
|
2012-03-31 07:41:26 -07:00 |
|
Chris Robinson
|
ae308b9b5f
|
Use a set of flags instead of separate booleans
|
2012-03-31 07:31:55 -07:00 |
|
Chris Robinson
|
e48d125a84
|
Only allow one instance of a given tracked soundid
The untracked flag should probably be broken up and combined with the loop
boolean into a set of flags.
|
2012-03-31 05:57:03 -07:00 |
|
Chris Robinson
|
bfac946878
|
Finally "fix" --nosound
Expect degraded performance with it. Looping sounds are constantly checked to
see if they're playing, and try to play it again when it's not.
|
2012-03-31 03:31:41 -07:00 |
|
Chris Robinson
|
7541e08909
|
Don't reset the sound Output device if init fails
|
2012-03-31 02:48:14 -07:00 |
|
Marc Zinnschlag
|
509650d5f3
|
Merge remote branch 'ace/fs-fix'
|
2012-03-31 11:37:18 +02:00 |
|
Chris Robinson
|
28378c063b
|
Minor OpenAL_SoundStream cleanups
|
2012-03-31 02:22:23 -07:00 |
|
Chris Robinson
|
4e908aa095
|
Add a method to set the sound's position
|
2012-03-31 01:34:26 -07:00 |
|
Chris Robinson
|
b01289128b
|
Split OpenAL_Sound into separate classes for 2D and 3D sounds
|
2012-03-31 01:15:27 -07:00 |
|
Chris Robinson
|
5adeee20fd
|
Mute sounds that go outside the max distance
|
2012-03-31 00:57:29 -07:00 |
|
Chris Robinson
|
fc167dbc83
|
Pass Ogre Vector3s to playSound3D and updateListener
|
2012-03-30 11:42:11 -07:00 |
|
Chris Robinson
|
fefc8f86ab
|
Remove the unused streamSound3D method
|
2012-03-30 11:11:07 -07:00 |
|
Chris Robinson
|
c33349a774
|
Merge remote branch 'zini/master' into sound
|
2012-03-30 08:36:01 -07:00 |
|
Chris Robinson
|
1ee8b963d0
|
Store the sound listener position as well
|
2012-03-30 07:30:17 -07:00 |
|
Chris Robinson
|
fad27d99e6
|
Update the actual sound volume with the position
|
2012-03-30 07:10:34 -07:00 |
|
scrawl
|
a4576f043d
|
fixed the physics debug rendering now activates/deactivates properly
|
2012-03-30 16:02:41 +02:00 |
|
Chris Robinson
|
479df78ea1
|
Update the actual sound position after the listener
|
2012-03-30 07:01:37 -07:00 |
|
Marc Zinnschlag
|
8d7bf34348
|
Merge branch 'terrain'
|
2012-03-30 15:52:27 +02:00 |
|
Marc Zinnschlag
|
557e97bab4
|
fixed a terrain-related Redemption crash
|
2012-03-30 15:52:09 +02:00 |
|
Chris Robinson
|
71d9d7e943
|
Store the current sound position with the Sound object
|
2012-03-30 06:41:06 -07:00 |
|
Marc Zinnschlag
|
46279a001b
|
Merge remote branch 'scrawl/dialogue'
|
2012-03-30 15:39:56 +02:00 |
|
Marc Zinnschlag
|
2d2af4b28a
|
Merge remote branch 'scrawl/terrain18' into terrain
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.hpp
components/esm_store/cell_store.hpp
|
2012-03-30 15:38:14 +02:00 |
|
Chris Robinson
|
de102cd274
|
Simplify broken OpenAL workaround
|
2012-03-30 06:28:40 -07:00 |
|
Chris Robinson
|
33a63d88a5
|
Merge remote branch 'zini/master' into sound
|
2012-03-30 06:22:19 -07:00 |
|
Alexander "Ace" Olofsson
|
4a9a416d46
|
Can find files even if no .bsa file exists now
|
2012-03-30 14:45:32 +02:00 |
|
scrawl
|
4bbedeb3e7
|
made all dialogs semi transparent (like in morrowind)
|
2012-03-30 14:01:43 +02:00 |
|
scrawl
|
d3f31c3498
|
dialogue window enhancements
|
2012-03-30 13:53:35 +02:00 |
|
Marc Zinnschlag
|
a90c3b9f23
|
Merge remote branch 'scrawl/water'
|
2012-03-30 13:07:47 +02:00 |
|
Marc Zinnschlag
|
cc9a874f2b
|
Merge remote branch 'corristo/openal'
|
2012-03-30 10:45:31 +02:00 |
|
scrawl
|
d5c49fa036
|
getWaterLevel use CellStore ; attempted fix for morrowind without tribunal
|
2012-03-30 10:12:28 +02:00 |
|
Chris Robinson
|
6a16e33f82
|
Merge remote branch 'zini/master' into sound
|
2012-03-29 21:17:59 -07:00 |
|
Nikolay Kasyanov
|
b6aa8925f4
|
(Temporary) workaround for broken OpenAL implementations that doesn't return meaningful max counts of sources
|
2012-03-30 00:12:38 +04:00 |
|
Marc Zinnschlag
|
647c0e4df3
|
Merge remote branch 'scrawl/renderingdistance'
|
2012-03-29 21:27:25 +02:00 |
|
Marc Zinnschlag
|
eec135c040
|
Merge remote branch 'scrawl/water'
|
2012-03-29 21:20:16 +02:00 |
|
Chris Robinson
|
3d5384e2bb
|
Remove some unneeded casts
|
2012-03-29 11:28:33 -07:00 |
|
scrawl
|
79c2a2e465
|
implemented toggleWater (twa); formatting again
|
2012-03-29 18:33:08 +02:00 |
|
Marc Zinnschlag
|
10b4c1d904
|
silenced a warning
|
2012-03-29 18:04:52 +02:00 |
|
Marc Zinnschlag
|
ea79d9b7c3
|
Merge remote branch 'scrawl/renderingdistance'
|
2012-03-29 18:02:30 +02:00 |
|
scrawl
|
e22ae7c840
|
bounds fix (again)
|
2012-03-29 17:30:13 +02:00 |
|
scrawl
|
19c801f538
|
disabled rendering distance for now
|
2012-03-29 16:56:30 +02:00 |
|
scrawl
|
f45c650975
|
bounds fix
|
2012-03-29 16:47:59 +02:00 |
|
scrawl
|
2f096e131d
|
throw exception if water level is attempted to be modified in exterior
|
2012-03-29 16:23:02 +02:00 |
|
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 |
|
Nikolay Kasyanov
|
0897a2a4cb
|
Merge branch 'master' into openal
|
2012-03-29 13:09:54 +04:00 |
|
scrawl
|
39b3afb98f
|
use camera height instead of player height for underwater check
|
2012-03-29 05:03:34 +02:00 |
|