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
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
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
Alexander "Ace" Olofsson
60b95e7992
Sorting the file lists properly
2012-03-29 22:38:14 +02:00
Alexander "Ace" Olofsson
6acd900577
Better name
2012-03-29 21:36:00 +02:00
Alexander "Ace" Olofsson
c3944d3e1a
Use a normal binary search
2012-03-29 21:27:37 +02:00
Alexander "Ace" Olofsson
ce38876a74
Oops, that could've crashed horribly
2012-03-29 17:31:55 +02:00
scrawl
5a19d4ec45
implement water script functions and save water height in CellStore
2012-03-29 15:50:15 +02:00
Nikolay Kasyanov
c3357c4396
Merge branch 'master' into pgrd-rendering
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
apps/openmw/mwrender/renderingmanager.hpp
apps/openmw/mwscript/docs/vmformat.txt
2012-03-29 13:27:13 +04:00
Alexander "Ace" Olofsson
71cb85dbc4
Performance enhancment and minor copy-paste fix.
2012-03-29 04:54:33 +02:00
scrawl
42c5d515e6
fixed interior water level
2012-03-29 04:50:40 +02:00
Alexander "Ace" Olofsson
0d163d76ab
Replaced some messy code with some differently messy code, this one at least seems to work
2012-03-29 03:59:24 +02:00
scrawl
8bbb02a1bd
ogre 1.8 fixes
2012-03-28 21:30:59 +02:00
scrawl
6bea08157e
Merge branch 'master' into terrain18
2012-03-28 21:30:15 +02:00
Jacob Essex
ec21ff21cc
Removed memory leak, allocated more on the stack
2012-03-27 13:58:12 +01:00
Jacob Essex
b76b62e5e4
Fixed a crash when there were cells with no data, refactored to remove non mutable data from CellStore
2012-03-27 09:20:22 +01:00
Lukasz Gromanowski
f8afc22f04
Issue #225 : Corrected wrong delete operator introduced by one of previous commit.
2012-03-26 23:16:59 +02:00
Lukasz Gromanowski
2b9845a5b6
Issue #225 : Free memory allocated for sending into HardwareVertexBuffer.
...
Free memory allocated for sending into HardwareVertexBuffer in NIFLoader class.
2012-03-26 19:09:55 +02:00
Lukasz Gromanowski
d3b88b9e34
Issue #225 : Added cleanup of allocated memory in BulletNifLoader and BulletShapeLoader.
2012-03-26 19:09:55 +02:00
Marc Zinnschlag
4a2ade2372
Merge remote branch 'kromgart/master' into next
2012-03-24 16:57:06 +01:00
