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
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
scrawl
b0b41a9199
should now compile warning free
2012-03-21 13:48:57 +01:00
scrawl
97ab48993e
more deprecated fixes
2012-03-21 13:32:32 +01:00
scrawl
deeb21a131
switched to the new multi-delegates system
2012-03-21 13:27:08 +01:00
Marc Zinnschlag
3dcfcf46cb
Issue #217 : container change tracking
2012-03-21 12:48:05 +01:00
Marc Zinnschlag
a0ee2954bd
Issue #217 : moved some functino implementations from ptr.hpp to ptr.cpp
2012-03-21 12:29:07 +01:00
Marc Zinnschlag
0adbe258fd
Issue #217 : made Ptr track container; fixed a cmake script bug
2012-03-21 12:20:19 +01:00
Chris Robinson
7b22ee6fd1
Use for_each to clear the ffmpeg stream packets
2012-03-20 21:46:12 -07:00
Chris Robinson
2989a1e06e
Improve ffmpeg failure messages
2012-03-20 18:57:11 -07:00
Chris Robinson
26a441f29a
Add a readAll method to the sound decoder, for potentially more efficient reading
2012-03-20 17:57:28 -07:00
Chris Robinson
deb473b9ae
Implement the ffmpeg decoder
2012-03-20 17:05:19 -07:00
Chris Robinson
9a48002025
Fix compilation of the FFmpeg decoder
2012-03-20 14:13:58 -07:00
Chris Robinson
e48745b68e
Fix streamMusic's path lookup
2012-03-20 12:39:49 -07:00
scrawl
d451d7bb67
compile fixes for mygui 3.2
2012-03-20 20:24:36 +01:00
scrawl
66baf9ec81
Merge branch 'master' into mygui
2012-03-20 20:02:30 +01:00
Chris Robinson
fc27d5cc19
Restore music playback
2012-03-20 11:31:13 -07:00
Chris Robinson
5ae47f783e
Use the sound manager's update to make sure music is still playing
2012-03-20 10:46:10 -07:00
Chris Robinson
0261aac518
Use Ogre's resource group manager to handle sound files
2012-03-20 10:34:36 -07:00
Chris Robinson
80dbf82a74
Explicitly stop sounds instead of relying on their deletion to do it
2012-03-20 07:22:17 -07:00
Chris Robinson
74e79bb4af
Merge remote branch 'zini/master' into sound-rewrite
...
Conflicts:
apps/openmw/mwsound/soundmanager.cpp
apps/openmw/mwsound/soundmanager.hpp
2012-03-20 06:17:02 -07:00
Marc Zinnschlag
1023ddd587
silenced some warnings
2012-03-20 10:30:21 +01:00
Marc Zinnschlag
4d0d941c2e
Merge remote branch 'kromgart/master'
2012-03-20 10:17:35 +01:00
Marc Zinnschlag
2d135d81e7
Merge remote branch 'lgro/glibc_pthreads_fix'
2012-03-20 10:15:47 +01:00
Marc Zinnschlag
6a0474a977
removed some cout spam
2012-03-20 10:15:22 +01:00
Marc Zinnschlag
aca274cbca
Merge remote branch 'gus/DialogueSystem'
2012-03-20 10:11:40 +01:00
scrawl
04c6f23a2b
disabled solstheim weather (we can't travel there anyway)
...
also, there was a bug that could cause this weather to show up on
morrowind, which is fixed now
2012-03-19 22:54:04 +01:00
Chris Robinson
fd37a4827c
Enforce a 15MB limit on the sound buffer cache
2012-03-19 13:19:22 -07:00
