scrawl
3f7daa4884
Forgot to change initTerrainTextures
2013-08-07 02:58:03 +02:00
scrawl
76e538c22a
Unused variable fix
2013-08-07 02:03:23 +02:00
scrawl
726c93c365
Terrain fixes to match vanilla better - vertices need to be mapped directly to texels for colormap and blendmap (this also caused seams at cell borders), layer uv scale appears to be 8 not 10
2013-08-07 01:34:17 +02:00
scrawl
ebaf80d539
Trace actors onto the ground after load, when moved to a different cell by the console or on player cell change.
2013-04-03 23:55:57 +02:00
scrawl
867b22ce19
Fix a terrain glitch
2013-03-03 15:11:19 +01:00
scrawl
d4264353a3
Merge branch 'z-up' into graphics
...
Conflicts:
apps/openmw/mwrender/localmap.cpp
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/water.cpp
files/materials/water.shader
2013-02-26 14:54:53 +01:00
scrawl
a5451eb9d9
Z-up conversion: terrain, objects
2013-02-26 08:30:06 +01:00
scrawl
d213ff680f
Disabled terrain LOD
2013-02-12 20:55:45 +01:00
Mark Siewert
55bd9eef66
Merge remote-tracking branch 'upstream/master' into multiple_esm_esp
2013-02-09 13:03:35 +01:00
scrawl
58cf182db2
better place for syncing
2013-02-05 00:21:29 +01:00
scrawl
596628d339
Fix terrain derived data update (bug 534, bug 544)
2013-02-04 23:13:01 +01:00
Mark Siewert
713d324eeb
- Minor code cleanup
2013-01-20 19:07:33 +01:00
Mark Siewert
896ab44d1e
- Add some updated files missing from last commit.
...
- Move plugin dependency test from esmreader.cpp to esmstpre.cpp; fixes crash in omwlauncher.
2012-11-25 17:19:29 +01:00
Mark Siewert
8ea9f00e6f
Merge remote-tracking branch 'upstream/master' into multiple_esm_esp
...
Conflicts:
apps/openmw/mwrender/terrain.cpp
apps/openmw/mwworld/cells.cpp
apps/openmw/mwworld/cells.hpp
apps/openmw/mwworld/cellstore.cpp
apps/openmw/mwworld/cellstore.hpp
apps/openmw/mwworld/containerstore.cpp
apps/openmw/mwworld/localscripts.cpp
apps/openmw/mwworld/scene.cpp
apps/openmw/mwworld/worldimp.cpp
apps/openmw/mwworld/worldimp.hpp
components/esm_store/reclists.hpp
components/esm_store/store.cpp
extern/shiny
- Re-implement some patches that were broken by the removal of reclists.hpp and store.cpp/.hpp.
- NOTE: Not everything works as before, I'll have to test some more stuff before we are back to where we were.
2012-11-25 14:12:44 +01:00
greye
932a9dc6f9
applying new interface vol.8, inconsistent
2012-11-06 11:53:00 +04:00
greye
d205723a17
resolving m prefix/ESMStore movement
2012-11-05 18:02:47 +04:00
greye
2057f5619e
move ESMStore to MWWorld
2012-11-05 17:18:01 +04:00
greye
3c2ce25f5f
m prefix for mwworld/cellstore.hpp
2012-11-05 16:07:59 +04:00
Mark Siewert
1f961d575e
Merge remote-tracking branch 'upstream/master' into multiple_esm_esp
...
Conflicts:
apps/openmw/mwrender/terrain.cpp
components/esm/loadland.hpp
components/esm_store/reclists.hpp
2012-10-07 20:35:54 +02:00
Mark Siewert
28d4d7ea3f
Manually convert last changes in branch to upstream/master. Regular merge attempt resulted in everything being overwritten by fast-forward merging.
...
- Remove check for 255 master/plugin files.
2012-10-07 20:00:55 +02:00
greye
2d5ddd104b
Land::loadData rework
2012-09-21 12:12:16 +04:00
greye
7606ebafd6
resolving conflicts, minor update
2012-09-17 11:37:50 +04:00
scrawl
739455e6f8
new water WIP, caustics, chromatic abberation, accurate fresnel, underwater reflection, etc
2012-07-19 16:23:30 +02:00
scrawl
16c2ea3a75
terrain colourmap
2012-07-14 11:13:38 +02:00
scrawl
7731e9a6fa
finished cleaning up sky
2012-07-13 09:13:12 +02:00
scrawl
b8384162b6
merge
2012-07-13 06:16:55 +02:00
Marc Zinnschlag
c85aaafac2
more include cleanup (most removing Ogre.h)
2012-07-03 15:32:38 +02:00
Marc Zinnschlag
87667ab57e
Issue #107 : Ptr related include cleanup
2012-07-03 13:55:53 +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
scrawl
19c428e86c
delete fix
2012-05-28 02:04:00 +02:00
scrawl
8f667580bb
ogre 1.8 final release compability fixes
2012-05-27 23:12:45 +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
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
2a4fcf42a3
basic shadows
2012-04-11 18:53:13 +02:00
scrawl
88c50c5171
Merge branch 'master' into water
2012-04-05 15:38:46 +02:00
Lukasz Gromanowski
cd2789b15a
Revert "Issue #225 : Correction to commit ae98904."
...
This reverts commit 0e5c90d3e7
2012-04-04 21:05:19 +02:00
scrawl
6442d49e16
render queue groups, sky fix
2012-04-04 18:53:40 +02:00
scrawl
8aea311797
added visibility flags for everything
2012-04-03 15:13:47 +02:00
Lukasz Gromanowski
0e5c90d3e7
Issue #225 : Correction to commit ae98904.
...
Changed pointer to LandData struct to simple member variable.
2012-04-02 23:50:53 +02:00
Lukasz Gromanowski
ae989040e5
Issue #225 : Fix for memleak when loading terrain.
2012-04-01 21:29:49 +02:00
Marc Zinnschlag
557e97bab4
fixed a terrain-related Redemption crash
2012-03-30 15:52:09 +02:00
Jacob Essex
ec21ff21cc
Removed memory leak, allocated more on the stack
2012-03-27 13:58:12 +01: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
Jacob Essex
eca91d17bb
Indentation tweaks and code cleanup
2012-03-04 11:46:33 +00:00
Jacob Essex
941a22034f
Merge branch 'terrain_next' of git://github.com/scrawl/openmw into terrain_next
...
Conflicts:
apps/openmw/mwrender/terrain.cpp
2012-03-04 11:30:37 +00:00
Jacob Essex
bcd2371baa
Code cleanup: Removed unneeded Ogre namespace
2012-03-04 11:21:47 +00:00
scrawl
a8939bc318
disabled the composite map, improves loading time a lot
2012-03-04 00:08:56 +01:00
scrawl
b882c03adc
fixed terrain regions without vertexcolours, tweaked maxPixelError
2012-03-02 23:36:48 +01:00
Jacob Essex
07a2e5a5be
Removed dead code, fixed a error, added comments and tweaked some constants (after trying to find their min/max values)
2012-03-02 21:20:12 +00:00
Jacob Essex
0f705eaca5
Removed the option of not splitting terrain as it was slower and adding to code complexity. The only real reason for keeping it, which was that it made debugging some texture issues easier is now gone.
2012-03-02 21:03:53 +00:00
