scrawl
|
4434fb640e
|
Merge branch 'master' into shadersystem
|
2012-07-17 19:12:02 +02:00 |
|
guidoj
|
0549e949ba
|
Mostly removal of unnecessary #include's and a little clean up
|
2012-07-17 09:27:12 +02:00 |
|
scrawl
|
3537af051d
|
removed the old shader helper
|
2012-07-10 00:17:52 +02:00 |
|
scrawl
|
a1e48b0feb
|
builds now
|
2012-07-03 22:48:16 +02:00 |
|
Marc Zinnschlag
|
87667ab57e
|
Issue #107: Ptr related include cleanup
|
2012-07-03 13:55:53 +02:00 |
|
Marc Zinnschlag
|
76174098c7
|
Issue #107: CellStore moved from ESMS to MWWorld
|
2012-06-29 16:48:50 +02:00 |
|
scrawl
|
63ce143a04
|
fix triangle / batch counts with compositors
|
2012-06-22 12:56:04 +02:00 |
|
scrawl
|
69e6bc6588
|
add water settings to settings window
|
2012-05-29 06:45:44 +02:00 |
|
scrawl
|
f6a6684685
|
when the resolution changes, adjust camera aspect ratio and recreate compositors
|
2012-05-27 21:39:18 +02:00 |
|
scrawl
|
656a8f1be9
|
working menu transparency slider
|
2012-05-23 01:32:36 +02:00 |
|
Marc Zinnschlag
|
7938566004
|
Merge remote branch 'scrawl/graphics'
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
|
2012-05-21 11:24:36 +02:00 |
|
scrawl
|
933a40de14
|
better floating object label positioning.
|
2012-05-14 21:37:43 +02:00 |
|
scrawl
|
9cf6f27f96
|
small fix
|
2012-04-29 03:38:00 +02:00 |
|
scrawl
|
11ebae3be2
|
toggleCompositors command useful for debugging
|
2012-04-29 03:33:10 +02:00 |
|
scrawl
|
e443455612
|
Merge branch 'next' of https://github.com/zinnschlag/openmw into graphics
|
2012-04-24 00:54:35 +02:00 |
|
Marc Zinnschlag
|
35f478071e
|
Issue #255: deleted the old environment class and using the new one instead
|
2012-04-23 15:27:03 +02:00 |
|
scrawl
|
c6da3872b4
|
light improvements
|
2012-04-19 20:59:57 +02:00 |
|
scrawl
|
2a4fcf42a3
|
basic shadows
|
2012-04-11 18:53:13 +02:00 |
|
scrawl
|
622fb568cf
|
removed MRT setting and figure it out automatically
|
2012-04-05 19:27:54 +02:00 |
|
scrawl
|
d393f2dd4b
|
Merge branch 'master' into water
|
2012-04-03 14:06:14 +02:00 |
|
scrawl
|
342464530d
|
rotated map working
|
2012-04-02 19:37:24 +02:00 |
|
scrawl
|
b380e71832
|
fixed underwater wireframe mode
|
2012-04-02 14:32:21 +02:00 |
|
Marc Zinnschlag
|
6022d3ab13
|
Merge remote branch 'corristo/pgrd-rendering'
reduced cout spam.
Conflicts:
apps/openmw/mwrender/debugging.cpp
apps/openmw/mwrender/renderingmanager.cpp
components/bsa/bsa_archive.cpp
libs/openengine/bullet/physic.hpp
|
2012-04-02 12:04:47 +02: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
|
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
|
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
|
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 |
|
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 |
|
scrawl
|
79c2a2e465
|
implemented toggleWater (twa); formatting again
|
2012-03-29 18:33:08 +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 |
|
scrawl
|
39b3afb98f
|
use camera height instead of player height for underwater check
|
2012-03-29 05:03:34 +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 |
|
scrawl
|
53d4be5cf6
|
object pickup should work everywhere
|
2012-03-25 20:52:56 +02:00 |
|
scrawl
|
743ea0c9be
|
use hardware occlusion query for sun glare effect
|
2012-03-24 17:59:26 +01:00 |
|
scrawl
|
5fba52c238
|
Merge branch 'terrain18' into occlusionquery
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.hpp
|
2012-03-24 15:14:33 +01:00 |
|
scrawl
|
f2a7acb102
|
Merge branch 'next' into terrain
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.cpp
|
2012-03-24 13:19:17 +01:00 |
|
scrawl
|
f4898539e9
|
added some code that doesn't do anything yet, waiting for ogre 1.8
|
2012-03-24 13:06:01 +01:00 |
|
Jason Hooks
|
51fb9e67cd
|
Merge
|
2012-03-18 21:31:31 -04:00 |
|
scrawl
|
2edd7e59f4
|
some fixes and facilities for saving the fog of war to disk
|
2012-03-14 20:44:06 +01:00 |
|
Nikolay Kasyanov
|
11f957a64d
|
Feature #37 (In Progress) Render Path Grid
cubes for path grid points
strange crash when trying to get path grids from Debugging
|
2012-03-10 20:03:00 +04:00 |
|
scrawl
|
5b38b17baf
|
local map rendering (nothing to see yet, as it is not displayed in GUI)
|
2012-03-10 15:28:18 +01:00 |
|
scrawl
|
f2c3616638
|
Merge branch 'next' into terrain_next
Conflicts:
CMakeLists.txt
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/renderingmanager.hpp
cmake/FindOGRE.cmake
|
2012-02-28 21:49:45 +01:00 |
|
scrawl
|
f79bf1f300
|
fog
|
2012-02-26 13:13:29 +01:00 |
|
scrawl
|
aad8f6605e
|
send a raycast through the physics engine to check if sun is visible
|
2012-02-24 16:12:43 +01:00 |
|
scrawl
|
d9c02ca526
|
- added isCellExterior / isCellQuasiExterior methods to World
- interior now have the sun disabled properly (and ambient managed by cell, not sky)
|
2012-02-23 21:12:06 +01:00 |
|
scrawl
|
90af78e3b8
|
attempt to fix openmw's lighting (restored the sun, set proper ambient value outside)
- the fix should remain in this branch since the main branch still has the lighting by caelum
|
2012-02-23 20:33:34 +01:00 |
|
scrawl
|
41a8b22ebd
|
implemented weather transitions (currently only blends the clouds)
|
2012-02-22 19:17:37 +01:00 |
|
Marc Zinnschlag
|
db205cf8aa
|
Merge remote branch 'scrawl/next' into test
Conflicts:
libs/openengine
|
2012-02-20 14:54:08 +01:00 |
|