scrawl
4e63f89829
silence an error regarding faced handle
2012-04-01 13:09:30 +02:00
Marc Zinnschlag
8aa4001937
compile fix
2012-04-01 10:34:51 +02:00
Marc Zinnschlag
38066d9ecb
Merge remote branch 'swick/initocfg'
2012-04-01 10:26:26 +02:00
Chris Robinson
9c06bfc8fc
Merge remote branch 'zini/master' into sound
2012-03-31 14:26:21 -07:00
Sebastian Wick
a2a7539fd5
fix for more than 10 game files; delete both master and plugin settings if called with --game-files
2012-03-31 23:15:33 +02:00
Sebastian Wick
1d596d6c72
use std::map<std::string, std::vector<std::string> > instead of std::map<std::string, std::string>
2012-03-31 22:48:50 +02:00
Marc Zinnschlag
40310f3663
Merge remote branch 'scrawl/occlusionquery'
2012-03-31 22:09:47 +02:00
Marc Zinnschlag
b5b40e2623
Merge remote branch 'lgro/master'
2012-03-31 21:45:15 +02:00
Lukasz Gromanowski
bdc4c79b4e
Fix for segfault when doing 'coc "seyda neen"'.
...
This is a fix for segfault:
==8683== Process terminating with default action of signal 11 (SIGSEGV)
==8683== Access not within mapped region at address 0x0
==8683== at 0x59DFE4: MWRender::Animation::handleShapes(std::vector<Nif::NiTriShapeCopy, std::allocator<Nif::NiTriShapeCopy> >*, Ogre::Entity*, Ogre::SkeletonInstance*) (animation.cpp:503)
==8683== by 0x5A4ECE: MWRender::Actors::update(float) (actors.cpp:134)
==8683== by 0x5937A9: MWRender::RenderingManager::update(float) (renderingmanager.cpp:168)
==8683== by 0x629AD6: MWWorld::World::update(float) (world.cpp:705)
==8683== by 0x68B022: OMW::Engine::frameRenderingQueued(Ogre::FrameEvent const&) (engine.cpp:157)
==8683== by 0x51F9574: Ogre::Root::_fireFrameRenderingQueued(Ogre::FrameEvent&) (in /usr/lib/libOgreMain.so.1.8.0)
==8683== by 0x51F964F: Ogre::Root::_fireFrameRenderingQueued() (in /usr/lib/libOgreMain.so.1.8.0)
==8683== by 0x51F9681: Ogre::Root::_updateAllRenderTargets() (in /usr/lib/libOgreMain.so.1.8.0)
==8683== by 0x51F98CF: Ogre::Root::renderOneFrame() (in /usr/lib/libOgreMain.so.1.8.0)
==8683== by 0x51F990C: Ogre::Root::startRendering() (in /usr/lib/libOgreMain.so.1.8.0)
==8683== by 0x68A669: OMW::Engine::go() (engine.cpp:408)
==8683== by 0x51CECB: main (main.cpp:254)
==8683== If you believe this happened as a result of a stack
==8683== overflow in your program's main thread (unlikely but
==8683== possible), you can try to increase the size of the
==8683== main thread stack using the --main-stacksize= flag.
==8683== The main thread stack size used in this run was 8388608.
when doing 'coc "seyda neen"' when animations are enabled
(Animation::animate member variable is set to 1).
2012-03-31 21:34:40 +02:00
Marc Zinnschlag
89fb3146ab
Merge remote branch 'ace/win-fix'
2012-03-31 21:31:16 +02:00
Marc Zinnschlag
ca4ad74151
more cleanup
2012-03-31 21:29:46 +02:00
Sebastian Wick
6d875dfd54
handle master/plugin properly
2012-03-31 21:06:48 +02:00
Alexander "Ace" Olofsson
64f792c01d
Fix a value defined at the wrong place
2012-03-31 21:05:33 +02:00
Alexander "Ace" Olofsson
4ef921c43f
Prevent internal classes from being marked dllimport
2012-03-31 20:50:22 +02:00
scrawl
13efe68fc3
disabled some debug output
2012-03-31 20:28:07 +02:00
scrawl
cfb194f1d1
fix 6
2012-03-31 20:18:20 +02:00
scrawl
5f78f6c723
change queue
2012-03-31 20:10:34 +02:00
scrawl
b018d00fd3
fix 5
2012-03-31 20:05:23 +02:00
Chris Robinson
e8e8d3fb1b
Fully reset the music before starting the next track
2012-03-31 10:59:29 -07:00
Eli2
3cc81d74bc
Cleanup, replaced if with switch
2012-03-31 19:50:21 +02:00
Chris Robinson
3a57746ee4
Remove an unneeded volume special-case
2012-03-31 10:43:55 -07:00
Chris Robinson
4944a29b21
Keep track of the sound pitch
2012-03-31 10:41:12 -07:00
scrawl
c9067249dd
fix 4
2012-03-31 19:16:14 +02:00
scrawl
c08a2b2942
fix 3
2012-03-31 19:12:02 +02:00
scrawl
909abb480d
fix 2
2012-03-31 19:09:36 +02:00
scrawl
f8d45eae52
fix #1
2012-03-31 19:08:05 +02:00
Chris Robinson
cbf6c0404a
Implement a basic underwater sound environment
2012-03-31 10:06:12 -07:00
Sebastian Wick
092de45924
std::map to std::multimap
2012-03-31 18:28:48 +02:00
Sebastian Wick
653fbdd10c
master/plugin support; needs multimap instead of map
2012-03-31 18:24:43 +02:00
Chris Robinson
575474ff69
Pass the mode flags to the sound output play methods
2012-03-31 08:14:39 -07:00
Sebastian Wick
ceedae4a1a
technical corrections
2012-03-31 16:54:53 +02: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
Sebastian Wick
b7635b3d4a
pass maps by reference
2012-03-31 14:34:00 +02:00
Sebastian Wick
e35670c6cb
ignore syntax errors and empty lines; fixed merge function
2012-03-31 14:28:19 +02:00
Nikolay Kasyanov
5e829362cb
Feature #37 (In Progress) Render Path Grid
...
more similar to vanilla path grid rendering
2012-03-31 16:22:55 +04:00
Nikolay Kasyanov
006e1cde85
some updates after terrain merge
2012-03-31 14:56:54 +04:00
Nikolay Kasyanov
523648dbb1
Merge branch 'master' into pgrd-rendering
...
Conflicts:
apps/openmw/mwrender/debugging.cpp
2012-03-31 14:56:18 +04: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
Nikolay Kasyanov
057c2f2e2a
Merge branch 'master' into pgrd-rendering
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
2012-03-31 13:42:13 +04:00
Marc Zinnschlag
509650d5f3
Merge remote branch 'ace/fs-fix'
2012-03-31 11:37:18 +02:00
Marc Zinnschlag
6eb3281c4c
boost fix
2012-03-31 11:36:51 +02:00
Chris Robinson
28378c063b
Minor OpenAL_SoundStream cleanups
2012-03-31 02:22:23 -07:00
Marc Zinnschlag
222f0e20bc
Merge remote branch 'swick/initocfg' into initcfg
2012-03-31 11:20:05 +02: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
Sebastian Wick
849c3a9bec
add the section to the ini-keys
2012-03-30 23:12:52 +02:00
Sebastian Wick
c160bc7080
works, sort of
2012-03-30 22:58:54 +02:00
Sebastian Wick
fbd626baf6
mwiniimporter
2012-03-30 20:59:44 +02: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
scrawl
fc5cd703bb
maps are now rendered with correct rotation, however for interiors the arrow is wrong
2012-03-30 16:34:36 +02: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
scrawl
521b9eec6c
Merge branch 'master' into minimap
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
apps/openmw/mwworld/world.cpp
2012-03-30 15:31:07 +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
scrawl
30d27fa83f
Merge branch 'master' into occlusionquery
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.hpp
2012-03-30 15:00:04 +02:00
scrawl
26bdbf77f3
Merge branch 'master' into occlusionquery
2012-03-30 14:49:06 +02:00
Alexander "Ace" Olofsson
4a9a416d46
Can find files even if no .bsa file exists now
2012-03-30 14:45:32 +02:00
scrawl
4a6d034591
Merge branch 'master' into occlusionquery
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/renderingmanager.hpp
components/esm_store/cell_store.hpp
2012-03-30 14:39:42 +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
b21a6291f7
Merge branch 'master' into pgrd-rendering
...
Conflicts:
apps/openmw/mwrender/renderingmanager.hpp
apps/openmw/mwscript/docs/vmformat.txt
apps/openmw/mwscript/miscextensions.cpp
apps/openmw/mwworld/world.hpp
2012-03-30 02:50:30 +04:00
Nikolay Kasyanov
aab79599a9
Merge branch 'openal' into pgrd-rendering
2012-03-30 02:43:40 +04: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
8d224f009f
toggleFogOfWar script command
2012-03-29 19:45:19 +02:00
scrawl
0c2317ce9d
player arrow works again
2012-03-29 19:20:09 +02:00
scrawl
79c2a2e465
implemented toggleWater (twa); formatting again
2012-03-29 18:33:08 +02:00
scrawl
01ecf3e0be
attempt at rotation (BROKEN)
2012-03-29 18:16:11 +02:00
scrawl
35f40b99ad
remove the bounding box hack, not needed because calculation is correct now
2012-03-29 18:10:01 +02:00
scrawl
0332a8df96
Merge branch 'renderingdistance' into minimap
2012-03-29 18:09:24 +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
b2bdf0ebf3
Merge branch 'master' into minimap
2012-03-29 17:08:32 +02:00
scrawl
37e6db69d8
fix
2012-03-29 17:07:59 +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
