openmw-tes3coop/apps/openmw
Mark Siewert 8ea9f00e6f Merge remote-tracking branch 'upstream/master' into multiple_esm_esp
Conflicts:
	apps/openmw/mwrender/terrain.cpp
	apps/openmw/mwworld/cells.cpp
	apps/openmw/mwworld/cells.hpp
	apps/openmw/mwworld/cellstore.cpp
	apps/openmw/mwworld/cellstore.hpp
	apps/openmw/mwworld/containerstore.cpp
	apps/openmw/mwworld/localscripts.cpp
	apps/openmw/mwworld/scene.cpp
	apps/openmw/mwworld/worldimp.cpp
	apps/openmw/mwworld/worldimp.hpp
	components/esm_store/reclists.hpp
	components/esm_store/store.cpp
	extern/shiny

- Re-implement some patches that were broken by the removal of reclists.hpp and store.cpp/.hpp.
- NOTE: Not everything works as before, I'll have to test some more stuff before we are back to where we were.
2012-11-25 14:12:44 +01:00
..
mwbase Merge remote-tracking branch 'upstream/master' into multiple_esm_esp 2012-11-25 14:12:44 +01:00
mwclass Merge remote-tracking branch 'trombonecot/master' 2012-11-19 21:21:00 +01:00
mwdialogue dialogue fixes 2012-11-23 19:05:40 +01:00
mwgui Merge remote-tracking branch 'scrawl/reputation' 2012-11-23 21:26:44 +01:00
mwinput changed OIS includes since OIS_INCLUDE_DIR is already an include directory 2012-11-06 15:26:51 +01:00
mwmechanics various fixes 2012-11-16 20:28:20 +01:00
mwrender Merge remote-tracking branch 'upstream/master' into multiple_esm_esp 2012-11-25 14:12:44 +01:00
mwscript ModReputation, SetReputation 2012-11-23 19:56:45 +01:00
mwsound several missing includes 2012-11-14 05:32:23 +01:00
mwworld Merge remote-tracking branch 'upstream/master' into multiple_esm_esp 2012-11-25 14:12:44 +01:00
CMakeLists.txt Merge remote-tracking branch 'trombonecot/master' 2012-11-19 21:21:00 +01:00
config.hpp.cmake another minor correction (fixing the previous one) 2011-07-08 16:16:06 +02:00
doc.hpp first set of additional doxygen comments 2010-09-25 15:03:53 +02:00
engine.cpp Merge remote-tracking branch 'upstream/master' into multiple_esm_esp 2012-11-25 14:12:44 +01:00
engine.hpp Manually convert last changes in branch to upstream/master. Regular merge attempt resulted in everything being overwritten by fast-forward merging. 2012-10-07 20:00:55 +02:00
main.cpp Merge remote-tracking branch 'upstream/next' into multiple_esm_esp 2012-11-06 20:37:29 +01:00