Lukasz Gromanowski
d9e39bd90e
Changed order of plugins.cfg file paths.
...
Changed order of plugins.cfg file paths - before when plugins.cfg file
was found in global path then it was used as default one. Now the behavoiur
is opposite if plugins.cfg file exists in local path then it is used as
default one.
2012-05-11 21:32:38 +02:00
scrawl
4ce83badc9
flickering lights
2012-04-28 20:42:53 +02:00
scrawl
8231cab599
correct case for dialogue topics
2012-04-17 23:47:50 +02:00
Marc Zinnschlag
afa859a6a6
Merge remote branch 'jhooks/clothingarmor'
...
Conflicts:
apps/openmw/mwrender/npcanimation.cpp
2012-04-15 22:06:05 +02:00
scrawl
95f87a8abf
more or less complete list for morrowind.bsa (thanks to artorius)
2012-04-12 16:33:36 +02:00
Jason Hooks
7fce57f335
Getting started with a new branch
2012-04-11 20:16:22 -04:00
scrawl
a727bcd4a4
override nif transparency settings (part 1)
2012-04-11 20:13:15 +02:00
scrawl
2a4fcf42a3
basic shadows
2012-04-11 18:53:13 +02:00
Jason Hooks
74deb5588d
Post merge
2012-04-08 20:41:49 -04:00
scrawl
cdea19206c
Revert "more accurate fog, TODO: apply this to the terrain"
...
This reverts commit 96c37d3e7c
2012-04-07 22:47:39 +02:00
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
2012-04-07 22:37:15 +02:00
scrawl
044d649edd
Merge branch 'master' into water
2012-04-07 17:16:35 +02:00
scrawl
96c37d3e7c
more accurate fog, TODO: apply this to the terrain
2012-04-07 16:55:32 +02:00
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.
2012-04-07 13:08:25 +02:00
scrawl
622fb568cf
removed MRT setting and figure it out automatically
2012-04-05 19:27:54 +02:00
scrawl
88c50c5171
Merge branch 'master' into water
2012-04-05 15:38:46 +02:00
Marc Zinnschlag
01500e979a
another fix for optional arguments
2012-04-05 15:00:49 +02:00
Marc Zinnschlag
6fd3d5c776
Merge remote branch 'lgro/master'
2012-04-04 23:19:30 +02:00
Lukasz Gromanowski
ea8e5cb6f8
Issue #225 : Land struct is not copyable.
...
Disabled copy constructor and assignment operator in Land structure.
2012-04-04 21:39:21 +02:00
Lukasz Gromanowski
cd2789b15a
Revert "Issue #225 : Correction to commit ae98904."
...
This reverts commit 0e5c90d3e7
2012-04-04 21:05:19 +02:00
scrawl
006970fd79
add MRT code to shaders
2012-04-04 19:53:41 +02:00
Jason Hooks
57299571d5
Preparing for clothes/armor
2012-04-02 22:08:46 -04:00
Lukasz Gromanowski
0e5c90d3e7
Issue #225 : Correction to commit ae98904.
...
Changed pointer to LandData struct to simple member variable.
2012-04-02 23:50:53 +02:00
scrawl
2b4b941192
Merge branch 'master' into gamesettings
2012-04-02 15:21:10 +02:00
scrawl
5accca385c
fix crash on exit when no user settings exist
2012-04-02 13:47:25 +02:00
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
2012-04-02 12:04:47 +02:00
Lukasz Gromanowski
ae989040e5
Issue #225 : Fix for memleak when loading terrain.
2012-04-01 21:29:49 +02:00
scrawl
c2a82c3d89
Merge branch 'master' into gamesettings
2012-04-01 20:06:18 +02:00
scrawl
7b3adb27a3
backend changes, terrain num lights setting
2012-04-01 18:48:37 +02:00
Alexander "Ace" Olofsson
54ce95cfaf
Make sure it doesn't find the wrong file
2012-04-01 17:25:03 +02:00
scrawl
6091a0504d
first settings test (config file has to be created manually)
2012-04-01 16:59:35 +02:00
scrawl
308df7caa8
add method for keeping track of settings that changed
2012-04-01 16:26:42 +02:00
scrawl
55c984c179
Merge branch 'master' into gamesettings
2012-03-31 21:37:15 +02:00
Marc Zinnschlag
08f8701b33
workaround for tga problem
2012-03-31 17:52:58 +02:00
scrawl
82429d6931
finished interface
2012-03-31 13:35:40 +02:00
Nikolay Kasyanov
523648dbb1
Merge branch 'master' into pgrd-rendering
...
Conflicts:
apps/openmw/mwrender/debugging.cpp
2012-03-31 14:56:18 +04:00
Nikolay Kasyanov
057c2f2e2a
Merge branch 'master' into pgrd-rendering
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
2012-03-31 13:42:13 +04:00
Marc Zinnschlag
509650d5f3
Merge remote branch 'ace/fs-fix'
2012-03-31 11:37:18 +02:00
Alexander "Ace" Olofsson
3b0dc408ae
Debug-b-gone
2012-03-31 11:29:24 +02:00
Alexander "Ace" Olofsson
06a34b9e0d
Strange problems call for strange solutions.
2012-03-31 10:35:08 +02:00
Alexander "Ace" Olofsson
8e07b7e050
Better (less) debug output
2012-03-31 00:55:47 +02:00
Alexander "Ace" Olofsson
8d9100c77b
Debug output
2012-03-30 23:29:58 +02:00
Alexander "Ace" Olofsson
fc4e4dc336
Case sensitiviy?
2012-03-30 19:05:58 +02:00
scrawl
ff85006e71
added untested interface
2012-03-30 18:38:33 +02:00
Alexander "Ace" Olofsson
8ac9dd8e70
Always use the same type of slashes
2012-03-30 16:59:19 +02:00
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
2012-03-30 15:38:14 +02:00
Alexander "Ace" Olofsson
d2f8539a42
Forgot to remove some old code that didn't do anything
2012-03-30 14:50:39 +02:00
Alexander "Ace" Olofsson
4a9a416d46
Can find files even if no .bsa file exists now
2012-03-30 14:45:32 +02:00
scrawl
d5c49fa036
getWaterLevel use CellStore ; attempted fix for morrowind without tribunal
2012-03-30 10:12:28 +02:00
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
2012-03-30 02:50:30 +04:00
