Mark Siewert 1f961d575e Merge remote-tracking branch 'upstream/master' into multiple_esm_esp ...

Conflicts:
	apps/openmw/mwrender/terrain.cpp
	components/esm/loadland.hpp
	components/esm_store/reclists.hpp

2012-10-07 20:35:54 +02:00

..

aipackage.cpp

remove underscores from filenames in esm

2012-09-23 23:12:10 +04:00

aipackage.hpp

remove underscores from filenames in esm

2012-09-23 23:12:10 +04:00

attr.cpp

resolving conflicts, minor update

2012-09-17 11:37:50 +04:00

attr.hpp

remove underscores in guards

2012-09-23 22:11:08 +04:00

defs.hpp

wipe record superclass

2012-10-01 00:51:54 +04:00

effectlist.cpp

remove underscores from filenames in esm

2012-09-23 23:12:10 +04:00

effectlist.hpp

resolving conflicts, minor update

2012-09-17 11:37:50 +04:00

esmcommon.hpp

wipe record superclass

2012-10-01 00:51:54 +04:00

esmreader.cpp

remove underscores from filenames in esm

2012-09-23 23:12:10 +04:00

esmreader.hpp

Merge remote-tracking branch 'upstream/master' into multiple_esm_esp

2012-10-07 20:35:54 +02:00

esmwriter.cpp

remove underscores from filenames in esm

2012-09-23 23:12:10 +04:00

esmwriter.hpp

remove underscores from filenames in esm

2012-09-23 23:12:10 +04:00

loadacti.cpp

remove underscores from filenames in esm

2012-09-23 23:12:10 +04:00

loadacti.hpp

wipe record superclass

2012-10-01 00:51:54 +04:00

loadalch.cpp

remove underscores from filenames in esm

2012-09-23 23:12:10 +04:00

loadalch.hpp

wipe record superclass

2012-10-01 00:51:54 +04:00

loadappa.cpp

remove underscores from filenames in esm

2012-09-23 23:12:10 +04:00

loadappa.hpp

wipe record superclass

2012-10-01 00:51:54 +04:00

loadarmo.cpp

remove underscores from filenames in esm

2012-09-23 23:12:10 +04:00

loadarmo.hpp

wipe record superclass

2012-10-01 00:51:54 +04:00

loadbody.cpp

remove underscores from filenames in esm

2012-09-23 23:12:10 +04:00

loadbody.hpp

wipe record superclass

2012-10-01 00:51:54 +04:00

loadbook.cpp

change books to RecListWithIDT

2012-09-25 21:38:34 +02:00

loadbook.hpp

wipe record superclass

2012-10-01 00:51:54 +04:00

loadbsgn.cpp

remove underscores from filenames in esm

2012-09-23 23:12:10 +04:00

loadbsgn.hpp

wipe record superclass

2012-10-01 00:51:54 +04:00

loadcell.cpp

rm record inheritance, rework esmtool accordingly

2012-09-30 23:34:53 +04:00

loadcell.hpp

wipe record superclass

2012-10-01 00:51:54 +04:00

loadclas.cpp

remove underscores from filenames in esm

2012-09-23 23:12:10 +04:00

loadclas.hpp

wipe record superclass

2012-10-01 00:51:54 +04:00

loadclot.cpp

remove underscores from filenames in esm

2012-09-23 23:12:10 +04:00

loadclot.hpp

wipe record superclass

2012-10-01 00:51:54 +04:00

loadcont.cpp

remove underscores from filenames in esm

2012-09-23 23:12:10 +04:00

loadcont.hpp

wipe record superclass

2012-10-01 00:51:54 +04:00

loadcrea.cpp

remove underscores from filenames in esm

2012-09-23 23:12:10 +04:00

loadcrea.hpp

wipe record superclass

2012-10-01 00:51:54 +04:00

loadcrec.hpp

wipe record superclass

2012-10-01 00:51:54 +04:00

loaddial.cpp

remove underscores from filenames in esm

2012-09-23 23:12:10 +04:00

loaddial.hpp

wipe record superclass

2012-10-01 00:51:54 +04:00

loaddoor.cpp

remove underscores from filenames in esm

2012-09-23 23:12:10 +04:00

loaddoor.hpp

wipe record superclass

2012-10-01 00:51:54 +04:00

loadench.cpp

remove underscores from filenames in esm

2012-09-23 23:12:10 +04:00

loadench.hpp

wipe record superclass

2012-10-01 00:51:54 +04:00

loadfact.cpp

remove underscores from filenames in esm

2012-09-23 23:12:10 +04:00

loadfact.hpp

wipe record superclass

2012-10-01 00:51:54 +04:00

loadglob.cpp

remove underscores from filenames in esm

2012-09-23 23:12:10 +04:00

