Marc Zinnschlag
|
c85aaafac2
|
more include cleanup (most removing Ogre.h)
|
2012-07-03 15:32:38 +02:00 |
|
Marc Zinnschlag
|
4c39fefd1e
|
Issue #107: World is accessed only through the interface class from now on; some include cleanup
|
2012-07-03 12:30:50 +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
|
447158e9d6
|
shutdown crash fix
|
2012-06-09 19:15:11 +02:00 |
|
scrawl
|
42e44ac1b5
|
fixed some leaks
|
2012-06-06 21:08:20 +02:00 |
|
scrawl
|
69e6bc6588
|
add water settings to settings window
|
2012-05-29 06:45:44 +02:00 |
|
scrawl
|
5d03e86613
|
added field of view and texture filtering to settings window
|
2012-05-29 04:54:54 +02:00 |
|
scrawl
|
14f4f09f83
|
proper resolution switching (reposition GUI & adjust mouse clipping region)
|
2012-05-28 09:19:25 +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
|
8f2c8bbea4
|
Merge branch 'master' into graphics
|
2012-05-21 09:50:46 +02:00 |
|
scrawl
|
8a0c859c16
|
Merge branch 'iterator' of https://github.com/zinnschlag/openmw into inventoryGUI
|
2012-05-18 22:27:48 +02:00 |
|
scrawl
|
c9aa0ca1f4
|
don't create terrain if there is no land data, also fixes a water disappearing issue and a sound exception if cells with no region
|
2012-05-17 19:54:09 +02:00 |
|
scrawl
|
933a40de14
|
better floating object label positioning.
|
2012-05-14 21:37:43 +02:00 |
|
scrawl
|
11ebae3be2
|
toggleCompositors command useful for debugging
|
2012-04-29 03:33:10 +02:00 |
|
scrawl
|
4ce83badc9
|
flickering lights
|
2012-04-28 20:42:53 +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
|
7400b7f313
|
fix underwater effect staying active when teleporting from underwater to a cell that doesn't have water
|
2012-04-19 23:25:58 +02:00 |
|
scrawl
|
c6da3872b4
|
light improvements
|
2012-04-19 20:59:57 +02:00 |
|
scrawl
|
aa4a1b675f
|
fixed the sky reflection issue
|
2012-04-19 01:08:26 +02:00 |
|
scrawl
|
046ef39c4a
|
use camera-relative rendering to prevent precision artifacts when moving far from (0,0,0)
|
2012-04-18 01:10:00 +02:00 |
|
scrawl
|
13b67faf2f
|
adding more safety checks
|
2012-04-16 20:39:41 +02:00 |
|
scrawl
|
fa5a1432c9
|
map lighting tweak, default settings tweak
|
2012-04-14 15:58:58 +02:00 |
|
scrawl
|
a33ae35e94
|
some fixes
|
2012-04-13 13:28:31 +02:00 |
|
scrawl
|
2a4fcf42a3
|
basic shadows
|
2012-04-11 18:53:13 +02:00 |
|
scrawl
|
1df7be7fee
|
- fixes to texture filtering setting
- add a sensible warning to settings-default.cfg, since there have been some confusions with it
|
2012-04-09 00:10:42 +02:00 |
|
scrawl
|
c0f991ac0a
|
underwater depth effect
|
2012-04-06 18:51:30 +02:00 |
|
scrawl
|
456eb95209
|
reversed sun and moon paths (sunrise at east)
|
2012-04-06 18:22:37 +02:00 |
|
scrawl
|
c169f9e171
|
underwater tweaks
|
2012-04-06 16:11:08 +02:00 |
|
scrawl
|
a41eee9a72
|
specular lighting
|
2012-04-06 14:07:52 +02:00 |
|
scrawl
|
8bfc81f398
|
Merge branch 'master' into water
|
2012-04-05 20:09:38 +02:00 |
|
scrawl
|
622fb568cf
|
removed MRT setting and figure it out automatically
|
2012-04-05 19:27:54 +02:00 |
|
Marc Zinnschlag
|
000cfad82d
|
Merge remote branch 'scrawl/gamesettings'
|
2012-04-05 18:07:47 +02:00 |
|
scrawl
|
1b89a9e203
|
various fixes
|
2012-04-05 15:30:55 +02:00 |
|
scrawl
|
f49131e1b8
|
renamed setting, automatically disable MRT when unsupported
|
2012-04-05 13:09:59 +02:00 |
|
scrawl
|
f6342cfd60
|
fixed viewport background color, fixed indentation of some old functions
|
2012-04-05 11:52:06 +02:00 |
|
scrawl
|
3f05aba76d
|
got MRT working, some minor quirks to solve (black viewport background)
|
2012-04-05 01:21:36 +02:00 |
|
scrawl
|
cc4076d42a
|
basic noise
|
2012-04-03 21:16:43 +02:00 |
|
scrawl
|
052cc47ee9
|
fixed waterAdded
|
2012-04-03 16:53:33 +02:00 |
|
scrawl
|
8aea311797
|
added visibility flags for everything
|
2012-04-03 15:13:47 +02:00 |
|
scrawl
|
16481b0594
|
Merge branch 'master' into minimap
|
2012-04-02 19:38:36 +02:00 |
|
scrawl
|
342464530d
|
rotated map working
|
2012-04-02 19:37:24 +02:00 |
|
scrawl
|
ff15f28787
|
options for texture filtering and mipmaps
|
2012-04-02 18:01:49 +02:00 |
|
scrawl
|
39ee9e9ab8
|
setting for field of view
|
2012-04-02 17:51:51 +02:00 |
|
scrawl
|
fd662f937a
|
add settings for viewing distance and fog
|
2012-04-02 15:51:48 +02:00 |
|
scrawl
|
e0631dd9be
|
Merge branch 'master' into minimap
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
|
2012-04-02 14:38:02 +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 |
|
scrawl
|
0a5757791c
|
Merge branch 'master' into minimap
|
2012-04-01 20:17:07 +02:00 |
|
scrawl
|
ee754eda6c
|
don't create sky until entering an exterior cell
|
2012-04-01 15:07:41 +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 |
|
scrawl
|
fc5cd703bb
|
maps are now rendered with correct rotation, however for interiors the arrow is wrong
|
2012-03-30 16:34:36 +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
|
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
|
cc7d3af701
|
Merge branch 'terrain18' into occlusionquery
|
2012-03-28 21:03:55 +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
|
4ee03cd61f
|
handle timeout
|
2012-03-26 00:31:03 +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 |
|
scrawl
|
06fa310e29
|
player arrow rotated correctly
|
2012-03-23 15:00:48 +01:00 |
|
scrawl
|
9076401892
|
Merge branch 'next' into terrain
Conflicts:
CMakeLists.txt
apps/openmw/CMakeLists.txt
|
2012-03-22 22:31:49 +01:00 |
|
scrawl
|
ab9aa1ba74
|
Merge branch 'next' into minimap
Conflicts:
files/mygui/openmw_map_window_layout.xml
|
2012-03-22 19:36:37 +01:00 |
|
Jason Hooks
|
51fb9e67cd
|
Merge
|
2012-03-18 21:31:31 -04:00 |
|
scrawl
|
5e939e4818
|
map window now works for interiors
|
2012-03-17 13:59:51 +01:00 |
|
scrawl
|
a67cc8e73b
|
more fixes
|
2012-03-16 19:02:33 +01:00 |
|
scrawl
|
c885ec1bd1
|
Merge branch 'master' into minimap
|
2012-03-16 17:10:27 +01:00 |
|
Nikolay Kasyanov
|
65fc141b62
|
Merge branch 'master' into pgrd-rendering
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
|
2012-03-15 20:38:21 +04:00 |
|
scrawl
|
2edd7e59f4
|
some fixes and facilities for saving the fog of war to disk
|
2012-03-14 20:44:06 +01:00 |
|
scrawl
|
583a25f634
|
fog of war rendering (incomplete)
|
2012-03-14 14:51:58 +01:00 |
|
scrawl
|
e8267c7363
|
adjusted fog distance, prevents objects suddenly popping up on cell load
|
2012-03-13 22:14:35 +01:00 |
|
Nikolay Kasyanov
|
f292a5a7ca
|
Feature #37 (In Progress) Render Path Grid
now using mwRoot instead of ogre's root, so no more messing with coordinates.
|
2012-03-12 02:37:07 +04:00 |
|
Nikolay Kasyanov
|
4659076129
|
Feature #37 (In Progress) Render Path Grid
workaround for strange ESMStore bug
|
2012-03-10 20:45:55 +04: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 |
|
Jacob Essex
|
3c934e3e44
|
Fixed a bug with fog not being applied to initially created terrain when starting in exteriors.
|
2012-03-02 22:31:17 +00:00 |
|
scrawl
|
e04ef38a5c
|
Merge branch 'next' of https://github.com/zinnschlag/openmw into terrain_next
|
2012-02-29 11:01:03 +01:00 |
|
scrawl
|
be5555956c
|
improved composite map, now adapts to the ambient/diffuse light
|
2012-02-28 22:04:44 +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
|
c8aab3a562
|
fix sun angle
|
2012-02-28 20:28:46 +01:00 |
|
scrawl
|
f79bf1f300
|
fog
|
2012-02-26 13:13:29 +01:00 |
|
scrawl
|
0ebdce543a
|
- added night sky rendering with stars, nebulas, and fading in/out to sunset / sunrise
- changed WeatherGlobals members to static
|
2012-02-24 23:26:38 +01:00 |
|
scrawl
|
67c7b965f0
|
calculate a sun position depending on time of day
|
2012-02-24 18:30:16 +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 |
|
scrawl
|
10ca67c0a5
|
fixed the sky elements positioning delay (nodes are now children of the camera node)
|
2012-02-21 16:49:28 +01:00 |
|
scrawl
|
2d8b0a4ac0
|
merged the sky manager implementation with its interface
|
2012-02-21 16:15:38 +01:00 |
|
scrawl
|
8b5da06fce
|
Merge branch 'next' into weather
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
|
2012-02-20 18:33:13 +01:00 |
|