Marc Zinnschlag f9d2fde783 Merge branch 'openmw-29' ...

Conflicts:
	apps/openmw/mwmechanics/aicombat.cpp

2014-03-04 09:34:38 +01:00

..

aipackage.cpp

added missing consts to record save functions

2013-09-16 12:32:35 +02:00

aipackage.hpp

Implemented script commands StartCombat, StopCombat, GetTarget.

2014-01-07 04:43:06 +04:00

attr.cpp

Handle werewolf stats

2013-08-09 05:14:58 -07:00

attr.hpp

Handle werewolf stats

2013-08-09 05:14:58 -07:00

cellid.cpp

various bits of cleanup

2014-02-23 21:39:18 +01:00

cellid.hpp

various bits of cleanup

2014-02-23 21:39:18 +01:00

cellref.cpp

reduced object state for objects in containers

2014-01-28 13:49:59 +01:00

cellref.hpp

reduced object state for objects in containers

2014-01-28 13:49:59 +01:00

cellstate.cpp

store cell state in saved game files (no references yet)

2014-01-23 11:29:40 +01:00

cellstate.hpp

store cell state in saved game files (no references yet)

2014-01-23 11:29:40 +01:00

containerstate.cpp

store content of containers in saved game files

2014-01-31 13:25:32 +01:00

containerstate.hpp

store content of containers in saved game files

2014-01-31 13:25:32 +01:00

creaturestate.cpp

partially store creature state in saved game files (only attributes and dynamics for now)

2014-02-16 15:56:36 +01:00

creaturestate.hpp

partially store creature state in saved game files (only attributes and dynamics for now)

2014-02-16 15:56:36 +01:00

creaturestats.cpp

partially store creature state in saved game files (only attributes and dynamics for now)

2014-02-16 15:56:36 +01:00

creaturestats.hpp

partially store creature state in saved game files (only attributes and dynamics for now)

2014-02-16 15:56:36 +01:00

defs.hpp

store list of known topics in saved game files

2014-02-16 12:54:27 +01:00

dialoguestate.cpp

store list of known topics in saved game files

2014-02-16 12:54:27 +01:00

dialoguestate.hpp

store list of known topics in saved game files

2014-02-16 12:54:27 +01:00

effectlist.cpp

added missing consts to record save functions

2013-09-16 12:32:35 +02:00

effectlist.hpp

added missing consts to record save functions

2013-09-16 12:32:35 +02:00

esmcommon.hpp

moved header record struct to separate file

2013-03-12 09:16:03 +01:00

esmreader.cpp

fix to content file reading error reporting in case of missing dependency

2013-12-16 11:39:24 +01:00

esmreader.hpp

fix to content file reading error reporting in case of missing dependency

2013-12-16 11:39:24 +01:00

esmwriter.cpp

Fix Windows save & load.

2014-02-22 12:15:20 +11:00

esmwriter.hpp

fixed record size type

2014-02-22 17:31:44 +01:00

filter.cpp

added project scope filter saving

2013-09-27 13:56:40 +02:00

filter.hpp

added project scope filter saving

2013-09-27 13:56:40 +02:00

globalmap.cpp

Save/load global map

2014-01-25 19:06:14 +01:00

globalmap.hpp

Save/load global map

2014-01-25 19:06:14 +01:00

globalscript.cpp

store global script state in saved game files

2013-12-15 16:16:50 +01:00

globalscript.hpp

store global script state in saved game files

2013-12-15 16:16:50 +01:00

inventorystate.cpp

store content of containers in saved game files

2014-01-31 13:25:32 +01:00

inventorystate.hpp

store content of containers in saved game files

2014-01-31 13:25:32 +01:00

journalentry.cpp

Feature #764: Store the actor that gave the dialog response

2014-02-01 18:42:01 +01:00

journalentry.hpp

Feature #764: Store the actor that gave the dialog response

2014-02-01 18:42:01 +01:00

lightstate.cpp

store additional state of lights in saved game files

2014-01-30 12:37:33 +01:00

lightstate.hpp

store additional state of lights in saved game files

2014-01-30 12:37:33 +01:00

loadacti.cpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadacti.hpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadalch.cpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadalch.hpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadappa.cpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadappa.hpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadarmo.cpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadarmo.hpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadbody.cpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadbody.hpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadbook.cpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadbook.hpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadbsgn.cpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadbsgn.hpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadcell.cpp

Merge branch 'savedgame'

2014-02-01 18:16:32 +01:00

loadcell.hpp

Merge branch 'savedgame'

2014-02-01 18:16:32 +01:00

loadclas.cpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadclas.hpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadclot.cpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadclot.hpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadcont.cpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadcont.hpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadcrea.cpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadcrea.hpp

Closes #1086: Implement blood effects

2014-01-17 11:27:13 +01:00

