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 |
|
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
|
e6303fc3f4
|
Merge branch 'master' into water
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.hpp
|
2012-03-28 21:37:20 +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
|
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
|
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 |
|
Marc Zinnschlag
|
db205cf8aa
|
Merge remote branch 'scrawl/next' into test
Conflicts:
libs/openengine
|
2012-02-20 14:54:08 +01:00 |
|
Marc Zinnschlag
|
e02cba58b1
|
Merge branch 'master' into next
Conflicts:
apps/openmw/mwclass/light.cpp
|
2012-02-20 14:34:27 +01:00 |
|
scrawl
|
705d85e7d1
|
Merge branch 'next' into weather
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
|
2012-02-19 23:27:26 +01:00 |
|
scrawl
|
60856b46e6
|
moved the renderer update call from OMW::Engine to RenderingManager
|
2012-02-19 23:22:29 +01:00 |
|
scrawl
|
1d9f0f4813
|
added MWSkyManager; already has atmosphere and moving clouds (although their colour is static)
|
2012-02-19 23:09:14 +01:00 |
|
Jason Hooks
|
38a0d1d1c5
|
Merging in master
|
2012-02-19 15:39:12 -05:00 |
|
scrawl
|
f81b615976
|
implemented script functions FadeIn, FadeOut, FadeTo
|
2012-02-18 18:25:28 +01:00 |
|
scrawl
|
40e23fe26f
|
added twf console command
|
2012-02-18 16:06:03 +01:00 |
|
gugus
|
597e670eef
|
corrected the light problem
|
2012-02-10 14:51:49 +01:00 |
|
Cris Mihalache
|
daa8fb15ce
|
Removed all physics-related code from Engine
|
2012-01-29 20:51:20 +02:00 |
|