mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-02-26 06:40:22 +00:00
Code Issues Projects Releases Wiki Activity
2,317 Commits 17 Branches 68 Tags
Commit Graph

316 Commits

Author SHA1 Message Date
scrawl
9076401892 Merge branch 'next' into terrain 
Conflicts:
	CMakeLists.txt
	apps/openmw/CMakeLists.txt
 2012-03-22 22:31:49 +01:00
scrawl
c2329b7027 removed preprocessor constants 2012-03-18 20:32:50 +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
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
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
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
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
Jacob Essex
611f336d07 Now doesn't attempt to use fake vertex colours with cells that don't have vertex colours 2012-02-29 23:38:21 +00:00
Jacob Essex
6924348696 Fixed some texture splatting issues with loading empty terrain cells 2012-02-29 23:33:54 +00:00
Jacob Essex
1d0ae9c8d1 Start of a basic implementation of fake vertex colours 2012-02-29 23:05:22 +00:00
scrawl
bac7f23604 Merge branch 'terrain' of https://github.com/Yacoby/openmw into terrain_next 
Conflicts:
	apps/openmw/mwrender/terrain.cpp
 2012-02-29 19:38:34 +01:00
scrawl
e04ef38a5c Merge branch 'next' of https://github.com/zinnschlag/openmw into terrain_next 2012-02-29 11:01:03 +01:00
Marc Zinnschlag
3c5f8a4a23 void pointer workaround 2012-02-29 10:13:25 +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
Jacob Essex
13e3955916 Merge branch 'terrain' of github.com:Yacoby/openmw into terrain 2012-02-28 16:22:19 +00:00
scrawl
f55905609f fixed the terrain normals - they had to be adjusted because we use Morrowind's coordinate system 2012-02-28 17:18:07 +01:00
scrawl
abcf25ead2 terrain shader performance improvement (tested on opengl only, please test on directx) 2012-02-28 16:41:05 +01:00
scrawl
5b5e8ba4fd fix a typo that caused SPLIT_TERRAIN=true blendmap to be too detailed (causing insane loading times) 2012-02-28 16:20:57 +01:00
scrawl
b3db4f1c27 slightly improved moon fading 2012-02-28 15:20:46 +01:00