Marc Zinnschlag 8be3ffc2a0 Merge remote-tracking branch 'scrawl/magic' ...

Conflicts:
	apps/openmw/mwworld/worldimp.cpp

2013-11-09 10:54:51 +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

…

actionalchemy.hpp

…

actionapply.cpp

…

actionapply.hpp

…

actiondoor.cpp

…

actiondoor.hpp

…

actioneat.cpp

…

actioneat.hpp

…

actionequip.cpp

Remove some unnecessary fields from Ptr

2013-08-14 17:05:42 -07:00

actionequip.hpp

…

actionopen.cpp

…

actionopen.hpp

…

actionread.cpp

…

actionread.hpp

…

actionrepair.cpp

…

actionrepair.hpp

…

actionsoulgem.cpp

…

actionsoulgem.hpp

…

actiontake.cpp

Auto-equip when items are added to the inventory

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

actiontake.hpp

…

actiontalk.cpp

…

actiontalk.hpp

…

actionteleport.cpp

…

actionteleport.hpp

…

cellfunctors.hpp

…

cells.cpp

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

2013-08-15 14:45:13 +02: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

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

2013-08-15 14:45:13 +02: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

Item stacking case sensitivity fix

2013-09-07 01:00:38 +02:00

containerstore.hpp

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

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

contentloader.hpp

Missing iostream include

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

customdata.hpp

…

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 'saving' into openmw-27

2013-11-04 08:57:32 +01:00

esmstore.hpp

Refactored loading screen

2013-08-27 15:48:13 +02: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

…

fallback.hpp

…

globals.cpp

…

globals.hpp

…

inventorystore.cpp

Remove some unnecessary fields from Ptr

2013-08-14 17:05:42 -07:00

inventorystore.hpp

Auto-equip when items are added to the inventory

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

livecellref.hpp

Store the object class in the LiveCellRef

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

localscripts.cpp

…

localscripts.hpp

…

manualref.hpp

…

nullaction.hpp

…

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

Store the object class in the LiveCellRef

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

recordcmp.hpp

…

refdata.cpp

…

refdata.hpp

…

scene.cpp

Refactored loading screen

2013-08-27 15:48:13 +02:00

scene.hpp

Refactored loading screen

2013-08-27 15:48:13 +02:00

store.cpp

Some changes suggested by cppcheck

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

store.hpp

COC Command: Exterior cell selection fix.

2013-10-12 14:48:37 -05:00

timestamp.cpp

…

timestamp.hpp

…

weather.cpp

Fix weather sounds persisting on a new game

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

weather.hpp

Fix weather sounds persisting on a new game

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

worldimp.cpp

Merge remote-tracking branch 'scrawl/magic'

2013-11-09 10:54:51 +01:00

worldimp.hpp

Merge remote-tracking branch 'scrawl/magic'

2013-11-09 10:54:51 +01:00