1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-15 20:49:56 +00:00
openmw-tes3mp/apps/openmw/mwworld
scrawl a5670b5133 Merge branch 'master' of https://github.com/OpenMW/openmw into osg
Conflicts:
	apps/opencs/CMakeLists.txt
	apps/opencs/main.cpp
	apps/openmw/mwworld/player.hpp
2015-06-22 20:09:02 +02:00
..
action.cpp Silence -Wreorder warnings, and remove -Wno-reorder. 2015-05-21 22:46:44 -05: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 Fix for bug #1080, can't read/repair/make potions/use soul gems/rest/sleep while in combat. 2014-04-24 22:47:45 -04: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 Fix Potion use action removing the potion even when the action is not executed (Fixes #1521) 2014-06-17 04:05:20 +02: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 static method MWWorld::Class::get(&Ptr) 2014-05-22 20:50:00 +02: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 Allow equipping twohanded weapon and shield at the same time (Fixes #1785) 2014-12-12 16:49:22 +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 Added "dispose corpse" button, added stealing (all items visible and no penalty yet) 2013-03-07 14:00:13 +01:00
actionread.cpp Book/scroll window refactoring 2015-03-11 20:33:55 +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 WindowManager refactoring 2015-03-11 20:04:25 +01:00
actionrepair.hpp Added PC repair feature 2013-03-23 08:16:46 +01:00
actionsoulgem.cpp Fix for bug #1080, can't read/repair/make potions/use soul gems/rest/sleep while in combat. 2014-04-24 22:47:45 -04: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 Change stolen items handling to match MW (Fixes #1443, Fixes #2290) 2015-02-05 04:18:43 +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 Remove last remains of Ogre math 2015-06-03 21:37:21 +02: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
cellfunctors.hpp Readded collision objects and movement physics 2015-05-12 03:02:15 +02: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 Remove RefData::getHandle 2015-05-12 04:04:54 +02:00
cells.cpp Account for not yet listed cells in getInteriorPtrs 2015-02-04 16:41:14 +01:00
cells.hpp Several warning fixes 2015-01-23 15:34:47 +01:00
cellstore.cpp Remove RefData::getHandle 2015-05-12 04:04:54 +02:00
cellstore.hpp Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-05-23 20:33:44 +02:00
class.cpp Remove last remains of Ogre 2015-06-03 23:04:35 +02:00
class.hpp Remove last remains of Ogre 2015-06-03 23:04:35 +02:00
containerstore.cpp Readded sound listener 2015-05-12 19:02:56 +02:00
containerstore.hpp Stolen item tracking overhaul part 2 (Fixes #2338) 2015-02-06 01:27:16 +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 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 fixing MSVC 2013 warning C4244: & C4305 2015-03-08 13:07:29 +13:00
esmstore.hpp Several warning fixes 2015-01-23 15:34:47 +01:00
failedaction.cpp Get rid of "player" string checks (Fixes #2216) 2015-03-11 23:07:39 +01:00
failedaction.hpp fix -Wnewline-eof warnings 2015-03-11 10:54:45 -04:00
fallback.cpp Water ripples 2015-06-16 20:36:48 +02:00
fallback.hpp More efficient StateSetController, beginnings of sky rendering 2015-04-14 15:58:16 +02:00
globals.cpp Several warning fixes 2015-01-23 15:34:47 +01:00
globals.hpp Several warning fixes 2015-01-23 15:34:47 +01:00
inventorystore.cpp Fix the inventory listener bug 2015-06-07 16:50:34 +02:00
inventorystore.hpp Fix the inventory listener bug 2015-06-07 16:50:34 +02:00
livecellref.cpp Include cleanup 2015-02-05 04:18:42 +01:00
livecellref.hpp Basic RefData and CellRef change tracking 2014-05-25 14:30:07 +02:00
localscripts.cpp improved error handling in LocalScripts::add 2015-05-27 19:45:26 +02:00
localscripts.hpp fixed warning C4099: 2015-03-06 21:36:42 +13:00
manualref.cpp fix -Wnewline-eof warnings 2015-03-11 10:54:45 -04: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 Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-06-22 20:09:02 +02:00
player.hpp Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-06-22 20:09:02 +02:00
projectilemanager.cpp Fix for broken InitWorldSpaceParticles on projectile effects 2015-06-11 16:40:26 +02:00
projectilemanager.hpp Fix for broken InitWorldSpaceParticles on projectile effects 2015-06-11 16:40:26 +02:00
ptr.cpp Basic RefData and CellRef change tracking 2014-05-25 14:30:07 +02:00
ptr.hpp fixed warning C4099: 2015-03-06 21:36:42 +13:00
recordcmp.hpp Remove some unused code, include cleanup 2015-01-27 23:12:13 +01:00
refdata.cpp Remove last remains of Ogre 2015-06-03 23:04:35 +02:00
refdata.hpp Restore various gameplay 2015-05-30 01:00:24 +02:00
scene.cpp Water ripples 2015-06-16 20:36:48 +02:00
scene.hpp Remove last remains of Ogre 2015-06-03 23:04:35 +02:00
store.cpp Remove some unused code, include cleanup 2015-01-27 23:12:13 +01:00
store.hpp Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-06-14 16:32:13 +02:00
timestamp.cpp fixing MSVC 2013 warning C4244: & C4305 2015-03-08 13:07:29 +13:00
timestamp.hpp fixed warning C4099: 2015-03-06 21:36:42 +13:00
weather.cpp Moon fading fix (Bug #2713) 2015-06-19 18:15:23 +02:00
weather.hpp Remove last remains of Ogre 2015-06-03 23:04:35 +02:00
worldimp.cpp Merge branch 'master' of https://github.com/OpenMW/openmw into osg 2015-06-22 20:09:02 +02:00
worldimp.hpp Remove last remains of Ogre 2015-06-03 23:04:35 +02:00