Commit Graph

111 Commits (master)

Author SHA1 Message Date
Chris Robinson 076e7d8e16 Make insertBegin internal 12 years ago
Chris Robinson 0458fd5531 Remove unused/unneeded parameters 12 years ago
scrawl 0c4a963132 Container UI rewrite 12 years ago
scrawl f3c8cd2065 Don't buy/sell keys which are set to open a lock 12 years ago
scrawl 84afd87321 Placeable objects should not collide unless they have a NiRootCollisionNode 12 years ago
scrawl e1957e4ee9 Potion effects should be hidden until discovered 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
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
greye 2fa4ac177a initial resolving 12 years ago
greye 721324c1db rm record inheritance, rework esmtool accordingly 12 years ago
scrawl 1cb1259e18 fixing some unrelated warnings 12 years ago
scrawl 9f2668b45b Task #400 Review GMST access 12 years ago
greye 7606ebafd6 resolving conflicts, minor update 12 years ago
scrawl 432c089434 fix the spell tooltips to show the spell target 12 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
Marc Zinnschlag 0da3f2cb59 Issue #314: Playing drink sound when using a potion 13 years ago
Marc Zinnschlag 78fe6fdce5 Issue #351: Refactoring Action class 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 573d7e7e45 Issue #314: fix to potion use function (was mixing up potion with potion user) 13 years ago
Marc Zinnschlag 782d417d5b Issue #314: potion usage 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 a3a22e9096 ingredient tooltip shows possible effects 13 years ago
scrawl d64fccec6f display the item count in the tooltip 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 22f524f8d5 potion effects in tooltip 13 years ago
scrawl b82c39c8be renamed Widgets::MWEnchantment to Widgets::MWEffectList so it can be
reused for potion effects
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
Marc Zinnschlag 77604086e2 Merge branch 'autoequip' 13 years ago
Marc Zinnschlag d5a7d418dd added getValue function to Class hierarchy 13 years ago
Chris Robinson ae308b9b5f Use a set of flags instead of separate booleans 13 years ago
Michael Papageorgiou 947288e13a Merge master and rewrite around the new detection function 13 years ago
Michael Papageorgiou 7c1475b723 Pickup sounds for potions, repair, gold, lights, rings 13 years ago
Marc Zinnschlag 699246e54b removed insertIntoContainer function from MWWorld::Class hierarchy 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
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 a7fe28ecbe implemented take action 15 years ago
Marc Zinnschlag 0a60bde834 added insertIntoContainer function to class hierarchy 15 years ago
Marc Zinnschlag 7a313f24ab integrated activation into script system 15 years ago
Marc Zinnschlag 239498bcd4 added getName function 15 years ago
Marc Zinnschlag f50ced4616 added missing record classes 15 years ago