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 |
|
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 |
|
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 |
|
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 |
|
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
|
26bdbf77f3
|
Merge branch 'master' into occlusionquery
|
2012-03-30 14:49:06 +02:00 |
|
scrawl
|
d47a5b5512
|
Merge branch 'terrain18' into occlusionquery
|
2012-03-30 14:39:44 +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 |
|
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 |
|
scrawl
|
79c2a2e465
|
implemented toggleWater (twa); formatting again
|
2012-03-29 18:33:08 +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
|
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
|
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 |
|
scrawl
|
42c5d515e6
|
fixed interior water level
|
2012-03-29 04:50:40 +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 |
|
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
|
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 |
|