scrawl e1f4a7f647 Merge branch 'master' of https://github.com/OpenMW/openmw into osg ...

Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwgui/mainmenu.cpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwrender/animation.cpp
	apps/openmw/mwrender/debugging.cpp
	apps/openmw/mwrender/npcanimation.cpp
	apps/openmw/mwrender/renderingmanager.cpp
	apps/openmw/mwrender/sky.cpp
	components/nif/nifkey.hpp
	components/nif/nifstream.hpp
	components/nifbullet/bulletnifloader.cpp
	components/nifogre/ogrenifloader.hpp
	libs/openengine/bullet/physic.cpp
	libs/openengine/gui/manager.cpp

2015-05-04 02:41:50 +02:00

..

activespells.cpp

Savegame: store ActiveSpells

2014-05-14 23:54:15 +02:00

activespells.hpp

Savegame: store ActiveSpells

2014-05-14 23:54:15 +02:00

aipackage.cpp

Don't rely on subrecord order part 2

2015-02-12 05:43:22 +01:00

aipackage.hpp

reverted mShouldRepeat back to unsigned char.

2015-03-07 11:04:54 +13:00

aisequence.cpp

Store original actor position in AiWander package (Fixes #2200)

2015-01-01 03:38:49 +01:00

aisequence.hpp

reverted mShouldRepeat back to unsigned char.

2015-03-07 11:04:54 +13: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

fix -Wnewline-eof warnings

2015-03-11 10:54:45 -04:00

cellref.cpp

removed leftover ignoreRefNum argument

2015-04-29 12:09:30 +02:00

cellref.hpp

removed leftover ignoreRefNum argument

2015-04-29 12:09:30 +02:00

cellstate.cpp

Feature #32: Implement respawn for containers, creatures and NPCs

2014-05-17 09:09:00 +02:00

cellstate.hpp

Feature #32: Implement respawn for containers, creatures and NPCs

2014-05-17 09:09:00 +02:00

containerstate.cpp

fix -Wnewline-eof warnings

2015-03-11 10:54:45 -04:00

containerstate.hpp

store content of containers in saved game files

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

creaturelevliststate.cpp

Feature #32: Implement respawn for containers, creatures and NPCs

2014-05-17 09:09:00 +02:00

creaturelevliststate.hpp

Feature #32: Implement respawn for containers, creatures and NPCs

2014-05-17 09:09:00 +02:00

creaturestate.cpp

Don't require the object type id for reading references from savegames

2015-01-20 00:42:25 +01:00

creaturestate.hpp

ESSImport: player is placed in correct cell, npc cellrefs work

2015-01-18 20:01:50 +01:00

creaturestats.cpp

Remove friendly hits from the save file

2015-01-31 22:40:39 +01:00

creaturestats.hpp

Remove friendly hits from the save file

2015-01-31 22:40:39 +01:00

custommarkerstate.cpp

ESSImport: convert custom map markers, not working for interiors yet

2015-01-19 09:29:21 +01:00

custommarkerstate.hpp

ESSImport: convert custom map markers, not working for interiors yet

2015-01-19 09:29:21 +01:00

debugprofile.cpp

renamed the script field in DebugProfile to improve consistency

2014-08-22 13:38:03 +02:00

debugprofile.hpp

renamed the script field in DebugProfile to improve consistency

2014-08-22 13:38:03 +02:00

defs.hpp

Port EffectManager

2015-04-19 17:55:56 +02:00

dialoguestate.cpp

Fix loading faction reactions for older savegames (Fixes #2301)

2015-01-24 14:32:02 +01:00

dialoguestate.hpp

ESSImport: convert faction reactions and known dialogue topics

2015-01-20 15:56:07 +01:00

doorstate.cpp

Savegame: store door movement state (Closes #747)

2014-05-15 09:54:10 +02:00

doorstate.hpp

Savegame: store door movement state (Closes #747)

2014-05-15 09:54:10 +02:00

effectlist.cpp

Don't rely on subrecord order part 2

2015-02-12 05:43:22 +01:00

effectlist.hpp

Don't rely on subrecord order part 2

2015-02-12 05:43:22 +01:00

esmcommon.hpp

Remove no longer required strnlen wrapper

2015-03-18 23:37:54 +02:00

esmreader.cpp

Merge branch 'master' of https://github.com/OpenMW/openmw into osg

2015-05-04 02:41:50 +02:00

esmreader.hpp

OpenMW compiles and runs w/o render window

2015-04-01 17:02:15 +02:00

esmwriter.cpp

Silence -Wreorder warnings.

2015-04-28 18:48:02 -05:00

esmwriter.hpp

Remove some unused code, include cleanup

2015-01-27 23:12:13 +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

fogstate.cpp

Savegame: store fog of war (Closes #1177)

2014-05-11 02:07:58 +02:00

fogstate.hpp

Savegame: store fog of war (Closes #1177)

2014-05-11 02:07:58 +02:00

globalmap.cpp

Fix global map markers being duplicated when cell is visited again

2014-09-26 16:51:48 +02:00

globalmap.hpp

Fix global map markers being duplicated when cell is visited again

2014-09-26 16:51:48 +02:00

globalscript.cpp

fix -Wnewline-eof warnings

2015-03-11 10:54:45 -04:00

globalscript.hpp

ESSImport: convert running global scripts

2015-01-27 23:05:20 +01:00

inventorystate.cpp

Store selected enchant item in savegame (Fixes #1702)

2015-01-23 16:45:47 +01:00

inventorystate.hpp

Store selected enchant item in savegame (Fixes #1702)

2015-01-23 16:45:47 +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

loadacti.cpp

Don't rely on subrecord order part 2

2015-02-12 05:43:22 +01:00

loadacti.hpp

make 4 byte record type accessable from record struct

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

loadalch.cpp

Don't rely on subrecord order part 2

2015-02-12 05:43:22 +01:00

loadalch.hpp

make 4 byte record type accessable from record struct

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

loadappa.cpp

Don't rely on subrecord order part 2

2015-02-12 05:43:22 +01:00

loadappa.hpp

make 4 byte record type accessable from record struct

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

loadarmo.cpp

Don't rely on subrecord order when reading (Fixes #2361)

2015-02-10 23:19:33 +01:00

loadarmo.hpp

Don't rely on subrecord order when reading (Fixes #2361)

2015-02-10 23:19:33 +01:00

loadbody.cpp

Don't rely on subrecord order part 2

2015-02-12 05:43:22 +01:00

loadbody.hpp

loadnpc is still unfinished, bodypartcheck.cpp mFlags check fix

2014-09-03 14:40:32 +02:00

loadbook.cpp

Don't rely on subrecord order when reading (Fixes #2361)

2015-02-10 23:19:33 +01:00

loadbook.hpp

make 4 byte record type accessable from record struct

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

loadbsgn.cpp

Don't rely on subrecord order part 2

2015-02-12 05:43:22 +01:00

loadbsgn.hpp

make 4 byte record type accessable from record struct

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

loadcell.cpp

Loading of moved refs complete.

2015-04-26 12:18:23 +10:00

loadcell.hpp

Silence -Wreorder warnings.

2015-04-28 18:48:02 -05:00

loadclas.cpp

Don't rely on subrecord order part 2

2015-02-12 05:43:22 +01:00

loadclas.hpp

make 4 byte record type accessable from record struct

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

loadclot.cpp

Don't rely on subrecord order when reading (Fixes #2361)

2015-02-10 23:19:33 +01:00

loadclot.hpp

make 4 byte record type accessable from record struct

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

loadcont.cpp

Fix for bug #2428. Set default flag value (mandatory) for containers.

2015-03-06 11:53:46 +11:00

loadcont.hpp

Don't rely on subrecord order part 2

2015-02-12 05:43:22 +01:00

loadcrea.cpp

Add travel service support for creatures (Fixes #2432)

2015-03-09 03:15:11 +01:00

loadcrea.hpp

Add travel service support for creatures (Fixes #2432)

2015-03-09 03:15:11 +01:00

loaddial.cpp

Re-insert existing DialInfo records when they are modified by another content file (Fixes #2170)

2014-11-30 22:02:25 +01:00

loaddial.hpp

Properly handle DialInfo records that were marked as Deleted (Fixes #2035)

2014-10-19 17:46:28 +02:00

loaddoor.cpp

Don't rely on subrecord order when reading (Fixes #2361)

2015-02-10 23:19:33 +01:00

loaddoor.hpp

make 4 byte record type accessable from record struct

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

loadench.cpp

Don't rely on subrecord order part 2

2015-02-12 05:43:22 +01:00

loadench.hpp

added enchantments table

2014-06-30 20:40:34 +02:00

loadfact.cpp

Don't rely on subrecord order part 2

2015-02-12 05:43:22 +01:00

loadfact.hpp

Make ESM::Faction skills optional (Fixes #1508)

2014-06-16 02:52:16 +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

Remove comment about GMST cleaning which was removed.

2015-03-12 00:32:57 +01:00

loadinfo.cpp

DialInfo: Clear SelectStructs from previous loadings when a record is overwritten (Fixes #2017)

2014-10-16 19:35:20 +02:00

loadinfo.hpp

Improve INFO struct naming

2015-01-27 23:12:21 +01:00

loadingr.cpp

Don't rely on subrecord order part 2

2015-02-12 05:43:22 +01:00

loadingr.hpp

make 4 byte record type accessable from record struct

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

loadland.cpp

Silence -Wreorder warnings.

2015-04-28 18:48:02 -05:00

loadland.hpp

Terrain refactoring, reduce game startup time and memory usage

2015-01-29 03:39:01 +01:00

loadlevlist.cpp

Fix for deleting all items in a levelled list

2015-02-13 17:37:56 +01:00

loadlevlist.hpp

Normalise spelling of "levelled" throughout the code

2015-02-05 04:18:42 +01:00

loadligh.cpp

Don't rely on subrecord order part 2

2015-02-12 05:43:22 +01:00

loadligh.hpp

Don't right-shift signed integers which is implementation-defined

2015-01-08 16:27:13 +01:00

loadlock.cpp

Don't rely on subrecord order part 2

2015-02-12 05:43:22 +01:00

loadlock.hpp

make 4 byte record type accessable from record struct

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

loadltex.cpp

Implement terrain rendering in OpenCS (Fixes #1597)

2014-10-08 17:17:31 +02:00

loadltex.hpp

Implement terrain rendering in OpenCS (Fixes #1597)

2014-10-08 17:17:31 +02:00

loadmgef.cpp

Don't rely on subrecord order part 2

2015-02-12 05:43:22 +01:00

loadmgef.hpp

Don't rely on subrecord order part 2

2015-02-12 05:43:22 +01:00

loadmisc.cpp

Don't rely on subrecord order when reading (Fixes #2361)

2015-02-10 23:19:33 +01:00

loadmisc.hpp

make 4 byte record type accessable from record struct

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

loadnpc.cpp

Add travel service support for creatures (Fixes #2432)

2015-03-09 03:15:11 +01:00

loadnpc.hpp

Add travel service support for creatures (Fixes #2432)

2015-03-09 03:15:11 +01:00

loadpgrd.cpp

fixing MSVC 2013 warning C4244: & C4305

2015-03-08 13:07:29 +13:00

loadpgrd.hpp

load and save pathgrid records

2014-10-02 12:30:15 +02:00

loadprob.cpp

Don't rely on subrecord order part 2

2015-02-12 05:43:22 +01:00

loadprob.hpp

make 4 byte record type accessable from record struct

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

loadrace.cpp

fixing MSVC 2013 warning C4244: & C4305

2015-03-08 13:07:29 +13:00

loadrace.hpp

make 4 byte record type accessable from record struct

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

loadregn.cpp

ESM: Make sure to clear old list when a list is overwritten by another content file (Fixes #1932)

2014-09-20 13:34:20 +02:00

loadregn.hpp

done with header files, unsure about mSkills and mReputation in

2014-09-04 13:23:29 +02:00

loadrepa.cpp

Don't rely on subrecord order part 2

2015-02-12 05:43:22 +01:00

loadrepa.hpp

make 4 byte record type accessable from record struct

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

loadscpt.cpp

Merge branch 'master' of https://github.com/OpenMW/openmw into osg

2015-03-27 17:30:48 +01:00

loadscpt.hpp

Don't rely on subrecord order part 2

2015-02-12 05:43:22 +01:00

loadskil.cpp

Don't rely on subrecord order part 2

2015-02-12 05:43:22 +01:00

loadskil.hpp

make 4 byte record type accessable from record struct

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

loadsndg.cpp

Don't rely on subrecord order part 2

2015-02-12 05:43:22 +01:00

loadsndg.hpp

load and save sound gen records

2014-09-23 12:20:02 +02:00

loadsoun.cpp

Don't rely on subrecord order part 2

2015-02-12 05:43:22 +01:00

loadsoun.hpp

make 4 byte record type accessable from record struct

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

loadspel.cpp

Fix missing clear in ESM::Spell::load (Fixes #2368)

2015-02-13 17:26:33 +01:00

loadspel.hpp

Implement Hrnchamd's player and NPC autocalc spells (Some unclarities remaining, XXX)

2014-07-12 18:53:15 +02:00

loadsscr.cpp

load start up script records

2015-03-03 14:31:59 +01:00

loadsscr.hpp

load start up script records

2015-03-03 14:31:59 +01:00

loadstat.cpp

Remove persistent flag which will be unused

2015-04-02 17:33:24 +02:00

loadstat.hpp

Remove persistent flag which will be unused

2015-04-02 17:33:24 +02:00

loadtes3.cpp

Starting ESS importer for Morrowind save files

2015-01-17 00:16:49 +01:00

loadtes3.hpp

Don't rely on subrecord order part 2

2015-02-12 05:43:22 +01:00

loadweap.cpp

Don't rely on subrecord order when reading (Fixes #2361)

2015-02-10 23:19:33 +01:00

loadweap.hpp

remove CreatureStats::mAttackType, set/getAttackType()

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

locals.cpp

ESSImport: convert script local variables

2015-01-24 16:45:36 +01:00

locals.hpp

store global script state in saved game files

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

magiceffects.cpp

Store magic effect Base values in savegame (Fixes #1489)

2014-08-17 05:38:48 +02:00

magiceffects.hpp

Store magic effect Base values in savegame (Fixes #1489)

2014-08-17 05:38:48 +02:00

npcstate.cpp

Don't require the object type id for reading references from savegames

2015-01-20 00:42:25 +01:00

npcstate.hpp

ESSImport: player is placed in correct cell, npc cellrefs work

2015-01-18 20:01:50 +01:00

npcstats.cpp

Remove NpcStats::mProfit and store it in the script instead

2015-01-31 22:40:40 +01:00

npcstats.hpp

Remove NpcStats::mProfit and store it in the script instead

2015-01-31 22:40:40 +01:00

objectstate.cpp

Revert "Revert "Light charge handling fix""

2015-01-23 15:33:39 +01:00

objectstate.hpp

Revert "Revert "Light charge handling fix""

2015-01-23 15:33:39 +01:00

player.cpp

Don't require the object type id for reading references from savegames

2015-01-20 00:42:25 +01:00

player.hpp

Fix some spelling mistakes.

2014-05-03 12:23:22 +02:00

projectilestate.cpp

Savegame: store projectiles

2014-05-17 05:24:32 +02:00

projectilestate.hpp

Store original actor position in AiWander package (Fixes #2200)

2015-01-01 03:38:49 +01:00

queststate.cpp

fix -Wnewline-eof warnings

2015-03-11 10:54:45 -04:00

queststate.hpp

ESSImport: convert journal indices

2015-01-27 23:12:21 +01:00

quickkeys.cpp

Savegame: store most of CreatureStats

2014-05-12 21:37:36 +02:00

quickkeys.hpp

Move to esm component

2014-05-02 12:48:07 +02:00

records.hpp

Remove some unused code, include cleanup

2015-01-27 23:12:13 +01:00

savedgame.cpp

Bug #1224: Changed fix to potentially allow for language independent saves

2014-03-27 22:32:42 +01:00

savedgame.hpp

Bug #1224: Changed fix to potentially allow for language independent saves

2014-03-27 22:32:42 +01:00

spelllist.cpp

Don't rely on subrecord order part 2

2015-02-12 05:43:22 +01:00

spelllist.hpp

Don't rely on subrecord order part 2

2015-02-12 05:43:22 +01:00

spellstate.cpp

Implement removal of corprus spells

2014-08-22 03:34:31 +02:00

spellstate.hpp

Don't clear known spells when reading from the savegame

2015-01-23 15:34:14 +01:00

statstate.hpp

fixing MSVC 2013 warning C4244: & C4305

2015-03-08 13:07:29 +13:00

stolenitems.cpp

Stolen item tracking overhaul part 2 (Fixes #2338)

2015-02-06 01:27:16 +01:00

stolenitems.hpp

Stolen item tracking overhaul part 2 (Fixes #2338)

2015-02-06 01:27:16 +01:00

transport.cpp

Add travel service support for creatures (Fixes #2432)

2015-03-09 03:15:11 +01:00

transport.hpp

Add travel service support for creatures (Fixes #2432)

2015-03-09 03:15:11 +01:00

util.hpp

Store original actor position in AiWander package (Fixes #2200)

2015-01-01 03:38:49 +01:00

variant.cpp

ESSImport: convert script local variables

2015-01-24 16:45:36 +01:00

variant.hpp

ESSImport: convert script local variables

2015-01-24 16:45:36 +01:00

variantimp.cpp

fixing MSVC 2013 warning C4244: & C4305

2015-03-08 13:07:29 +13:00

variantimp.hpp

added variant class

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

weatherstate.cpp

Move weather state save/load to a new class

2014-03-21 01:19:40 -05:00

weatherstate.hpp

Fixed header include guard to match filename

2014-03-21 01:22:54 -05:00