Marc Zinnschlag
12b7c6f1ac
Merge remote branch 'corristo/master'
2012-03-02 12:11:53 +01:00
Marc Zinnschlag
be70d197e5
Merge branch 'next'
...
Conflicts:
.gitignore
cmake/FindOGRE.cmake
2012-03-02 12:11:44 +01:00
Nikolay Kasyanov
70da2a2a99
removed tabs
2012-03-02 14:18:10 +04:00
Marc Zinnschlag
8da0925e70
Merge remote branch 'corristo/master'
2012-03-02 11:18:07 +01:00
Nikolay Kasyanov
fa3fbf940c
Fix for OS X 10.6 support
2012-03-02 14:10:11 +04:00
Marc Zinnschlag
a86d2877fc
Merge remote branch 'ace/win64-fixes'
2012-03-02 11:00:41 +01:00
Michael Papageorgiou
b3159683a4
Replace gengetopt with bullet program options for esmtool's argument handling
2012-03-02 04:41:29 +02: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
Nikolay Kasyanov
b283ad86fb
revert to old launcher stylesheet location on OS X
2012-03-01 17:16:44 +04:00
Michael Papageorgiou
185cd63462
ESMTool set to use default Latin encoding
2012-03-01 14:19:27 +02:00
Michael Papageorgiou
a1cbc7fb42
Altered getFver to fix a warning
2012-03-01 14:00:45 +02:00
Alexander "Ace" Olofsson
2c4ef5c670
64-bit install path on windows was easier to fix than expected.
2012-03-01 08:13:40 +01:00
Pieter van der Kloet
5ffa3264b2
Appended resources/ to the stylesheet path
2012-03-01 04:38:37 +01:00
Alexander "Ace" Olofsson
b6915a6090
Forgot that IsWow64Process would return false on a native 64-bit application
2012-03-01 01:03:31 +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
f2b807142a
update mangle
2012-02-29 11:08:25 +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
Marc Zinnschlag
ed0fa255b0
Merge remote branch 'scrawl/weather' into next
2012-02-28 23:33:22 +01:00
Marc Zinnschlag
c796c81d00
Merge remote branch 'ace/cmake' into defeat
2012-02-28 23:32:07 +01:00
Pieter van der Kloet
11ec5cf2e2
Stylesheet location changed in CMakeLists and some minor fixes to the launcher
2012-02-28 22:45: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
Pieter van der Kloet
b320733e45
Fixed Qt exits, this time for all occurrences
2012-02-28 21:00:02 +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
Pieter van der Kloet
5b54a658d8
Launcher improvements: ask for data dir and write it to cfg if none is found
...
and prevent removal of the default profile
2012-02-28 17:19:44 +01: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
Pieter van der Kloet
1512481c07
Changed the way whitespace was removed from retrieved Ogre values
2012-02-28 17:18:01 +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
Marc Zinnschlag
dc1fe6fb4d
adjusted readme
2012-02-28 09:56:12 +01:00
Marc Zinnschlag
7aaa7f185f
same for launcher
2012-02-28 09:46:48 +01:00
Marc Zinnschlag
4c2fffdd61
temporarily disabled multi data path support in OpenMW
2012-02-28 09:27:35 +01:00
Lukasz Gromanowski
9a4cd6c2b1
Fixes #200 - Paths with quotes for data-local option.
...
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2012-02-27 23:56:58 +01:00
Alexander "Ace" Olofsson
bfb3a4a36b
Changed FindOGRE a bit to make it easier to find a source build of Ogre. (At least on windows)
2012-02-27 22:22:17 +01:00
scrawl
dbd2d390fd
terrain material fixes:
...
- disable normal and parallax mapping
- disable specular mapping and specular
2012-02-27 21:12:16 +01:00
scrawl
f34b2c73c5
committing the terrain material generator from ogre 1.7.4, it seems to
...
be almost impossible to make a derived class of TerrainMaterialGeneratorA
because of the many classes it contains and the inter-relationships
between them; just adding the whole source makes it a lot easier to modify
if we decide to update this source from OGRE upstream at any point
(which seems unlikely), we can take the diff from this commit on
to see the changes we did to the material generator
2012-02-27 19:44:52 +01:00
Marc Zinnschlag
2c20aeab90
Merge remote branch 'werdanith/activationsounds' into next
2012-02-27 18:24:33 +01:00
Marc Zinnschlag
2608491906
Merge remote branch 'corristo/master'
2012-02-27 16:05:04 +01:00
Nikolay Kasyanov
d58b408ae1
Deploying Qt image format plugins on OS X considered useless
2012-02-27 19:00:06 +04:00
Michael Papageorgiou
fe977fe313
More container and door trap fixes
2012-02-27 16:59:45 +02:00
Michael Papageorgiou
28fdfb0f99
Added container locked and trapped activation sounds
2012-02-27 16:37:05 +02:00
Marc Zinnschlag
739870489a
Merge remote branch 'scrawl/weather' into weather
...
Conflicts:
apps/openmw/CMakeLists.txt
2012-02-27 15:02:03 +01:00
scrawl
c9ceb74e5c
transition fix
2012-02-27 12:21:00 +01:00
