1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 08:19:56 +00:00
openmw-tes3mp/apps/openmw/mwworld
scrawl 62774fcc4a Merge branch 'master' into HEAD
Conflicts:
	apps/openmw/mwbase/world.hpp
	apps/openmw/mwinput/inputmanagerimp.cpp
	apps/openmw/mwmechanics/actors.cpp
	apps/openmw/mwworld/worldimp.cpp
	apps/openmw/mwworld/worldimp.hpp
	components/esm/loadtes3.cpp
2014-01-06 00:23:17 +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 Closes #1081: Implement disease contraction 2014-01-03 23:33:14 +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 Fix some code that still used setCount directly instead of using the ContainerStore interface. Also fix a related annoyance with the interface. 2014-01-05 20:53:45 +01: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 Fixes #417: Apply weather instantly when teleporting 2013-12-31 20:40:23 +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 Show marked position on map. Implement Detect X magic effects. 2014-01-01 22:37:52 +01:00
cells.cpp Merge branch 'master' into HEAD 2014-01-06 00:23:17 +01:00
cells.hpp Implement divine/almsivi intervention magic effects 2014-01-01 02:22:11 +01: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 Show marked position on map. Implement Detect X magic effects. 2014-01-01 22:37:52 +01:00
class.cpp Nothing to see here, move along. 2014-01-05 16:09:06 +01:00
class.hpp Nothing to see here, move along. 2014-01-05 16:09:06 +01:00
containerstore.cpp Stop merchants from autoequipping items sold to them 2014-01-05 22:43:09 +01:00
containerstore.hpp Stop merchants from autoequipping items sold to them 2014-01-05 22:43:09 +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 fix to content file reading error reporting in case of missing dependency 2013-12-16 11:39:24 +01:00
esmstore.hpp save and load dynamic records 2013-12-07 13:17:28 +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 store global variables in saved game files 2013-12-12 12:19:25 +01:00
globals.hpp store global variables in saved game files 2013-12-12 12:19:25 +01:00
inventorystore.cpp Stop merchants from autoequipping items sold to them 2014-01-05 22:43:09 +01:00
inventorystore.hpp Stop merchants from autoequipping items sold to them 2014-01-05 22:43:09 +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 Smash case for manual reference IDs as well, consistent with references in data files 2014-01-04 04:39:06 +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 Implement water walking 2014-01-02 02:03:44 +01:00
physicssystem.hpp Remove unused functions and parameters 2013-08-25 16:08:45 -07:00
player.cpp Implement mark/recall magic effects 2014-01-01 17:06:21 +01:00
player.hpp Implement mark/recall magic effects 2014-01-01 17:06:21 +01:00
ptr.cpp Remove no longer accurate flagAsModified calls. Container items are now modified via ContainerStore, not RefData. 2013-12-27 00:41:19 +01: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 HEAD 2014-01-06 00:23:17 +01:00
scene.hpp Merge branch 'master' into HEAD 2014-01-06 00:23:17 +01:00
store.cpp Some changes suggested by cppcheck 2013-07-31 18:46:32 +02:00
store.hpp save and load dynamic records 2013-12-07 13:17:28 +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 Merge remote-tracking branch 'lgro/issue417_apply_weather_instantly_when_teleporting' 2014-01-01 19:47:11 +01:00
weather.hpp Merge remote-tracking branch 'lgro/issue417_apply_weather_instantly_when_teleporting' 2014-01-01 14:57:14 +01:00
worldimp.cpp Merge branch 'master' into HEAD 2014-01-06 00:23:17 +01:00
worldimp.hpp Merge branch 'master' into HEAD 2014-01-06 00:23:17 +01:00