scrawl
5fba52c238
Merge branch 'terrain18' into occlusionquery
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.hpp
2012-03-24 15:14:33 +01:00
scrawl
99b2b6b648
ogre 1.8 fixes
2012-03-24 14:46:48 +01:00
scrawl
f2a7acb102
Merge branch 'next' into terrain
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.cpp
2012-03-24 13:19:17 +01:00
scrawl
f4898539e9
added some code that doesn't do anything yet, waiting for ogre 1.8
2012-03-24 13:06:01 +01: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
9076401892
Merge branch 'next' into terrain
...
Conflicts:
CMakeLists.txt
apps/openmw/CMakeLists.txt
2012-03-22 22:31:49 +01:00
scrawl
6067053f08
Merge branch 'next' into water
...
Conflicts:
CMakeLists.txt
2012-03-22 21:41:32 +01:00
scrawl
cf3515a898
it is now possible to drag the minimap with the mouse
2012-03-22 21:27:21 +01:00
scrawl
cc9f20a04f
MW_MapView skin
2012-03-22 20:25:41 +01:00
scrawl
ab9aa1ba74
Merge branch 'next' into minimap
...
Conflicts:
files/mygui/openmw_map_window_layout.xml
2012-03-22 19:36:37 +01:00
Marc Zinnschlag
47bcbdef17
Merge remote branch 'scrawl/mygui' into mygui
2012-03-22 18:46:21 +01:00
scrawl
d1508f5a59
List -> ListBox
2012-03-22 15:28:06 +01:00
scrawl
560e702973
fixed scroll bars
2012-03-22 15:23:23 +01:00
scrawl
26aae9d2ce
fix class name typo
2012-03-22 15:10:29 +01:00
scrawl
161d519206
fixed the dialogue history topic selection
2012-03-22 15:01:37 +01:00
Pieter van der Kloet
73a1b256a8
Changed warning dialog text to be less ambiguous
2012-03-22 12:42:08 +01:00
Pieter van der Kloet
fd4826d06f
Fix for Bug #222 , config is always written to user location now
2012-03-22 12:34:43 +01:00
Marc Zinnschlag
47828f91f0
Issue #217 : added getWeight function to ContainerStore
2012-03-22 09:45:48 +01:00
Chris Robinson
bac6df5563
Avoid leaking an ffmpeg stream
2012-03-21 23:32:24 -07:00
Chris Robinson
15317796bf
Handle the wav -> mp3 extension conversion in the sound output backend
2012-03-21 22:49:40 -07:00
Chris Robinson
f11e3e39a1
Add an enumerate method to the sound output interface
2012-03-21 20:15:01 -07:00
Chris Robinson
366c97c492
Use a separate method to check for finished sounds and update the listener
2012-03-21 19:24:38 -07:00
Chris Robinson
e6fe1c0261
Remove a mostly unneeded wrapper function
2012-03-21 19:08:11 -07:00
Chris Robinson
aecc77a73c
Replace the sound file extension when opening fails
...
This should make it more efficient to lookup a sound instead of checking each
time it's played. A better method would perhaps be to check if the resource
exists when the ESM is loaded and replace it then as needed.
2012-03-21 18:42:48 -07:00
Chris Robinson
8056a7f20b
Throw an exception when looking up a sound instead of returning an empty string
2012-03-21 18:20:32 -07:00
Chris Robinson
9a139f511f
Avoid redefining SOUND_IN
2012-03-21 15:29:05 -07:00
Chris Robinson
56c3b988cc
Avoid copying the region when looking for a sound to play
2012-03-21 15:19:40 -07:00
Chris Robinson
8c5f85ca83
Use a local variable to mark sound streams as finished while processing
...
This avoids a race condition where the source can underrun while the final
buffers are being queued and the sound can be detected as stopped
2012-03-21 14:49:29 -07:00
Chris Robinson
6a85ef1229
Set Ogre's data stream to NULL when closing the audio file
2012-03-21 14:46:29 -07:00
Chris Robinson
0d973ac8ff
Use the vector's data field instead of the address of the first element
...
Same thing really, but less convoluted
2012-03-21 14:38:37 -07:00
Chris Robinson
fd8326e958
Better handle some ffmpeg errors
2012-03-21 12:20:36 -07:00
scrawl
9b31b6272f
fixed the mouse cursors and fixed MWAttribute & MWSkill
2012-03-21 16:07:56 +01:00
scrawl
64212c0ee6
replaced all the StaticImage and StaticText in code
2012-03-21 14:54:02 +01:00
