1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 22:19:54 +00:00
openmw-tes3mp/apps/openmw/mwworld
scrawl 41c571d4f4 Merge branch 'master' of https://github.com/OpenMW/openmw into lighting
Conflicts:
	apps/opencs/view/render/instancemode.cpp
2016-01-15 15:46:10 +01:00
..
action.cpp Replace Play_NoTrack with playManualSound3D, and rename the latter 2015-11-25 04:24:26 -08: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 Added MWMechanics::isPlayerInCombat() 2015-09-10 18:48:34 +12: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 Added MWMechanics::isPlayerInCombat() 2015-09-10 18:48:34 +12:00
actionapply.hpp Fix Potion use action removing the potion even when the action is not executed (Fixes #1521) 2014-06-17 04:05:20 +02: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 Remove redundant getId function 2015-12-18 16:58:38 +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 crash when onPcEquip script removes the equipped item (Fixes #3016) 2015-11-24 22:55:17 +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 WindowManager refactoring 2015-03-11 20:04:25 +01:00
actionopen.hpp Remove empty line at the beginning of files 2015-08-18 23:06:12 +02:00
actionread.cpp Added MWMechanics::isPlayerInCombat() 2015-09-10 18:48:34 +12: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 MWMechanics::isPlayerInCombat() 2015-09-10 18:48:34 +12:00
actionrepair.hpp Added PC repair feature 2013-03-23 08:16:46 +01:00
actionsoulgem.cpp Added MWMechanics::isPlayerInCombat() 2015-09-10 18:48:34 +12: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 Remove empty line at the beginning of files 2015-08-18 23:06:12 +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 Remove empty line at the beginning of files 2015-08-18 23:06:12 +02: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 AiEscort do not follow target through doors 2015-12-19 15:15:44 +01:00
actionteleport.hpp Don't teleport followers when using teleportation spells 2015-05-22 19:57:02 +02:00
actiontrap.cpp Restore projectiles 2015-06-01 21:41:13 +02: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
cellref.cpp Stolen item tracking overhaul part 2 (Fixes #2338) 2015-02-06 01:27:16 +01:00
cellref.hpp Stolen item tracking overhaul part 2 (Fixes #2338) 2015-02-06 01:27:16 +01:00
cellreflist.hpp Fix logic for scripting access of deleted objects 2015-12-17 20:34:50 +01:00
cells.cpp Fix logic for scripting access of deleted objects 2015-12-17 20:34:50 +01:00
cells.hpp Several warning fixes 2015-01-23 15:34:47 +01:00
cellstore.cpp Add support for placing BodyParts in a cell (Bug #3118) 2016-01-02 01:30:06 +01:00
cellstore.hpp Add support for placing BodyParts in a cell (Bug #3118) 2016-01-02 01:30:06 +01:00
cellvisitors.hpp Rename CellStore Functor to Visitor 2015-12-06 18:13:04 +01:00
class.cpp Add count argument to copyObjectToCell 2015-12-19 16:48:32 +01:00
class.hpp Add count argument to copyObjectToCell 2015-12-19 16:48:32 +01:00
containerstore.cpp Improve error message 2016-01-14 18:34:47 +01:00
containerstore.hpp Accept a ConstPtr in ContainerStore::addNewStack 2015-12-18 17:04:54 +01:00
contentloader.hpp Missing iostream include 2013-11-04 10:36:22 +01:00
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 Silence -Wreorder warnings, and remove -Wno-reorder. 2015-05-21 22:46:44 -05:00
esmloader.hpp Reduce includes 2015-01-10 01:00:52 +01:00
esmstore.cpp Add support for placing BodyParts in a cell (Bug #3118) 2016-01-02 01:30:06 +01:00
esmstore.hpp Explicitly instantiate MWWorld::Store 2015-07-09 19:22:04 +02:00
failedaction.cpp extracted MWMechanics::getPlayer() 2015-08-21 21:12:39 +12:00
failedaction.hpp fix -Wnewline-eof warnings 2015-03-11 10:54:45 -04:00
globals.cpp Rename to lowerCaseInPlace 2015-12-07 22:49:15 +01:00
globals.hpp Remove NAME handling from MWWorld::Globals 2015-07-10 00:29:40 +03:00
inventorystore.cpp Accept a ConstPtr in InventoryStore::isEquipped 2015-12-18 17:06:58 +01:00
inventorystore.hpp Accept a ConstPtr in InventoryStore::isEquipped 2015-12-18 17:06:58 +01:00
livecellref.cpp Pass a string by reference 2015-12-18 17:08:26 +01:00
livecellref.hpp Pass a string by reference 2015-12-18 17:08:26 +01:00
localscripts.cpp LocalScripts: initialize mIter 2016-01-01 02:59:55 +01:00
localscripts.hpp Accept a ConstPtr in LocalScripts::setIgnore 2015-12-18 17:09:11 +01:00
manualref.cpp Add support for placing BodyParts in a cell (Bug #3118) 2016-01-02 01:30:06 +01:00
manualref.hpp Move manualref code out of header 2015-02-09 15:01:49 +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
player.cpp Refactor: InputManager no longer depends on Engine 2015-11-14 03:01:24 +01:00
player.hpp Refactor: InputManager no longer depends on Engine 2015-11-14 03:01:24 +01:00
projectilemanager.cpp When a spell explodes on an actor do not apply it to that actor twice (Fixes #3142) 2016-01-12 00:40:09 +01:00
projectilemanager.hpp Accept a ConstPtr in launchProjectile 2015-12-18 17:13:54 +01: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 Remove some unused code, include cleanup 2015-01-27 23:12:13 +01:00
refdata.cpp Accept a ConstPtr in getLOS 2015-12-18 18:03:47 +01:00
refdata.hpp Accept a ConstPtr in getLOS 2015-12-18 18:03:47 +01:00
scene.cpp Remove redundant getId function 2015-12-18 16:58:38 +01:00
scene.hpp Rotations: use different rotation order when object is rotated via script (Fixes #2062) 2015-11-12 01:44:00 +01:00
store.cpp Rename to lowerCaseInPlace 2015-12-07 22:49:15 +01:00
store.hpp Store: be consistent about struct / class usage 2015-12-12 22:34:59 +01:00
timestamp.cpp Correct an error in the timestamp subtracting logic (Fixes #3105) 2015-12-26 00:26:13 +01:00
timestamp.hpp fixed warning C4099: 2015-03-06 21:36:42 +13:00
weather.cpp Merge branch 'master' of https://github.com/OpenMW/openmw into lighting 2016-01-15 15:46:10 +01:00
weather.hpp Move Fallback map to components/ 2016-01-11 23:10:16 +01:00
worldimp.cpp Merge branch 'master' of https://github.com/OpenMW/openmw into lighting 2016-01-15 15:46:10 +01:00
worldimp.hpp Merge branch 'master' of https://github.com/OpenMW/openmw into lighting 2016-01-15 15:46:10 +01:00