loadglob.hpp

wipe record superclass

2012-10-01 00:51:54 +04:00

loadgmst.cpp

initial resolving

2012-10-01 00:23:49 +04:00

loadgmst.hpp

wipe record superclass

2012-10-01 00:51:54 +04:00

loadinfo.cpp

rm record inheritance, rework esmtool accordingly

2012-09-30 23:34:53 +04:00

loadinfo.hpp

wipe record superclass

2012-10-01 00:51:54 +04:00

loadingr.cpp

remove underscores from filenames in esm

2012-09-23 23:12:10 +04:00

loadingr.hpp

wipe record superclass

2012-10-01 00:51:54 +04:00

loadland.cpp

Merge remote-tracking branch 'upstream/master' into multiple_esm_esp

2012-10-07 20:35:54 +02:00

loadland.hpp

Merge remote-tracking branch 'upstream/master' into multiple_esm_esp

2012-10-07 20:35:54 +02:00

loadlevlist.cpp

remove underscores from filenames in esm

2012-09-23 23:12:10 +04:00

loadlevlist.hpp

wipe record superclass

2012-10-01 00:51:54 +04:00

loadligh.cpp

remove underscores from filenames in esm

2012-09-23 23:12:10 +04:00

loadligh.hpp

wipe record superclass

2012-10-01 00:51:54 +04:00

loadlocks.cpp

remove underscores from filenames in esm

2012-09-23 23:12:10 +04:00

loadlocks.hpp

wipe record superclass

2012-10-01 00:51:54 +04:00

loadltex.cpp

remove underscores from filenames in esm

2012-09-23 23:12:10 +04:00

loadltex.hpp

wipe record superclass

2012-10-01 00:51:54 +04:00

loadmgef.cpp

remove underscores from filenames in esm

2012-09-23 23:12:10 +04:00

loadmgef.hpp

wipe record superclass

2012-10-01 00:51:54 +04:00

loadmisc.cpp

remove underscores from filenames in esm

2012-09-23 23:12:10 +04:00

loadmisc.hpp

wipe record superclass

2012-10-01 00:51:54 +04:00

loadnpc.cpp

remove underscores from filenames in esm

2012-09-23 23:12:10 +04:00

loadnpc.hpp

wipe record superclass

2012-10-01 00:51:54 +04:00

loadnpcc.hpp

wipe record superclass

2012-10-01 00:51:54 +04:00

loadpgrd.cpp

remove underscores from filenames in esm

2012-09-23 23:12:10 +04:00

loadpgrd.hpp

wipe record superclass

2012-10-01 00:51:54 +04:00

loadrace.cpp

remove underscores from filenames in esm

2012-09-23 23:12:10 +04:00

loadrace.hpp

wipe record superclass

2012-10-01 00:51:54 +04:00

loadregn.cpp

remove underscores from filenames in esm

2012-09-23 23:12:10 +04:00

loadregn.hpp

wipe record superclass

2012-10-01 00:51:54 +04:00

loadscpt.cpp

remove underscores from filenames in esm

2012-09-23 23:12:10 +04:00

loadscpt.hpp

wipe record superclass

2012-10-01 00:51:54 +04:00

loadskil.cpp

remove underscores from filenames in esm

2012-09-23 23:12:10 +04:00

loadskil.hpp

wipe record superclass

2012-10-01 00:51:54 +04:00

loadsndg.cpp

remove underscores from filenames in esm

2012-09-23 23:12:10 +04:00

loadsndg.hpp

wipe record superclass

2012-10-01 00:51:54 +04:00

loadsoun.cpp

remove underscores from filenames in esm

2012-09-23 23:12:10 +04:00

loadsoun.hpp

wipe record superclass

2012-10-01 00:51:54 +04:00

loadspel.cpp

remove underscores from filenames in esm

2012-09-23 23:12:10 +04:00

loadspel.hpp

wipe record superclass

2012-10-01 00:51:54 +04:00

loadsscr.cpp

remove underscores from filenames in esm

2012-09-23 23:12:10 +04:00

loadsscr.hpp

wipe record superclass

2012-10-01 00:51:54 +04:00

loadstat.cpp

remove underscores from filenames in esm

2012-09-23 23:12:10 +04:00

loadstat.hpp

wipe record superclass

2012-10-01 00:51:54 +04:00

loadweap.cpp

remove underscores from filenames in esm

2012-09-23 23:12:10 +04:00

loadweap.hpp

wipe record superclass

2012-10-01 00:51:54 +04:00

records.hpp

wipe record superclass

2012-10-01 00:51:54 +04:00

spelllist.cpp

remove underscores from filenames in esm

2012-09-23 23:12:10 +04:00

spelllist.hpp

resolving conflicts, minor update

2012-09-17 11:37:50 +04:00