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
scrawl
f497813043
formatting, added Water::setHeight
2012-03-29 15:49:24 +02:00
Nikolay Kasyanov
c3357c4396
Merge branch 'master' into pgrd-rendering
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/renderingmanager.hpp
apps/openmw/mwscript/docs/vmformat.txt
2012-03-29 13:27:13 +04: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
Nikolay Kasyanov
20f976ddc7
probably openal initialization fix
2012-03-29 03:02:26 +04:00
scrawl
e5a19209a4
remove the timeout stuff
2012-03-29 00:05:48 +02: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
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
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
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
