You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
openmw-tes3coop/apps/openmw/mwworld
David Cernat 6cb5ac6e63 Merge pull request #457 from OpenMW/master while resolving conflicts
Conflicts:
	CMakeLists.txt
	apps/openmw/engine.cpp
	apps/openmw/main.cpp
	apps/openmw/mwgui/windowmanagerimp.cpp
	apps/openmw/mwmechanics/character.cpp
	components/CMakeLists.txt
6 years ago
..
action.cpp Make the PlayMode and PlayType enums scoped 7 years ago
action.hpp Adjustments to RemoveItem behavior 7 years ago
actionalchemy.cpp Make Equip console command to bypass most of restrictions (bug #4460) 6 years ago
actionalchemy.hpp Make Equip console command to bypass most of restrictions (bug #4460) 6 years ago
actionapply.cpp Added MWMechanics::isPlayerInCombat() 9 years ago
actionapply.hpp Fix Potion use action removing the potion even when the action is not executed (Fixes #1521) 10 years ago
actiondoor.cpp Opening doors 11 years ago
actiondoor.hpp Opening doors 11 years ago
actioneat.cpp Remove redundant getId function 9 years ago
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. 11 years ago
actionequip.cpp Make Equip console command to bypass most of restrictions (bug #4460) 6 years ago
actionequip.hpp Make Equip console command to bypass most of restrictions (bug #4460) 6 years ago
actionopen.cpp Improve WindowManager API with a generic way of passing a Ptr to the opened GUI window 7 years ago
actionopen.hpp Improve WindowManager API with a generic way of passing a Ptr to the opened GUI window 7 years ago
actionread.cpp Merge pull request #403 from OpenMW/master 6 years ago
actionread.hpp Improve WindowManager API with a generic way of passing a Ptr to the opened GUI window 7 years ago
actionrepair.cpp Make Equip console command to bypass most of restrictions (bug #4460) 6 years ago
actionrepair.hpp Make Equip console command to bypass most of restrictions (bug #4460) 6 years ago
actionsoulgem.cpp Added MWMechanics::isPlayerInCombat() 9 years ago
actionsoulgem.hpp Added soulgem dialog; made interactive message boxes not close the previous UI 11 years ago
actiontake.cpp [General] Rename Event into ObjectList & WorldObject into BaseObject 6 years ago
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. 11 years ago
actiontalk.cpp Refactor dialogue GUI to talk to the dialogue manager, not the other way around and not both ways. 7 years ago
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. 11 years ago
actionteleport.cpp [Client] Send ActorAI packet for new cell after being followed to it 6 years ago
actionteleport.hpp Removed "less" character from the documentation by the requested opportunity. 7 years ago
actiontrap.cpp [Client] Disable clientside disarming of traps 6 years ago
actiontrap.hpp Play trap activation sound on trapped object, not actor 8 years ago
cellpreloader.cpp Add abort flag to TerrainPreloadItem 7 years ago
cellpreloader.hpp Fix issues caused by loading multiple views into the same terrain View 7 years ago
cellref.cpp [General] Change type of MpNum to "unsigned int" 6 years ago
cellref.hpp [General] Change type of MpNum to "unsigned int" 6 years ago
cellreflist.hpp Fix possible reference duplication when the refID is modified by a plugin (Bug #3471) 8 years ago
cells.cpp Makes cells cache size configurable 7 years ago
cells.hpp Several warning fixes 9 years ago
cellstore.cpp [General] Rename all instances of refNumIndex into refNum 6 years ago
cellstore.hpp [General] Rename all instances of refNumIndex into refNum 6 years ago
cellvisitors.hpp Rename CellStore Functor to Visitor 9 years ago
class.cpp Merge pull request #457 from OpenMW/master while resolving conflicts 6 years ago
class.hpp Merge pull request #457 from OpenMW/master while resolving conflicts 6 years ago
containerstore.cpp Merged pull request #1753 6 years ago
containerstore.hpp Ignore broken items when search for replacement (bug #4453) 6 years ago
contentloader.hpp Escape content file names before sending them to the GUI 7 years ago
customdata.cpp Use the const version of CustomData::as* 9 years ago
customdata.hpp Use the const version of CustomData::as* 9 years ago
esmloader.cpp Silence -Wreorder warnings, and remove -Wno-reorder. 9 years ago
esmloader.hpp Reduce includes 9 years ago
esmstore.cpp Add NPC validation to esmstore (bug #2772) 6 years ago
esmstore.hpp Add NPC validation to esmstore (bug #2772) 6 years ago
failedaction.cpp Play locked sounds on locked objects instead of actors 8 years ago
failedaction.hpp Play locked sounds on locked objects instead of actors 8 years ago
globals.cpp Rename to lowerCaseInPlace 9 years ago
globals.hpp Remove NAME handling from MWWorld::Globals 9 years ago
inventorystore.cpp Merge pull request #319 from OpenMW/master while resolving conflicts 7 years ago
inventorystore.hpp Remove item by id from InventoryStore 7 years ago
livecellref.cpp Remove missing souls, remove some runaway exceptions (Fixes #4111) 6 years ago
livecellref.hpp [Client] Clean up & simplify logic for DedicatedPlayer cell transitions 7 years ago
localscripts.cpp More consistent wording of errors/warnings 7 years ago
localscripts.hpp Vanilla-compatible activate / onActivate (Fixes #1629) 8 years ago
manualref.cpp [Client] Set mMpNum to 0 for ManualRef 7 years ago
manualref.hpp Move manualref code out of header 9 years ago
nullaction.hpp Add isNullAction() method to fix compiler warning 8 years ago
player.cpp Store previous items in the savegame 6 years ago
player.hpp Move previous items to player 6 years ago
projectilemanager.cpp Correct projectile rotation 7 years ago
projectilemanager.hpp Make use of mEffectAnimationTime for projectile rotation 7 years ago
ptr.cpp Added ConstContainerStoreIterator 7 years ago
ptr.hpp Added ConstContainerStoreIterator 7 years ago
recordcmp.hpp Remove some unused code, include cleanup 9 years ago
refdata.cpp Reset activation flags when an object is copied (Fixes #3671, Fixes #3719) 7 years ago
refdata.hpp Save scripted animation state (Fixes #1931, #2150, #3393) 8 years ago
scene.cpp Merge pull request #408 from OpenMW/master 6 years ago
scene.hpp Add 'prediction time' setting for cell/terrain pre-loading 7 years ago
store.cpp Get rid of unnecessary find 6 years ago
store.hpp Don't call Store::setUp() unnecessarily 6 years ago
timestamp.cpp Correct an error in the timestamp subtracting logic (Fixes #3105) 9 years ago
timestamp.hpp fixed warning C4099: 9 years ago
weather.cpp Unhardcode sunset and sunrise settings (bug #1990) 6 years ago
weather.hpp Unhardcode sunset and sunrise settings (bug #1990) 6 years ago
worldimp.cpp Merge pull request #457 from OpenMW/master while resolving conflicts 6 years ago
worldimp.hpp Merge pull request #457 from OpenMW/master while resolving conflicts 6 years ago