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 |
|
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 |
|
Alexander "Ace" Olofsson
|
ce38876a74
|
Oops, that could've crashed horribly
|
13 years ago |
|
scrawl
|
5a19d4ec45
|
implement water script functions and save water height in CellStore
|
13 years ago |
|
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
|
13 years ago |
|
Alexander "Ace" Olofsson
|
71cb85dbc4
|
Performance enhancment and minor copy-paste fix.
|
13 years ago |
|
scrawl
|
42c5d515e6
|
fixed interior water level
|
13 years ago |
|
Alexander "Ace" Olofsson
|
0d163d76ab
|
Replaced some messy code with some differently messy code, this one at least seems to work
|
13 years ago |
|
scrawl
|
8bbb02a1bd
|
ogre 1.8 fixes
|
13 years ago |
|
scrawl
|
6bea08157e
|
Merge branch 'master' into terrain18
|
13 years ago |
Jacob Essex
|
ec21ff21cc
|
Removed memory leak, allocated more on the stack
|
13 years ago |
|
Jacob Essex
|
b76b62e5e4
|
Fixed a crash when there were cells with no data, refactored to remove non mutable data from CellStore
|
13 years ago |
|
Lukasz Gromanowski
|
f8afc22f04
|
Issue #225: Corrected wrong delete operator introduced by one of previous commit.
|
13 years ago |
|
Lukasz Gromanowski
|
2b9845a5b6
|
Issue #225: Free memory allocated for sending into HardwareVertexBuffer.
Free memory allocated for sending into HardwareVertexBuffer in NIFLoader class.
|
13 years ago |
|
Lukasz Gromanowski
|
d3b88b9e34
|
Issue #225: Added cleanup of allocated memory in BulletNifLoader and BulletShapeLoader.
|
13 years ago |
|
Marc Zinnschlag
|
4a2ade2372
|
Merge remote branch 'kromgart/master' into next
|
13 years ago |
|
scrawl
|
99b2b6b648
|
ogre 1.8 fixes
|
13 years ago |
|
scrawl
|
f2a7acb102
|
Merge branch 'next' into terrain
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwrender/renderingmanager.cpp
|
13 years ago |