Alexander "Ace" Olofsson
0d163d76ab
Replaced some messy code with some differently messy code, this one at least seems to work
2012-03-29 03:59:24 +02:00
Nikolay Kasyanov
20f976ddc7
probably openal initialization fix
2012-03-29 03:02:26 +04:00
Pieter van der Kloet
4488be33ce
Added missing slash to launcher CMakeLists.txt
2012-03-29 00:12:34 +02:00
scrawl
e5a19209a4
remove the timeout stuff
2012-03-29 00:05:48 +02:00
Roman Melnik
ef2f7e841a
Merge branch 'master' of github.com:Kromgart/openmw
2012-03-28 23:08:39 +03:00
scrawl
cb72e812f9
Merge branch 'master' into renderingdistance
2012-03-28 21:47:26 +02:00
Marc Zinnschlag
a0c5ccf974
Merge remote branch 'lgro/valgrind'
2012-03-28 21:46:47 +02:00
scrawl
47c3e92db1
removed the unused ray scene query
2012-03-28 21:42:41 +02:00
Marc Zinnschlag
f2075c7f4f
temporarily silence warnigns in OGRE headers
2012-03-28 21:40:06 +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
Lukasz Gromanowski
f86d53636d
Issue #225 : Correction to commit fa4c4b8
.
...
Correction to commit fa4c4b8
- memeber mChanged should be
set to true, otherwise the map won't display if the game
is started in (0, 0) cell.
2012-03-28 21:36:38 +02:00
scrawl
8bbb02a1bd
ogre 1.8 fixes
2012-03-28 21:30:59 +02:00
scrawl
6bea08157e
Merge branch 'master' into terrain18
2012-03-28 21:30:15 +02:00
scrawl
ecf99f3309
Merge branch 'master' into minimap
2012-03-28 21:29:46 +02:00
scrawl
29acb057b3
Merge branch 'master' into occlusionquery
2012-03-28 21:04:42 +02:00
scrawl
cc7d3af701
Merge branch 'terrain18' into occlusionquery
2012-03-28 21:03:55 +02:00
Marc Zinnschlag
34d9ad0cbd
Merge remote branch 'chris/sound' into next
2012-03-28 18:14:35 +02:00
Marc Zinnschlag
2b2eb34f8f
Merge remote branch 'corristo/master' into next
2012-03-28 18:07:21 +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
Nikolay Kasyanov
66b31d3d43
Bug #229 (Fixed): On OS X Launcher cannot launch game if path to binary contains spaces
2012-03-28 12:04:42 +04:00
scrawl
4249d2c536
add getNorthVector method
2012-03-28 03:15:10 +02:00
scrawl
72ff7ec030
Merge branch 'next' into occlusionquery
...
Conflicts:
apps/openmw/mwrender/sky.cpp
2012-03-27 23:46:48 +02:00
Lukasz Gromanowski
fa4c4b8f21
Issue #225 : Initialize members in class constructor.
2012-03-27 23:07:25 +02:00
scrawl
43b1f896f4
fix object pickup when player is very close to object
2012-03-27 22:36:02 +02:00
scrawl
8f6d10f229
fix uninitalised stuff
2012-03-27 20:59:58 +02:00
scrawl
7900f2ac34
Merge pull request #1 from Yacoby/terrain18
...
Terrain18
2012-03-27 11:27:54 -07:00
Marc Zinnschlag
6c8be7205a
build fix
2012-03-27 20:13:48 +02: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
Jacob Essex
ec21ff21cc
Removed memory leak, allocated more on the stack
2012-03-27 13:58:12 +01:00
scrawl
e398c51f8a
remove unneeded render queue workaround
2012-03-27 13:13:28 +02: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
Jacob Essex
b76b62e5e4
Fixed a crash when there were cells with no data, refactored to remove non mutable data from CellStore
2012-03-27 09:20:22 +01:00
scrawl
bb09c2189a
lower rendering distance for small objects (reduce batch count)
2012-03-27 00:45:25 +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
Lukasz Gromanowski
f8afc22f04
Issue #225 : Corrected wrong delete operator introduced by one of previous commit.
2012-03-26 23:16:59 +02:00
scrawl
18c2b5eb0a
Merge branch 'next' into occlusionquery
2012-03-26 22:09:41 +02:00