Marc Zinnschlag 030c733e2d Merge branch 'master' into savedgame ...

Conflicts:
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwworld/worldimp.cpp
	files/settings-default.cfg

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

..

action.cpp

Old door sound fades out on door open/close. Door sound is synchronised to angle on action.

2013-07-31 15:46:23 +02:00

action.hpp

Old door sound fades out on door open/close. Door sound is synchronised to angle on action.

2013-07-31 15:46:23 +02:00

actionalchemy.cpp

Reverted previous commits, and handle disallowed inventory in MWWorld::Class. Wanted to avoid this, but the previous solution broke teleport door sounds. Also fixed book/scroll window take button showing when inventory was not allowed.

2013-02-17 15:56:22 +01:00

actionalchemy.hpp

Reverted previous commits, and handle disallowed inventory in MWWorld::Class. Wanted to avoid this, but the previous solution broke teleport door sounds. Also fixed book/scroll window take button showing when inventory was not allowed.

2013-02-17 15:56:22 +01:00

actionapply.cpp

Reverted previous commits, and handle disallowed inventory in MWWorld::Class. Wanted to avoid this, but the previous solution broke teleport door sounds. Also fixed book/scroll window take button showing when inventory was not allowed.

2013-02-17 15:56:22 +01:00

actionapply.hpp

