teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity
3299 commits 34 branches 0 tags 66 MiB
Commit graph

2222 commits

Author SHA1 Message Date
Marc Zinnschlag
5236bcb557 Issue #256: added operator+= for MagicEffects 2012-05-18 15:12:11 +02:00
Marc Zinnschlag
79055e281d Issue #256: Force update after building the player character 2012-05-18 13:54:07 +02:00
Marc Zinnschlag
e1997b7f04 Issue #256: added MagicEffects::add overload for EffectLists 2012-05-18 13:17:35 +02:00
scrawl
adf0550292 fixed a wrong label. 2012-05-18 00:14:31 +02:00
scrawl
52e5e14654 use GMST sDefaultCellname for the map window when cell has no region or name. 2012-05-17 23:42:09 +02:00
scrawl
3cacc8feec add re-stocking items to containers (though restocking isn't implemented) 2012-05-17 23:22:41 +02:00
scrawl
9a3fd96a0c display the merchant gold. 2012-05-17 22:24:47 +02:00
scrawl
41efea4c1d in the trade window, don't show items that the merchant has equipped. 2012-05-17 21:56:16 +02:00
scrawl
6ae642aa06 complete trade window layout 2012-05-17 21:15:48 +02:00
scrawl
c9aa0ca1f4 don't create terrain if there is no land data, also fixes a water disappearing issue and a sound exception if cells with no region 2012-05-17 19:54:09 +02:00
scrawl
4213b4370f trade window shows up and shows the vendor's inventory items. 2012-05-17 19:53:04 +02:00
scrawl
1f85475536 Merge branch 'master' into inventoryGUI 2012-05-17 19:03:41 +02:00
scrawl
375c198ebd WeatherManager: fix for cells that have no region. 2012-05-17 18:21:05 +02:00
scrawl
0afda15ce9 fix for cells that have no region. 2012-05-17 18:14:33 +02:00
scrawl
ae77e7b0d8 don't try to retrieve land data from non-predefined cells. 2012-05-17 18:11:34 +02:00
scrawl
5da4da820e beginnings of trade window layout. 2012-05-17 17:15:44 +02:00
Marc Zinnschlag
6b74fec8ed don't do a half finished cell change, when trying to switch to an interior cell that does not exist 2012-05-17 17:13:41 +02:00
scrawl
0dc5e5919b show the Barter entry in the dialogue gui for npcs/creatures that buy/sell stuff. doesn't work for the Creeper for some reason, but Mudcrab Merchant works. 2012-05-17 14:54:03 +02:00
scrawl
66abfd17ab check the container's "Organic" flag before trying to place items inside. 2012-05-17 14:13:35 +02:00
scrawl
0c1d06d9f7 added some trade window stuff, which does nothing yet. 2012-05-17 13:36:25 +02:00
Marc Zinnschlag
e56ff9283d Issue #256: moved magic effects update from MechanicsManager to Actors 2012-05-17 13:21:49 +02:00
Marc Zinnschlag
1fddbf9a40 Issue #256: moved dynamic stats update from MechanicsManager to Actors 2012-05-17 13:15:31 +02:00
scrawl
630241c8e2 load the AIDT (AI data) for creatures in the ESM loader, which also contains the Services enum. 2012-05-17 13:12:38 +02:00
scrawl
c5185cf2e4 drop item on avatar from external container bugfix 2012-05-17 12:09:53 +02:00
scrawl
fca9f1fc5f gold dropping works without crash, but the code needs clean up. 2012-05-16 22:56:54 +02:00
scrawl
178ad876d7 fix for objects other than Miscellaneous. 2012-05-16 22:17:13 +02:00
scrawl
5875ce5128 select the correct gold base object (still crashing) 2012-05-16 22:13:56 +02:00
scrawl
f73d3ad33f fix to the "drop object on ground" feature. still crashes for gold. 2012-05-16 21:27:02 +02:00
scrawl
6d34e61dbd don't stack gold if it has a script (not used in MW, but some mods might) 2012-05-16 19:18:50 +02:00
scrawl
4b5d6ce311 allow stacking gold 2012-05-16 17:22:25 +02:00
scrawl
0f1e09d2c1 make Class::use method return an equip action for equippable items, add sound for equipping 2012-05-16 16:08:55 +02:00
scrawl
9c4243782e sorting items 2012-05-16 15:17:55 +02:00
scrawl
9a01e18b29 fix some MessageBox code that was using deleted pointers sometimes 2012-05-16 15:00:20 +02:00
scrawl
398a7dc65c crash fix (hopefully) 2012-05-16 14:32:48 +02:00
scrawl
6a0cb32b7e removed unnecessary code 2012-05-16 14:30:02 +02:00
scrawl
c5d685c780 added an assert 2012-05-16 14:28:57 +02:00
scrawl
f8c20ef77f don't allow putting items into a container if the weight is exceeded. 2012-05-16 00:20:24 +02:00
scrawl
2fa7ce0c19 equipping works also when the item wasn't in player inventory before. 2012-05-16 00:02:05 +02:00
scrawl
477f1b42ab fixed another item dropping bug 2012-05-15 23:28:04 +02:00
scrawl
0f811edb47 fixed a bug with dropping items on the ground 2012-05-15 22:54:28 +02:00
scrawl
5a43fe3e5f remove debug prints 2012-05-15 22:48:14 +02:00
scrawl
3f4ce32727 implemented player encumbrance bar 2012-05-15 22:45:46 +02:00
scrawl
e9ea1fba4e fixed typo getCapacity method 2012-05-15 22:31:52 +02:00
scrawl
d3a53ae0b8 removed the _freeSlot method which is now unneeded 2012-05-15 22:01:09 +02:00
scrawl
0063387979 Merge branch 'master' into inventoryGUI 2012-05-15 21:48:05 +02:00
scrawl
175623bf22 change the drag&drop to not use a seperate containerstore 2012-05-15 21:44:57 +02:00
Marc Zinnschlag
fdfddc8be7 some todo comment cleanup 2012-05-15 21:34:32 +02:00
Marc Zinnschlag
7e00fea18b added getEncumbrance function 2012-05-15 21:34:00 +02:00
Marc Zinnschlag
c6493fb133 added getCapacity function 2012-05-15 21:17:00 +02:00
scrawl
ca4fa21d64 removed the attempt to unify activation and use scripts which was incorrect 2012-05-15 20:51:19 +02:00
scrawl
71de10cb7e equipping items works, but only if you have more than one of the item that you're equipping 2012-05-15 20:33:34 +02:00
scrawl
765881a61d equipping items in the inventorywindow (there is no visual indication yet) 2012-05-15 18:20:32 +02:00
scrawl
ab6336b745 using items via the inventory is now possible by dragging them on the avatar (only implemented for books right now) 2012-05-15 18:05:53 +02:00
scrawl
b18ee198b4 use a raycast to determine where to place object, if distance is too far 
drop it on the ground
 2012-05-15 16:47:23 +02:00
scrawl
7fbee0d488 use MyGUI::InputManager instead of MWInputManager to detect ctrl/shift 2012-05-15 13:00:26 +02:00
scrawl
24a0fecd37 implemented item count selection dialog 2012-05-15 12:51:51 +02:00
scrawl
320cc7d020 implemented ctrl and shift-keys for item drag&drop (take all, take 1) 2012-05-15 11:02:50 +02:00
scrawl
933a40de14 better floating object label positioning. 2012-05-14 21:37:43 +02:00
scrawl
d3e162ec83 dropping items works 2012-05-14 17:41:17 +02:00
scrawl
6c9f75b322 some unfinished work for dropping objects into the gameworld 2012-05-13 18:35:56 +02:00
scrawl
967fb13fca remove the old inventory code, split HUD, map and mainmenu into seperate implementation files 2012-05-13 18:14:03 +02:00
scrawl
f300a5621c Merge branch 'master' into inventoryGUI 2012-05-13 17:45:57 +02:00
Marc Zinnschlag
2bf12a4839 Merge remote branch 'scrawl/itemstacking' 2012-05-13 17:22:18 +02:00
scrawl
82b9f835b1 make sure iterator is not end() before trying to get the equipped item 2012-05-13 16:54:18 +02:00
scrawl
a47d29c184 fix the inventory window overlapping with over windows in default layout 2012-05-13 16:41:00 +02:00
scrawl
8c458fc5ce Merge branch 'master' into gui 2012-05-13 16:20:35 +02:00
scrawl
471f6467ec Merge branch 'master' into graphics 
Conflicts:
	apps/openmw/mwscript/docs/vmformat.txt
 2012-05-13 16:18:22 +02:00
scrawl
e9a1ef4269 Merge branch 'master' into inventoryGUI 2012-05-13 16:16:54 +02:00
Marc Zinnschlag
73d19f9185 Merge remote branch 'scrawl/itemstacking' 2012-05-13 16:06:30 +02:00
scrawl
d341d2113c fixed some issues 2012-05-13 14:58:38 +02:00
scrawl
ee7e482cba implemented un-stacking 2012-05-13 11:52:17 +02:00
scrawl
3a93df8db4 dynamic inventory layout like morrowind 2012-05-13 11:25:35 +02:00
scrawl
d266b4fe87 hide the cursor during drag&drop and don't allow hotkeys that change guimode 2012-05-13 10:18:17 +02:00
scrawl
f31853d30b mouse wheel works when mouse is over an item 2012-05-13 01:27:17 +02:00
scrawl
16522ddc59 InventoryStore re-stacking unequipped items 2012-05-12 23:09:03 +02:00
scrawl
78b06d0ebf inventory window pinning 2012-05-12 22:44:12 +02:00
scrawl
822e5fbe1e add indication which filter is selected 2012-05-12 22:00:15 +02:00
scrawl
902309a554 working filters 2012-05-12 21:44:33 +02:00
scrawl
0114bf948c revised filters 2012-05-12 21:28:04 +02:00
scrawl
8e6c943400 "take all"-button sound (first item) 2012-05-12 20:39:21 +02:00
scrawl
fd18c95c5f implemented filters (no gui yet) 2012-05-12 20:35:50 +02:00
scrawl
24e54a81bd don't show icons in the inventory tooltips, exactly like MW does 2012-05-12 20:28:12 +02:00
scrawl
e6e50f4ad4 fix items getting cut off 2012-05-12 20:14:19 +02:00
scrawl
f3c88adc0b items can now also be dropped on another item (and will be placed in 
container)
 2012-05-12 20:06:44 +02:00
scrawl
54c23c7422 show the background texture for enchanted items in inventory/container 2012-05-12 19:48:01 +02:00
scrawl
19e8e84f9a more cleanup, removed the redundant ItemWidget and use widget userdata 2012-05-12 18:50:19 +02:00
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
 2012-05-12 18:32:06 +02:00
scrawl
e714b77df8 small fix 2012-05-12 18:28:14 +02:00
scrawl
1abf70692c added a scrollbar to the item container, dynamic positioning of items, fixed the item count display bug 2012-05-12 18:24:47 +02:00
scrawl
9f2595183b type 2012-05-12 16:30:27 +02:00
scrawl
5b0251b09f item stacking 2012-05-12 16:17:03 +02:00
scrawl
a31a9e51d3 add the sound for item drag&drop 2012-05-12 14:29:49 +02:00
scrawl
722af60337 implemented the "Take all" button 2012-05-12 14:01:59 +02:00
scrawl
296dbce298 Merge branch 'master' into graphics 2012-05-12 13:47:56 +02:00
scrawl
d64fccec6f display the item count in the tooltip 2012-05-12 13:46:03 +02:00
scrawl
7723044df0 added the item tooltips 2012-05-12 13:30:34 +02:00
scrawl
ed6ff0a94a cleanup 3 2012-05-12 13:12:37 +02:00
scrawl
3a6fde5039 cleanup 2 2012-05-11 16:58:07 +02:00
scrawl
a1b86acc38 Merge branch 'master' into inventoryGUI 
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwgui/window_manager.cpp
	apps/openmw/mwgui/window_manager.hpp
	files/mygui/core.xml
 2012-05-11 16:41:27 +02:00
scrawl
007a202deb cleanup 1 2012-05-11 16:34:36 +02:00