Commit Graph

109 Commits (openmw-39)

Author SHA1 Message Date
scrawl 45006ea193 Fix inventory/container content loading so that it's done for dynamically spawned objects as well 12 years ago
scrawl e7af718b55 Remove unnecessary WindowManager::messageBox arguments 12 years ago
scrawl 00db13be32 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. 12 years ago
eduard 2dc0064cc2 more string lowercase 12 years ago
Marc Zinnschlag 5d45bcd03a Merge remote-tracking branch 'trombonecot/master'
Conflicts:
	apps/openmw/mwclass/light.cpp
12 years ago
eduard 4e4d15f8ac Failed action 12 years ago
eduard 82ea547ce4 Failed action 12 years ago
Marc Zinnschlag 918316168f Merge remote-tracking branch 'greye/store' into next
Conflicts:
	apps/openmw/mwclass/light.cpp
	apps/openmw/mwworld/worldimp.cpp
12 years ago
emoose 7a7825577a Changed: use MWWorld::Ptr for PhysicsSystem arguments 12 years ago
greye 3c2ce25f5f m prefix for mwworld/cellstore.hpp 12 years ago
emoose 1c8e941f0d fix kdevelop indentation again... 12 years ago
emoose 96b56d9803 fixes: containers: key id case comparison 12 years ago
greye 2fa4ac177a initial resolving 12 years ago
scrawl 9f2668b45b Task #400 Review GMST access 12 years ago
greye 7606ebafd6 resolving conflicts, minor update 12 years ago
scrawl 89ad2af1d9 key usage to open doors or containers
to test: player->additem, "key_arrile", 1 (door in arille's tradehouse)
player->additem, "key_alvur", 1 (chest in the back of beshara)
12 years ago
scrawl fdc2a7433c remove the wrong container open sound 12 years ago
Marc Zinnschlag 6813bafbfc added missing sound effect for chest opening; minor cleanup 13 years ago
Douglas Diniz 82e7c04c0a Changing sounds to Action.
Adding onActor to Action to choose between playSound and playSound3D.
13 years ago
Marc Zinnschlag 6534c2a55a Issue #107: WindowManager is accessed only through the interface class from now on 13 years ago
Marc Zinnschlag 6bd48d12af Issue #107: SoundManager is accessed only through the interface class from now on 13 years ago
greye 26595f22f6 float* -> Vector3, moveToCell -> copyToCell, fixed placeObject() 13 years ago
greye e7666d3a7f move responsibility for cell changing from CellStore::insertObject to Class::moveToCell 13 years ago
greye 6a3a728a56 Class::getModel implementation 13 years ago
Marc Zinnschlag 5a7b95bf7a Issue #107: cleaned up includes in apps/openmw/mwworld/class.hpp 13 years ago
Marc Zinnschlag 4c39fefd1e Issue #107: World is accessed only through the interface class from now on; some include cleanup 13 years ago
Marc Zinnschlag 7fcd41c69d Issue #107: Detemplateised CellStore; some include cleanup 13 years ago
Marc Zinnschlag 76174098c7 Issue #107: CellStore moved from ESMS to MWWorld 13 years ago
scrawl de3daf3dc1 allow the 'lock' and 'unlock' script commands to work on containers, like in morrowind 13 years ago
scrawl e9ea1fba4e fixed typo getCapacity method 13 years ago
scrawl 0063387979 Merge branch 'master' into inventoryGUI 13 years ago
Marc Zinnschlag 7e00fea18b added getEncumbrance function 13 years ago
Marc Zinnschlag c6493fb133 added getCapacity function 13 years ago
gugus 8e8f80807e Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwclass/apparatus.cpp
	apps/openmw/mwclass/armor.cpp
	apps/openmw/mwclass/book.cpp
	apps/openmw/mwclass/clothing.cpp
	apps/openmw/mwclass/container.cpp
	apps/openmw/mwclass/ingredient.cpp
	apps/openmw/mwclass/light.cpp
	apps/openmw/mwclass/lockpick.cpp
	apps/openmw/mwclass/misc.cpp
	apps/openmw/mwclass/potion.cpp
	apps/openmw/mwclass/probe.cpp
	apps/openmw/mwclass/repair.cpp
	apps/openmw/mwclass/weapon.cpp
	apps/openmw/mwgui/window_manager.cpp
	apps/openmw/mwgui/window_manager.hpp
	apps/openmw/mwworld/class.cpp
13 years ago
scrawl 1b5bfc52a1 Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwclass/apparatus.cpp
	apps/openmw/mwclass/book.cpp
	apps/openmw/mwclass/container.cpp
	apps/openmw/mwclass/ingredient.cpp
	apps/openmw/mwclass/misc.cpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/potion.cpp
	apps/openmw/mwclass/repair.cpp
	apps/openmw/mwgui/window_manager.cpp
13 years ago
Marc Zinnschlag 35f478071e Issue #255: deleted the old environment class and using the new one instead 13 years ago
scrawl cdd4d83d9e moved the tooltip info to the appropriate MWWorld::Class classes 13 years ago
gugus a38db39e88 Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI
Conflicts:
	apps/openmw/CMakeLists.txt
13 years ago
gugus b309d245c5 cleaning up hircine work 13 years ago
Chris Robinson ae308b9b5f Use a set of flags instead of separate booleans 13 years ago
Michael Papageorgiou 703e484a92 Doors and Containers sounds, now in 3D 13 years ago
Michael Papageorgiou fe977fe313 More container and door trap fixes 13 years ago
Michael Papageorgiou 28fdfb0f99 Added container locked and trapped activation sounds 13 years ago
Marc Zinnschlag f2972b1ca0 turned ContainerStore from a template into a simple struct 13 years ago
Marc Zinnschlag 8de6761a79 general cleanup 13 years ago
Marc Zinnschlag c081160591 replaced container store in ref data with new custom data implementation 13 years ago
Jason Hooks 7319f7a8c6 Many bugs fixed related to changing cells 13 years ago
Jason Hooks 15fcdc8b72 Physics working 13 years ago
Jason Hooks 4dc59dfbdd Scenenode flip 13 years ago
Jason Hooks c7dadec840 Updating the rest of mwclass 13 years ago
Jacob Essex 9aac625000 Changes to move the mutable ESM::Position data to RefData 13 years ago
Marc Zinnschlag 88b0908104 adding physics when insertering objects into the OGRE scene 14 years ago
Marc Zinnschlag 7bb2041418 made rendering more robust (no more crashes, even if Ogre throws an exception) 15 years ago
Marc Zinnschlag 967f85875d reimplemented class-dependend rendering code in MWClass 15 years ago
Marc Zinnschlag 10a63b10b5 Merge branch 'master' into container
Conflicts:
	apps/openmw/mwclass/container.cpp
	apps/openmw/mwclass/container.hpp
	apps/openmw/mwclass/creature.cpp
	apps/openmw/mwclass/creature.hpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwclass/npc.hpp
	apps/openmw/mwworld/class.cpp
	apps/openmw/mwworld/class.hpp
15 years ago
Marc Zinnschlag 7a313f24ab integrated activation into script system 15 years ago
Marc Zinnschlag ee7570f7e7 added containerstore 15 years ago
Marc Zinnschlag 239498bcd4 added getName function 15 years ago
Marc Zinnschlag f50ced4616 added missing record classes 15 years ago