Marc Zinnschlag
afa859a6a6
Merge remote branch 'jhooks/clothingarmor'
...
Conflicts:
apps/openmw/mwrender/npcanimation.cpp
13 years ago
scrawl
95f87a8abf
more or less complete list for morrowind.bsa (thanks to artorius)
13 years ago
Jason Hooks
7fce57f335
Getting started with a new branch
13 years ago
scrawl
a727bcd4a4
override nif transparency settings (part 1)
13 years ago
scrawl
2a4fcf42a3
basic shadows
13 years ago
Jason Hooks
74deb5588d
Post merge
13 years ago
scrawl
cdea19206c
Revert "more accurate fog, TODO: apply this to the terrain"
...
This reverts commit 96c37d3e7c
.
13 years ago
scrawl
96911ada95
restored render queue of transparent objects, they are now part of the mrt textures
...
this fixes some issues with transparent objects not visible in the refraction
13 years ago
scrawl
044d649edd
Merge branch 'master' into water
13 years ago
scrawl
96c37d3e7c
more accurate fog, TODO: apply this to the terrain
13 years ago
Lukasz Gromanowski
e21e8c221d
Added explicit cast to char in ToUTF8::windows_XXXX tables.
...
Added explicit cast to char, without that gcc 4.7 (with default settings)
is showing a lot of:
narrowing conversion of ‘...’ from ‘int’ to ‘char’ inside { } is ill-formed in C++11 [-Wnarrowing]
warnings.
13 years ago
scrawl
622fb568cf
removed MRT setting and figure it out automatically
13 years ago
scrawl
88c50c5171
Merge branch 'master' into water
13 years ago
Marc Zinnschlag
01500e979a
another fix for optional arguments
13 years ago
Marc Zinnschlag
6fd3d5c776
Merge remote branch 'lgro/master'
13 years ago
Lukasz Gromanowski
ea8e5cb6f8
Issue #225 : Land struct is not copyable.
...
Disabled copy constructor and assignment operator in Land structure.
13 years ago
Lukasz Gromanowski
cd2789b15a
Revert "Issue #225 : Correction to commit ae98904."
...
This reverts commit 0e5c90d3e7
.
13 years ago
scrawl
006970fd79
add MRT code to shaders
13 years ago
Jason Hooks
57299571d5
Preparing for clothes/armor
13 years ago
Lukasz Gromanowski
0e5c90d3e7
Issue #225 : Correction to commit ae98904
.
...
Changed pointer to LandData struct to simple member variable.
13 years ago
scrawl
2b4b941192
Merge branch 'master' into gamesettings
13 years ago
scrawl
5accca385c
fix crash on exit when no user settings exist
13 years ago
Marc Zinnschlag
6022d3ab13
Merge remote branch 'corristo/pgrd-rendering'
...
reduced cout spam.
Conflicts:
apps/openmw/mwrender/debugging.cpp
apps/openmw/mwrender/renderingmanager.cpp
components/bsa/bsa_archive.cpp
libs/openengine/bullet/physic.hpp
13 years ago
Lukasz Gromanowski
ae989040e5
Issue #225 : Fix for memleak when loading terrain.
13 years ago
scrawl
c2a82c3d89
Merge branch 'master' into gamesettings
13 years ago
scrawl
7b3adb27a3
backend changes, terrain num lights setting
13 years ago
Alexander "Ace" Olofsson
54ce95cfaf
Make sure it doesn't find the wrong file
13 years ago
scrawl
6091a0504d
first settings test (config file has to be created manually)
13 years ago
scrawl
308df7caa8
add method for keeping track of settings that changed
13 years ago
scrawl
55c984c179
Merge branch 'master' into gamesettings
13 years ago
Marc Zinnschlag
08f8701b33
workaround for tga problem
13 years ago
scrawl
82429d6931
finished interface
13 years ago
Nikolay Kasyanov
523648dbb1
Merge branch 'master' into pgrd-rendering
...
Conflicts:
apps/openmw/mwrender/debugging.cpp
13 years ago
Nikolay Kasyanov
057c2f2e2a
Merge branch 'master' into pgrd-rendering
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
13 years ago
Marc Zinnschlag
509650d5f3
Merge remote branch 'ace/fs-fix'
13 years ago
Alexander "Ace" Olofsson
3b0dc408ae
Debug-b-gone
13 years ago
Alexander "Ace" Olofsson
06a34b9e0d
Strange problems call for strange solutions.
13 years ago
Alexander "Ace" Olofsson
8e07b7e050
Better (less) debug output
13 years ago
Alexander "Ace" Olofsson
8d9100c77b
Debug output
13 years ago
Alexander "Ace" Olofsson
fc4e4dc336
Case sensitiviy?
13 years ago
scrawl
ff85006e71
added untested interface
13 years ago
Alexander "Ace" Olofsson
8ac9dd8e70
Always use the same type of slashes
13 years ago
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
13 years ago
Alexander "Ace" Olofsson
d2f8539a42
Forgot to remove some old code that didn't do anything
13 years ago
Alexander "Ace" Olofsson
4a9a416d46
Can find files even if no .bsa file exists now
13 years ago
scrawl
d5c49fa036
getWaterLevel use CellStore ; attempted fix for morrowind without tribunal
13 years ago
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
13 years ago
Alexander "Ace" Olofsson
60b95e7992
Sorting the file lists properly
13 years ago
Alexander "Ace" Olofsson
6acd900577
Better name
13 years ago
Alexander "Ace" Olofsson
c3944d3e1a
Use a normal binary search
13 years ago