krageon/openmw-tes3coop
1
0
Fork 0
forked from teamnwah/openmw-tes3coop
Code Issues Pull requests Releases Wiki Activity
openmw-tes3coop/apps
History
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
..
esmtool Merge remote-tracking branch 'upstream/master' into multiple_esm_esp 2012-11-25 14:12:44 +01:00
launcher several missing includes 2012-11-14 05:32:23 +01:00
mwiniimporter disabling gcc extensions 2012-10-09 17:10:25 +02:00
openmw Merge remote-tracking branch 'upstream/master' into multiple_esm_esp 2012-11-25 14:12:44 +01:00
openmw_test_suite Added fix for not visible pthreads functions for linker with glibc 2.15 2012-08-20 00:18:40 +03:00
doc.hpp first set of additional doxygen comments 2010-09-25 15:03:53 +02:00