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

..

cell_store.hpp

implement water script functions and save water height in CellStore

2012-03-29 15:50:15 +02:00

reclists.hpp

Removed memory leak, allocated more on the stack

2012-03-27 13:58:12 +01:00

store.cpp

fix for issue 138 (record loading failed for some NPCs)

2011-07-04 23:36:22 +02:00

store.hpp

Merge branch 'next' into terrain

2012-03-22 22:31:49 +01:00