Projectile models are now spawned (no movement or impact yet). Refactored trap activation to apply range types properly. Handle ContinuousVFX for magic effects (note they aren't stopped yet when the effect ends)

2013-11-13 14:02:15 +01:00

actiondoor.cpp

Opening doors

2013-04-28 14:59:15 +02:00

actiondoor.hpp

Opening doors

2013-04-28 14:59:15 +02:00

actioneat.cpp

Lots of cleanup. Implemented Absorb and Resist. Implemented several instant effects. Added hand VFX.

2013-11-17 23:31:08 +01:00

actioneat.hpp

Reverted previous commits, and handle disallowed inventory in MWWorld::Class. Wanted to avoid this, but the previous solution broke teleport door sounds. Also fixed book/scroll window take button showing when inventory was not allowed.

2013-02-17 15:56:22 +01:00

actionequip.cpp

Fix a bug with equipping using the quick keys: when item is already equipped, equipping it again would cause the slot to get unequipped first, possibly restacking and destroying the Ptr that was supposed to be equipped in the first place

2013-11-17 23:31:07 +01:00

actionequip.hpp

Reverted previous commits, and handle disallowed inventory in MWWorld::Class. Wanted to avoid this, but the previous solution broke teleport door sounds. Also fixed book/scroll window take button showing when inventory was not allowed.

2013-02-17 15:56:22 +01:00

actionopen.cpp

Added "dispose corpse" button, added stealing (all items visible and no penalty yet)

2013-03-07 14:00:13 +01:00

actionopen.hpp

Added "dispose corpse" button, added stealing (all items visible and no penalty yet)

2013-03-07 14:00:13 +01:00

actionread.cpp

Reverted previous commits, and handle disallowed inventory in MWWorld::Class. Wanted to avoid this, but the previous solution broke teleport door sounds. Also fixed book/scroll window take button showing when inventory was not allowed.

2013-02-17 15:56:22 +01:00

actionread.hpp

Reverted previous commits, and handle disallowed inventory in MWWorld::Class. Wanted to avoid this, but the previous solution broke teleport door sounds. Also fixed book/scroll window take button showing when inventory was not allowed.

2013-02-17 15:56:22 +01:00

actionrepair.cpp

Added PC repair feature

2013-03-23 08:16:46 +01:00

actionrepair.hpp

Added PC repair feature

2013-03-23 08:16:46 +01:00

actionsoulgem.cpp

Added soulgem dialog; made interactive message boxes not close the previous UI

2013-03-30 15:51:07 +01:00

actionsoulgem.hpp

Added soulgem dialog; made interactive message boxes not close the previous UI

2013-03-30 15:51:07 +01:00

actiontake.cpp

Auto-equip when items are added to the inventory

2013-08-07 15:17:55 +02:00

actiontake.hpp

Reverted previous commits, and handle disallowed inventory in MWWorld::Class. Wanted to avoid this, but the previous solution broke teleport door sounds. Also fixed book/scroll window take button showing when inventory was not allowed.

2013-02-17 15:56:22 +01:00

actiontalk.cpp

Reverted previous commits, and handle disallowed inventory in MWWorld::Class. Wanted to avoid this, but the previous solution broke teleport door sounds. Also fixed book/scroll window take button showing when inventory was not allowed.

2013-02-17 15:56:22 +01:00

actiontalk.hpp

Reverted previous commits, and handle disallowed inventory in MWWorld::Class. Wanted to avoid this, but the previous solution broke teleport door sounds. Also fixed book/scroll window take button showing when inventory was not allowed.

2013-02-17 15:56:22 +01:00

actionteleport.cpp

Reverted previous commits, and handle disallowed inventory in MWWorld::Class. Wanted to avoid this, but the previous solution broke teleport door sounds. Also fixed book/scroll window take button showing when inventory was not allowed.

2013-02-17 15:56:22 +01:00

actionteleport.hpp

Reverted previous commits, and handle disallowed inventory in MWWorld::Class. Wanted to avoid this, but the previous solution broke teleport door sounds. Also fixed book/scroll window take button showing when inventory was not allowed.

2013-02-17 15:56:22 +01:00

actiontrap.cpp

Lots of cleanup. Implemented Absorb and Resist. Implemented several instant effects. Added hand VFX.

2013-11-17 23:31:08 +01:00

actiontrap.hpp

Projectile models are now spawned (no movement or impact yet). Refactored trap activation to apply range types properly. Handle ContinuousVFX for magic effects (note they aren't stopped yet when the effect ends)

2013-11-13 14:02:15 +01:00

cellfunctors.hpp

Fix crash when disabling objects in a previously loaded cell, then coming back to that cell and leaving again

2013-04-17 17:06:30 +02:00

cells.cpp

removed an outdated typedef and some dead code

2013-12-05 13:21:26 +01:00

cells.hpp

accessing references via their ID now also works for references in containers in active cells

2013-08-15 14:45:13 +02:00

cellstore.cpp

Don't crash when trying to delete a reference that doesn't exist anymore

2013-08-26 00:14:02 +02:00

cellstore.hpp

Don't list deleted refs in CellStore::foreach

2013-11-27 18:49:04 +01:00

class.cpp

Merge remote-tracking branch 'rainChu/torches'

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

class.hpp

Merge remote-tracking branch 'rainChu/torches'

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

containerstore.cpp

Add a utility function to add items to a ContainerStore by RefID

2013-11-21 17:14:30 +01:00

containerstore.hpp

Add a utility function to add items to a ContainerStore by RefID

2013-11-21 17:14:30 +01:00

contentloader.hpp

Missing iostream include

2013-11-04 10:36:22 +01:00

customdata.hpp

added customdata base class (issue #185)

2012-01-24 11:24:05 +01:00

esmloader.cpp

Issue #913: Merge --master and --plugin switches

2013-09-29 09:11:57 +02:00

esmloader.hpp

Issue #913: Merge --master and --plugin switches

2013-09-29 09:11:57 +02:00

esmstore.cpp

Merge branch 'master' into dialogue

2013-11-10 13:21:39 +01:00

esmstore.hpp

removed some junk from ESM store

2013-12-06 11:34:24 +01:00

failedaction.cpp

Handle object activation as a werewolf

2013-08-08 22:34:53 -07:00

failedaction.hpp

Handle object activation as a werewolf

2013-08-08 22:34:53 -07:00

fallback.cpp

some cleanup

2013-03-15 10:26:04 +01:00

fallback.hpp

some cleanup

2013-03-15 10:26:04 +01:00

globals.cpp

Insert records that may not exist in vanilla MW

2013-05-01 12:47:50 +02:00

globals.hpp

Added in text escape sequences for dialogue, messageboxes and books. builtins are placeholders, global variables work

2012-12-20 23:16:34 +00:00

inventorystore.cpp

Don't auto equip for dead actors

2013-11-19 18:42:43 +01:00

inventorystore.hpp

Recharge enchanted items in player's inventory over time

2013-11-19 16:42:24 +01:00

livecellref.hpp

Store the object class in the LiveCellRef

2013-08-19 20:39:37 +02:00

localscripts.cpp

removed an outdated typedef and some dead code

2013-12-05 13:21:26 +01:00

localscripts.hpp

objects scripts are now stopped when they are removed from a container

2013-01-13 17:05:12 +00:00

manualref.hpp

Add item count to ManualRef constructor as optional argument

2013-11-10 02:45:16 +01:00

nullaction.hpp

Reverted previous commits, and handle disallowed inventory in MWWorld::Class. Wanted to avoid this, but the previous solution broke teleport door sounds. Also fixed book/scroll window take button showing when inventory was not allowed.

2013-02-17 15:56:22 +01:00

omwloader.cpp

Issue #913: Merge --master and --plugin switches

2013-09-29 09:11:57 +02:00

omwloader.hpp

Issue #913: Merge --master and --plugin switches

2013-09-29 09:11:57 +02:00

physicssystem.cpp

Remove unused functions and parameters

2013-08-25 16:08:45 -07:00

physicssystem.hpp

Remove unused functions and parameters

2013-08-25 16:08:45 -07:00

player.cpp

Handle the pick/probe in the character controller

2013-08-06 19:48:59 -07:00

player.hpp

Handle the pick/probe in the character controller

2013-08-06 19:48:59 -07:00

ptr.cpp

Store the object class in the LiveCellRef

2013-08-19 20:39:37 +02:00

ptr.hpp

removed an outdated typedef and some dead code

2013-12-05 13:21:26 +01:00

recordcmp.hpp

Cell names localization fix

2012-12-23 23:23:24 +04:00

refdata.cpp

first round of cleaning up world cleanup

2013-12-05 12:49:25 +01:00

refdata.hpp

first round of cleaning up world cleanup

2013-12-05 12:49:25 +01:00

scene.cpp

Merge branch 'master' into savedgame

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

scene.hpp

removed an outdated typedef and some dead code

2013-12-05 13:21:26 +01:00

store.cpp

Some changes suggested by cppcheck

2013-07-31 18:46:32 +02:00

store.hpp

make sure player record stays in place across cleanups

2013-12-05 14:03:25 +01:00

timestamp.cpp

fixed time stamp operator

2012-08-11 11:38:26 +02:00

timestamp.hpp

Issue #256: added TimeStamp class

2012-05-18 22:04:22 +02:00

weather.cpp

Various fixes for CppCheck warnings.

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

weather.hpp

Fix weather sounds persisting on a new game

2013-08-29 15:16:08 +02:00

worldimp.cpp

Merge branch 'master' into savedgame

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

worldimp.hpp

Merge branch 'master' into savedgame

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