2c70a93553
Merge branch 'master' into potions
...
Conflicts:
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/npc.hpp
13 years ago
a021165d9f
Changed standard C lib includes to C++ format
13 years ago
182017b8e9
Issue #314 : Moved ingredients and potions to a different type of record list
13 years ago
76174098c7
Issue #107 : CellStore moved from ESMS to MWWorld
13 years ago
8231cab599
correct case for dialogue topics
13 years ago
057c2f2e2a
Merge branch 'master' into pgrd-rendering
...
Conflicts:
apps/openmw/mwrender/renderingmanager.cpp
13 years ago
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
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
5a19d4ec45
implement water script functions and save water height in CellStore
13 years ago
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
ec21ff21cc
Removed memory leak, allocated more on the stack
13 years ago
b76b62e5e4
Fixed a crash when there were cells with no data, refactored to remove non mutable data from CellStore
13 years ago
9076401892
Merge branch 'next' into terrain
...
Conflicts:
CMakeLists.txt
apps/openmw/CMakeLists.txt
13 years ago
e8eea03b4c
Fixed a few more non-virtual destructor warnings
13 years ago
f292a5a7ca
Feature #37 (In Progress) Render Path Grid
...
now using mwRoot instead of ogre's root, so no more messing with coordinates.
13 years ago
4659076129
Feature #37 (In Progress) Render Path Grid
...
workaround for strange ESMStore bug
13 years ago
11f957a64d
Feature #37 (In Progress) Render Path Grid
...
cubes for path grid points
strange crash when trying to get path grids from Debugging
13 years ago
de5b692f9f
Feature #161 (Resolved) Load REC_PGRD records
13 years ago
fda5b59eb6
Feature #161 (In Progress) Load REC_PGRD records
...
now using vector instead of C arrays
fixed path grid edge loading
added path grid to cell store
implemented dedicated storage class for path grids
13 years ago
40e07bbd2a
Feature #161 (In Progress) Load REC_PGRD records
...
Struct sizes seems correct, but floats is broken
13 years ago
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
13 years ago
c081160591
replaced container store in ref data with new custom data implementation
13 years ago
cd0df082df
Textures are now blended between cells and the texture blending functions are now more abstract
13 years ago
637302fc87
Added blended textures to the terrain
13 years ago
18108c02a7
Merge of corristo's terrain rendering and fixes so that the terrain is correctly positioned and rendered
13 years ago
7319f7a8c6
Many bugs fixed related to changing cells
13 years ago
9aac625000
Changes to move the mutable ESM::Position data to RefData
13 years ago
b448fc7d4c
Issue #31 : Do not try to load dynamical generated cells from ESM/P files
13 years ago
8da15440e0
Issue #31 : added function for creating cell records
13 years ago
02ce672fdc
preload cell's reference list when accessing a reference outside of the actice cells (memory usage and speed optimisation)
13 years ago
f0dd38b431
Issue #28 : replaced the nested map structure in the CellList
13 years ago
e4a2f5547b
Issue #28 : added load-state for cells
13 years ago
ce7202a147
Issue #28 : shifting around functionality among CellStore, Cells and CellList
14 years ago
2b5dc0042b
fix for issue 138 (record loading failed for some NPCs)
14 years ago
90985e849e
Mantis: #18 - Move components from global namespace into their own namespace.
...
Moving classes from components/misc into Misc namespace.
Note: Misc namespace introduced conflict with ESM::Misc and MWClass::Misc
classes, so both of them are renamed to ESM::Miscellaneous
and MWClass::Miscellaneous.
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
14 years ago
a6e83f5b9b
case-handling fix for references in cells
14 years ago
d7226fc9c2
Merge branch 'tab_completion'
14 years ago
0fb2107265
Merge branch 'master' of git://github.com/zinnschlag/openmw.git into collisions
...
Conflicts:
apps/openmw/mwclass/npc.cpp
14 years ago
4028600768
Builds on OS X now
14 years ago
6a14ea8ec3
handle physics during player changing cells
14 years ago
d865c3cfc6
backend for tab completion: identifiers
14 years ago
dd4d022301
Converted all tabs to four spaces
14 years ago
5336b90149
music player and NPC rendering branch
14 years ago
13d8ea09b0
Cell case insensitivity, exterior and interior cells
14 years ago
ffaaad188a
using theirs
14 years ago
38ab9f7a3d
Merge branch 'newchar'
...
Conflicts:
components/esm_store/store.hpp
14 years ago
30f2d4fdd4
Added LAND and LTEX to esm_store
14 years ago
ee101440a2
Continued work on Class Create dialog. Added sub-dialogs for picking specialization, attribute and skill. Also added some definitions in ESM for attributes and specializations.
14 years ago
9a2f128f58
improved record searching
15 years ago
0414d7f862
load skill and magic effect records
15 years ago
Marc Zinnschlag
guidoj
scrawl
Nikolay Kasyanov
Jacob Essex
Alexander "Ace" Olofsson
Jason Hooks
Lukasz Gromanowski
gugus
Pieter van der Kloet
Jason Hooks
Nicolay Korslund
Jan Borsodi