loadcrec.hpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loaddial.cpp

Merge branch 'dialogue' into saving

2013-10-21 16:45:43 +02:00

loaddial.hpp

Merge branch 'dialogue' into saving

2013-10-21 16:45:43 +02:00

loaddoor.cpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loaddoor.hpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadench.cpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadench.hpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadfact.cpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadfact.hpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadglob.cpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadglob.hpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadgmst.cpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadgmst.hpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadinfo.cpp

save info records

2013-11-11 12:21:26 +01:00

loadinfo.hpp

Don't complain about greetings with no sound

2014-01-22 00:02:43 +01:00

loadingr.cpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadingr.hpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadland.cpp

Merge branch 'master' into savedgame

2013-12-07 12:27:06 +01:00

loadland.hpp

Various fixes for CppCheck warnings.

2013-12-06 07:36:16 +01:00

loadlevlist.cpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadlevlist.hpp

Closes #1092: Implement sleep interruption. Fix levelled list flags for creatures. Change World::copyObjectToCell to search for the correct cell.

2014-01-14 07:42:03 +01:00

loadligh.cpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadligh.hpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadlock.cpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadlock.hpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadltex.cpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadltex.hpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadmgef.cpp

Copy paste mistake (oops)

2013-11-16 14:44:31 +01:00

loadmgef.hpp

Remove unused magic effect flags and update esmtool output

2014-01-12 01:25:00 +01:00

loadmisc.cpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadmisc.hpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadnpc.cpp

Fixes #1006: Many NPCs have 0 skill

2013-12-08 21:47:43 +01:00

loadnpc.hpp

NPC. Still WIP.

2013-12-27 22:13:55 +01:00

loadnpcc.hpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadpgrd.cpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadpgrd.hpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadprob.cpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadprob.hpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadrace.cpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadrace.hpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadregn.cpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadregn.hpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadrepa.cpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadrepa.hpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadscpt.cpp

fixed a memory leak in the script record

2013-12-15 16:19:45 +01:00

loadscpt.hpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadskil.cpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadskil.hpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadsndg.cpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadsndg.hpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadsoun.cpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadsoun.hpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadspel.cpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadspel.hpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadsscr.cpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadsscr.hpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadstat.cpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadstat.hpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadtes3.cpp

Merge branch 'master' into HEAD

2014-01-06 00:23:17 +01:00

loadtes3.hpp

various ESMWriter fixes

2013-09-15 15:00:15 +02:00

loadweap.cpp

make 4 byte record type accessable from record struct

2013-09-24 13:17:28 +02:00

loadweap.hpp

remove CreatureStats::mAttackType, set/getAttackType()

2014-01-27 23:05:17 +02:00

locals.cpp

store global script state in saved game files

2013-12-15 16:16:50 +01:00

locals.hpp

store global script state in saved game files

2013-12-15 16:16:50 +01:00

npcstate.cpp

store NPC state in saved game files

2014-02-16 15:51:45 +01:00

npcstate.hpp

store NPC state in saved game files

2014-02-16 15:51:45 +01:00

npcstats.cpp

store NPC state in saved game files

2014-02-16 15:51:45 +01:00

npcstats.hpp

store NPC state in saved game files

2014-02-16 15:51:45 +01:00

objectstate.cpp

store content of containers in saved game files

2014-01-31 13:25:32 +01:00

objectstate.hpp

made object state polymorphic

2014-01-28 13:53:24 +01:00

player.cpp

added missing birthsign field to player state record

2014-01-17 10:51:52 +01:00

player.hpp

added creature/NPC state to saved games (only container/inventory for now)

2014-02-01 17:36:23 +01:00

queststate.cpp

fixed QuestState::load/save

2013-12-03 13:51:44 +01:00

queststate.hpp

added records for storing journals in saved game files

2013-11-30 14:41:12 +01:00

records.hpp

Split up components/esm/loadlocks

2013-03-22 05:50:54 +01:00

savedgame.cpp

Implement savegame screenshots

2014-01-24 17:49:16 +01:00

savedgame.hpp

Implement savegame screenshots

2014-01-24 17:49:16 +01:00

spelllist.cpp

added missing consts to record save functions

2013-09-16 12:32:35 +02:00

spelllist.hpp

added missing consts to record save functions

2013-09-16 12:32:35 +02:00

statstate.hpp

partially store creature state in saved game files (only attributes and dynamics for now)

2014-02-16 15:56:36 +01:00

variant.cpp

fixed a bug in ESM::Variant::write (was affecting string values)

2013-03-21 12:57:10 +01:00

variant.hpp

store global script state in saved game files

2013-12-15 16:16:50 +01:00

variantimp.cpp

fixed write function for ESM variant type

2013-09-27 13:17:04 +02:00

variantimp.hpp

added variant class

2013-03-04 14:32:23 +01:00