openmw-tes3coop/apps/openmw/mwworld
David Cernat 3136a12051 Resolve conflicts in pull request #75
# Conflicts:
#	CMakeLists.txt
#	apps/openmw/CMakeLists.txt
2016-10-14 18:34:17 +03:00
..
action.cpp Implement and use getDistanceToFacedObject() 2016-07-08 23:28:49 +09:00
action.hpp Implement and use getDistanceToFacedObject() 2016-07-08 23:28:49 +09:00
actionalchemy.cpp
actionalchemy.hpp
actionapply.cpp
actionapply.hpp
actiondoor.cpp
actiondoor.hpp
actioneat.cpp
actioneat.hpp
actionequip.cpp
actionequip.hpp
actionopen.cpp
actionopen.hpp
actionread.cpp
actionread.hpp
actionrepair.cpp
actionrepair.hpp
actionsoulgem.cpp
actionsoulgem.hpp
actiontake.cpp
actiontake.hpp
actiontalk.cpp
actiontalk.hpp
actionteleport.cpp Do not adjust the player position when loading a savegame (Fixes #2089) 2016-03-24 17:18:08 +01:00
actionteleport.hpp
actiontrap.cpp Implement and use getDistanceToFacedObject() 2016-07-08 23:28:49 +09:00
actiontrap.hpp Play trap activation sound on trapped object, not actor 2016-07-10 21:39:53 +09:00
cellpreloader.cpp Add "preload instances" setting, disabling this may help if you are low on memory. 2016-03-30 00:13:37 +02:00
cellpreloader.hpp Add "preload instances" setting, disabling this may help if you are low on memory. 2016-03-30 00:13:37 +02:00
cellref.cpp
cellref.hpp
cellreflist.hpp Fix possible reference duplication when the refID is modified by a plugin (Bug #3471) 2016-07-22 03:58:23 +02:00
cells.cpp Replace "sys::default" with ESM::CellId::sDefaultWorldspace 2016-07-02 19:48:11 +02:00
cells.hpp
cellstore.cpp Merge pull request #29 from OpenMW/master 2016-08-04 00:56:36 +03:00
cellstore.hpp Fix possible reference duplication when the refID is modified by a plugin (Bug #3471) 2016-07-22 03:58:23 +02:00
cellvisitors.hpp
class.cpp Do not show uncarriable lights in item views 2016-09-24 18:01:31 +02:00
class.hpp Do not show uncarriable lights in item views 2016-09-24 18:01:31 +02:00
containerstore.cpp Fix uninitialized variable 2016-10-11 14:50:13 +02:00
containerstore.hpp Make actors with non-portable lights in inventory glow (Closes #2042, #3338) 2016-10-08 23:17:12 +02:00
contentloader.hpp
customdata.cpp Use the const version of CustomData::as* 2015-12-19 16:19:52 +01:00
customdata.hpp Use the const version of CustomData::as* 2015-12-19 16:19:52 +01:00
esmloader.cpp
esmloader.hpp
esmstore.cpp Add support for placing BodyParts in a cell (Bug #3118) 2016-07-07 23:50:48 +08:00
esmstore.hpp
failedaction.cpp Play locked sounds on locked objects instead of actors 2016-08-10 21:31:14 +09:00
failedaction.hpp Play locked sounds on locked objects instead of actors 2016-08-10 21:31:14 +09:00
globals.cpp
globals.hpp
inventorystore.cpp Make actors with non-portable lights in inventory glow (Closes #2042, #3338) 2016-10-08 23:17:12 +02:00
inventorystore.hpp Make actors with non-portable lights in inventory glow (Closes #2042, #3338) 2016-10-08 23:17:12 +02:00
livecellref.cpp Make player references cross exterior cells only when called by server 2016-07-20 03:26:25 +03:00
livecellref.hpp Make player references cross exterior cells only when called by server 2016-07-20 03:26:25 +03:00
localscripts.cpp LocalScripts: initialize mIter 2016-07-07 23:50:47 +08:00
localscripts.hpp Vanilla-compatible activate / onActivate (Fixes #1629) 2016-02-26 13:08:35 +01:00
manualref.cpp Add support for placing BodyParts in a cell (Bug #3118) 2016-07-07 23:50:48 +08:00
manualref.hpp
nullaction.hpp Add isNullAction() method to fix compiler warning 2016-06-11 18:26:20 +02:00
player.cpp Don't allow the player to activate objects when dead 2016-10-13 14:42:10 +02:00
player.hpp Fix the enemy nearby check (Bug #3423) 2016-06-07 01:55:34 +02:00
projectilemanager.cpp Initialize speed for magic projectiles 2016-09-14 21:39:44 +02:00
projectilemanager.hpp Use particle textures for spell projectiles 2016-09-08 23:56:54 +09:00
ptr.cpp Accept a ConstPtr in findContainer, collision script functions, getUnderwater functions 2015-12-18 17:56:48 +01:00
ptr.hpp Accept a ConstPtr in ContainerStore::stacks 2015-12-18 17:01:21 +01:00
recordcmp.hpp
refdata.cpp Fix animation state not saving 2016-09-15 16:11:54 +02:00
refdata.hpp Save scripted animation state (Fixes #1931, #2150, #3393) 2016-08-03 03:52:35 +02:00
scene.cpp Fix the adjustPlayerPos parameter not being respected in all cases 2016-03-30 01:54:03 +02:00
scene.hpp Do not adjust the player position when loading a savegame (Fixes #2089) 2016-03-24 17:18:08 +01:00
store.cpp Fix moved references disappearing when modified by a plugin 2016-07-22 02:12:03 +02:00
store.hpp
timestamp.cpp Correct an error in the timestamp subtracting logic (Fixes #3105) 2015-12-26 00:26:13 +01:00
timestamp.hpp
weather.cpp clang says that these must be in the MWWorld namespace 2016-08-14 16:17:09 +02:00
weather.hpp Move Fallback map to components/ 2016-01-11 23:10:16 +01:00
worldimp.cpp Merge pull request #74 from OpenMW/master 2016-10-06 06:16:09 +03:00
worldimp.hpp Coverity fixes 2016-10-05 23:32:26 +09:00