scrawl
3e4cf64a77
Merge branch 'master' into shaders
2012-03-16 20:46:18 +01:00
scrawl
5ea2122f79
sun gradually disappears
2012-03-16 20:39:58 +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
scrawl
91d2031eb7
first attempt at map window
2012-03-16 17:09:31 +01:00
scrawl
877cb2aca7
much better looking moons
2012-03-15 20:35:23 +01:00
scrawl
e354203c21
stars rotation
2012-03-15 19:49:15 +01:00
Alexander "Ace" Olofsson
e8eea03b4c
Fixed a few more non-virtual destructor warnings
2012-03-15 17:40:42 +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
Marc Zinnschlag
5b378e820d
warning level adjustments and some related fixes
2012-03-15 16:01:41 +01:00
scrawl
2edd7e59f4
some fixes and facilities for saving the fog of war to disk
2012-03-14 20:44:06 +01:00
scrawl
5a46d58da5
fully working fog of war
2012-03-14 17:44:19 +01:00
scrawl
583a25f634
fog of war rendering (incomplete)
2012-03-14 14:51:58 +01:00
Nikolay Kasyanov
a8e25bc32c
Feature #37 (In Progress) Render Path Grid
...
improved path grid point mesh (closer to vanilla MW)
2012-03-14 15:03:04 +04:00
Marc Zinnschlag
81abd97753
Merge remote branch 'scrawl/weather'
2012-03-14 09:40:22 +01:00
Nikolay Kasyanov
3a705baa29
Feature #37 (In Progress) Render Path Grid
...
added simple pathgrid edges
2012-03-14 03:06:56 +04:00
scrawl
e8267c7363
adjusted fog distance, prevents objects suddenly popping up on cell load
2012-03-13 22:14:35 +01:00
scrawl
8421fd2670
fixed a visual issue with the stars
2012-03-13 19:57:33 +01:00
scrawl
118250171d
Merge branch 'master' of https://github.com/zinnschlag/openmw into shaders
...
Conflicts:
apps/openmw/mwrender/objects.cpp
2012-03-13 17:31:10 +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
scrawl
8be661c802
Merge branch 'master' of https://github.com/zinnschlag/openmw into terrain_next
...
Conflicts:
CMakeLists.txt
2012-03-07 13:29:59 +01:00
Marc Zinnschlag
3d1cbcd4e7
Merge remote branch 'jhooks/animperform'
2012-03-07 09:20:29 +01:00
Jason Hooks
39ff8d6a01
Compile error retry
2012-03-06 18:28:41 -05:00
Jason Hooks
9848b67174
Fixing errors
2012-03-05 17:46:29 -05:00
Marc Zinnschlag
25f5bdf7aa
Merge remote branch 'scrawl/weather'
2012-03-05 22:45:52 +01:00
scrawl
42a7375a0b
adjusted the batch region size, this was the cause for lights going on/off bug
2012-03-04 23:26:35 +01:00
scrawl
ff8f95fcca
fix batch lighting, removed the "bumping number of lights" hack
2012-03-04 23:18:40 +01:00
scrawl
8910b0d471
use shaders for all NIF materials. this has numerous advantages:
...
- vertex colours are now working as they should (and they have a huge impact on the look)
- the lighting is per pixel and looks a lot better
- by using shaders, we can use more lights at a time (fixed function has max of 8)
2012-03-04 20:59:23 +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
Jason Hooks
a81ecb5f65
Bug 210 fix
2012-03-03 18:26:11 -05:00
scrawl
a8939bc318
disabled the composite map, improves loading time a lot
2012-03-04 00:08:56 +01:00
scrawl
d74b78a302
very minor performance improvement
2012-03-03 12:26:08 +01:00
scrawl
b882c03adc
fixed terrain regions without vertexcolours, tweaked maxPixelError
2012-03-02 23:36:48 +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
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
Jacob Essex
3ecc427b96
Implemented slightly better texture splatting
2012-03-02 20:27:20 +00:00
scrawl
461ec9f3d6
fix regarding last commit
2012-03-02 18:50:55 +01:00
scrawl
0d4e3b8e75
remove alpha channel from colour map
2012-03-02 18:33:05 +01:00
scrawl
2bea4c4724
fixed the global colour map, apparently Ogre::Terrain was corrupting it
...
somehow, now we are just bypassing Ogre::Terrain for the colour map and
passing it directly to the material, which makes more sense
performance-wise anyway
2012-03-02 15:29:12 +01:00
scrawl
04c141ddd5
Merge branch 'terrain' of https://github.com/Yacoby/openmw into terrain_next
...
Conflicts:
apps/openmw/mwrender/terrain.cpp
2012-03-02 13:49:57 +01:00
Jacob Essex
8dd6e75ae1
Vertex colours now uses the Ogre::Terrain colour map
2012-03-02 11:56:51 +00:00
Marc Zinnschlag
be70d197e5
Merge branch 'next'
...
Conflicts:
.gitignore
cmake/FindOGRE.cmake
2012-03-02 12:11:44 +01:00
scrawl
562cc7aa30
fixed 2 assertions that caused crashes
2012-03-01 15:03:43 +01:00
scrawl
fddf7b4dd0
terrain material now supports point lights
2012-03-01 14:35:39 +01:00