Commit Graph

3504 Commits (ad7383be439f9c3260dfc97ea8dbbc859342faac)
 

Author SHA1 Message Date
scrawl 0f811edb47 fixed a bug with dropping items on the ground 13 years ago
scrawl 5a43fe3e5f remove debug prints 13 years ago
scrawl 3f4ce32727 implemented player encumbrance bar 13 years ago
scrawl e9ea1fba4e fixed typo getCapacity method 13 years ago
scrawl d3a53ae0b8 removed the _freeSlot method which is now unneeded 13 years ago
scrawl 0063387979 Merge branch 'master' into inventoryGUI 13 years ago
scrawl 175623bf22 change the drag&drop to not use a seperate containerstore 13 years ago
Marc Zinnschlag fdfddc8be7 some todo comment cleanup 13 years ago
Marc Zinnschlag 7e00fea18b added getEncumbrance function 13 years ago
Marc Zinnschlag c6493fb133 added getCapacity function 13 years ago
scrawl ca4fa21d64 removed the attempt to unify activation and use scripts which was incorrect 13 years ago
scrawl 71de10cb7e equipping items works, but only if you have more than one of the item that you're equipping 13 years ago
scrawl 765881a61d equipping items in the inventorywindow (there is no visual indication yet) 13 years ago
scrawl ab6336b745 using items via the inventory is now possible by dragging them on the avatar (only implemented for books right now) 13 years ago
scrawl b18ee198b4 use a raycast to determine where to place object, if distance is too far
drop it on the ground
13 years ago
scrawl 7fbee0d488 use MyGUI::InputManager instead of MWInputManager to detect ctrl/shift 13 years ago
scrawl 24a0fecd37 implemented item count selection dialog 13 years ago
scrawl 320cc7d020 implemented ctrl and shift-keys for item drag&drop (take all, take 1) 13 years ago
scrawl 933a40de14 better floating object label positioning. 13 years ago
scrawl d3e162ec83 dropping items works 13 years ago
scrawl 6c9f75b322 some unfinished work for dropping objects into the gameworld 13 years ago
scrawl 967fb13fca remove the old inventory code, split HUD, map and mainmenu into seperate implementation files 13 years ago
scrawl f300a5621c Merge branch 'master' into inventoryGUI 13 years ago
Marc Zinnschlag 2bf12a4839 Merge remote branch 'scrawl/itemstacking' 13 years ago
scrawl 82b9f835b1 make sure iterator is not end() before trying to get the equipped item 13 years ago
scrawl a47d29c184 fix the inventory window overlapping with over windows in default layout 13 years ago
scrawl 8c458fc5ce Merge branch 'master' into gui 13 years ago
scrawl 471f6467ec Merge branch 'master' into graphics
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
13 years ago
scrawl e9a1ef4269 Merge branch 'master' into inventoryGUI 13 years ago
Marc Zinnschlag 73d19f9185 Merge remote branch 'scrawl/itemstacking' 13 years ago
scrawl d341d2113c fixed some issues 13 years ago
scrawl ddb0a91994 addition to last commit 13 years ago
scrawl a54e52586b fix for a potential directx problem 13 years ago
scrawl ee7e482cba implemented un-stacking 13 years ago
scrawl 3a93df8db4 dynamic inventory layout like morrowind 13 years ago
scrawl d266b4fe87 hide the cursor during drag&drop and don't allow hotkeys that change guimode 13 years ago
scrawl f31853d30b mouse wheel works when mouse is over an item 13 years ago
scrawl 16522ddc59 InventoryStore re-stacking unequipped items 13 years ago
scrawl 78b06d0ebf inventory window pinning 13 years ago
scrawl 822e5fbe1e add indication which filter is selected 13 years ago
scrawl 902309a554 working filters 13 years ago
scrawl 0114bf948c revised filters 13 years ago
scrawl 8e6c943400 "take all"-button sound (first item) 13 years ago
scrawl fd18c95c5f implemented filters (no gui yet) 13 years ago
scrawl 24e54a81bd don't show icons in the inventory tooltips, exactly like MW does 13 years ago
scrawl e6e50f4ad4 fix items getting cut off 13 years ago
scrawl f3c88adc0b items can now also be dropped on another item (and will be placed in
container)
13 years ago
scrawl 54c23c7422 show the background texture for enchanted items in inventory/container 13 years ago
scrawl 19e8e84f9a more cleanup, removed the redundant ItemWidget and use widget userdata 13 years ago
scrawl 6ee4e8fb5a Merge branch 'itemstacking' into inventoryGUI
Conflicts:
	apps/openmw/mwclass/armor.hpp
	apps/openmw/mwclass/clothing.hpp
	apps/openmw/mwclass/weapon.hpp
	apps/openmw/mwworld/class.hpp
13 years ago