scrawl
99b2b6b648
ogre 1.8 fixes
2012-03-24 14:46:48 +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
Marc Zinnschlag
9ec1e55aaf
Merge remote branch 'scrawl/minimap' into next
2012-03-24 10:31:42 +01:00
scrawl
a6259a1b0d
bugfixes
2012-03-23 17:37:56 +01:00
scrawl
06fa310e29
player arrow rotated correctly
2012-03-23 15:00:48 +01:00
scrawl
b8f962a68d
Merge branch 'next' into shaders
2012-03-23 10:26:20 +01:00
scrawl
9c3e1f48f0
player arrow
2012-03-23 09:00:00 +01:00
scrawl
2dd329938a
automatically zoom in on the player while moving
2012-03-23 08:16:04 +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
scrawl
1907e21207
removed preprocessor constants
2012-03-18 20:44:56 +01:00
scrawl
c2329b7027
removed preprocessor constants
2012-03-18 20:32:50 +01:00
scrawl
5e939e4818
map window now works for interiors
2012-03-17 13:59:51 +01:00
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
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
Marc Zinnschlag
81abd97753
Merge remote branch 'scrawl/weather'
2012-03-14 09:40:22 +01: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
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