1
0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-09 21:42:13 +00:00
OpenMW/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
action.hpp
actionalchemy.cpp
actionalchemy.hpp
actionapply.cpp
actionapply.hpp
actiondoor.cpp
actiondoor.hpp
actioneat.cpp
actioneat.hpp
actionequip.cpp
actionequip.hpp
actionopen.cpp Closes #1081: Implement disease contraction 2014-01-03 23:33:14 +01:00
actionopen.hpp
actionread.cpp
actionread.hpp
actionrepair.cpp
actionrepair.hpp
actionsoulgem.cpp
actionsoulgem.hpp
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
actiontalk.cpp
actiontalk.hpp
actionteleport.cpp Fixes #417: Apply weather instantly when teleporting 2013-12-31 20:40:23 +01:00
actionteleport.hpp
actiontrap.cpp
actiontrap.hpp
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
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
customdata.hpp
esmloader.cpp
esmloader.hpp
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
failedaction.hpp
fallback.cpp
fallback.hpp
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
localscripts.cpp removed an outdated typedef and some dead code 2013-12-05 13:21:26 +01:00
localscripts.hpp
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
omwloader.cpp
omwloader.hpp
physicssystem.cpp Implement water walking 2014-01-02 02:03:44 +01:00
physicssystem.hpp
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
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
store.hpp save and load dynamic records 2013-12-07 13:17:28 +01:00
timestamp.cpp
timestamp.hpp
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