1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-08-16 06:44:20 +00:00

Commit graph

  • c30b9e4bb9 add/remove gold from the player at the end of the transaction. scrawl 2012-05-18 22:21:44 +0200
  • c004f5d570 adjust the "total cost"/"total sold" value when trading items, added some checks with respective user notifications scrawl 2012-05-18 22:06:25 +0200
  • a4343bfa18 Issue #256: added TimeStamp class Marc Zinnschlag 2012-05-18 22:04:22 +0200
  • db49e2c046 bought/sold items now use a separate ContainerStore, this fixes a stacking issue among other things scrawl 2012-05-18 20:53:24 +0200
  • fb47681fbd fix a bug, some cleanup scrawl 2012-05-18 17:58:33 +0200
  • 342a244e31 NPC now doesn't buy items of types that he shouldn't accept. scrawl 2012-05-18 17:36:20 +0200
  • 50a8eb05d9 transfering items between player and merchant works and shows a red frame for bought/sold items. scrawl 2012-05-18 17:27:55 +0200
  • e2400ca7b2 only show items in the trade window that the NPC actually trades (services enum) scrawl 2012-05-18 15:51:33 +0200
  • 124ea77612 Issue #256: consider equipped items when calculating magic effects Marc Zinnschlag 2012-05-18 15:48:55 +0200
  • 372efaafd7 Issue #256: changed implementation of MagicEffects::operator+= Marc Zinnschlag 2012-05-18 15:27:41 +0200
  • 40c58c1bb7 Issue #256: fixed a capitalisation mistake Marc Zinnschlag 2012-05-18 15:26:08 +0200
  • 5236bcb557 Issue #256: added operator+= for MagicEffects Marc Zinnschlag 2012-05-18 15:12:11 +0200
  • 79055e281d Issue #256: Force update after building the player character Marc Zinnschlag 2012-05-18 13:54:07 +0200
  • e1997b7f04 Issue #256: added MagicEffects::add overload for EffectLists Marc Zinnschlag 2012-05-18 13:17:35 +0200
  • adf0550292 fixed a wrong label. scrawl 2012-05-18 00:14:31 +0200
  • 52e5e14654 use GMST sDefaultCellname for the map window when cell has no region or name. scrawl 2012-05-17 23:42:09 +0200
  • 3cacc8feec add re-stocking items to containers (though restocking isn't implemented) scrawl 2012-05-17 23:22:41 +0200
  • 9a3fd96a0c display the merchant gold. scrawl 2012-05-17 22:24:47 +0200
  • 41efea4c1d in the trade window, don't show items that the merchant has equipped. scrawl 2012-05-17 21:56:16 +0200
  • 6ae642aa06 complete trade window layout scrawl 2012-05-17 21:15:48 +0200
  • 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 scrawl 2012-05-17 19:54:09 +0200
  • 4213b4370f trade window shows up and shows the vendor's inventory items. scrawl 2012-05-17 19:53:04 +0200
  • 1f85475536 Merge branch 'master' into inventoryGUI scrawl 2012-05-17 19:03:41 +0200
  • 375c198ebd WeatherManager: fix for cells that have no region. scrawl 2012-05-17 18:21:05 +0200
  • 0afda15ce9 fix for cells that have no region. scrawl 2012-05-17 18:14:33 +0200
  • ae77e7b0d8 don't try to retrieve land data from non-predefined cells. scrawl 2012-05-17 18:11:34 +0200
  • 5da4da820e beginnings of trade window layout. scrawl 2012-05-17 17:15:44 +0200
  • 6b74fec8ed don't do a half finished cell change, when trying to switch to an interior cell that does not exist Marc Zinnschlag 2012-05-17 17:13:41 +0200
  • 09ec1da0f6 fix the latest commit: objects activation works again. gugus 2012-05-17 16:12:55 +0200
  • 6f87493df6 fix collision bug i think. It disable collision for quiet a lot of objects (maybe a little to much) gugus 2012-05-17 15:46:38 +0200
  • 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. scrawl 2012-05-17 14:54:03 +0200
  • 66abfd17ab check the container's "Organic" flag before trying to place items inside. scrawl 2012-05-17 14:13:35 +0200
  • 0c1d06d9f7 added some trade window stuff, which does nothing yet. scrawl 2012-05-17 13:36:25 +0200
  • e56ff9283d Issue #256: moved magic effects update from MechanicsManager to Actors Marc Zinnschlag 2012-05-17 13:21:49 +0200
  • 1fddbf9a40 Issue #256: moved dynamic stats update from MechanicsManager to Actors Marc Zinnschlag 2012-05-17 13:15:31 +0200
  • 630241c8e2 load the AIDT (AI data) for creatures in the ESM loader, which also contains the Services enum. scrawl 2012-05-17 13:12:38 +0200
  • 8cc49ae2b9 xml files update (layout tweak, added double quotation marks to font) scrawl 2012-05-17 12:55:48 +0200
  • c5185cf2e4 drop item on avatar from external container bugfix scrawl 2012-05-17 12:09:53 +0200
  • fca9f1fc5f gold dropping works without crash, but the code needs clean up. scrawl 2012-05-16 22:56:54 +0200
  • 178ad876d7 fix for objects other than Miscellaneous. scrawl 2012-05-16 22:17:13 +0200
  • 5875ce5128 select the correct gold base object (still crashing) scrawl 2012-05-16 22:13:56 +0200
  • f73d3ad33f fix to the "drop object on ground" feature. still crashes for gold. scrawl 2012-05-16 21:27:02 +0200
  • 6d34e61dbd don't stack gold if it has a script (not used in MW, but some mods might) scrawl 2012-05-16 19:18:50 +0200
  • 4b5d6ce311 allow stacking gold scrawl 2012-05-16 17:22:25 +0200
  • 0f1e09d2c1 make Class::use method return an equip action for equippable items, add sound for equipping scrawl 2012-05-16 16:08:55 +0200
  • 9c4243782e sorting items scrawl 2012-05-16 15:17:55 +0200
  • 9a01e18b29 fix some MessageBox code that was using deleted pointers sometimes scrawl 2012-05-16 15:00:20 +0200
  • 398a7dc65c crash fix (hopefully) scrawl 2012-05-16 14:32:48 +0200
  • 6a0cb32b7e removed unnecessary code scrawl 2012-05-16 14:30:02 +0200
  • c5d685c780 added an assert scrawl 2012-05-16 14:28:57 +0200
  • f8c20ef77f don't allow putting items into a container if the weight is exceeded. scrawl 2012-05-16 00:20:24 +0200
  • 2fa7ce0c19 equipping works also when the item wasn't in player inventory before. scrawl 2012-05-16 00:02:05 +0200
  • 477f1b42ab fixed another item dropping bug scrawl 2012-05-15 23:28:04 +0200
  • 0f811edb47 fixed a bug with dropping items on the ground scrawl 2012-05-15 22:54:28 +0200
  • 5a43fe3e5f remove debug prints scrawl 2012-05-15 22:48:14 +0200
  • 3f4ce32727 implemented player encumbrance bar scrawl 2012-05-15 22:45:46 +0200
  • e9ea1fba4e fixed typo getCapacity method scrawl 2012-05-15 22:31:52 +0200
  • d3a53ae0b8 removed the _freeSlot method which is now unneeded scrawl 2012-05-15 22:01:09 +0200
  • 0063387979 Merge branch 'master' into inventoryGUI scrawl 2012-05-15 21:48:05 +0200
  • 175623bf22 change the drag&drop to not use a seperate containerstore scrawl 2012-05-15 21:44:57 +0200
  • fdfddc8be7 some todo comment cleanup Marc Zinnschlag 2012-05-15 21:34:32 +0200
  • 7e00fea18b added getEncumbrance function Marc Zinnschlag 2012-05-15 21:34:00 +0200
  • c6493fb133 added getCapacity function Marc Zinnschlag 2012-05-15 21:17:00 +0200
  • ca4fa21d64 removed the attempt to unify activation and use scripts which was incorrect scrawl 2012-05-15 20:51:19 +0200
  • 71de10cb7e equipping items works, but only if you have more than one of the item that you're equipping scrawl 2012-05-15 20:33:34 +0200
  • 765881a61d equipping items in the inventorywindow (there is no visual indication yet) scrawl 2012-05-15 18:20:32 +0200
  • ab6336b745 using items via the inventory is now possible by dragging them on the avatar (only implemented for books right now) scrawl 2012-05-15 18:05:53 +0200
  • b18ee198b4 use a raycast to determine where to place object, if distance is too far drop it on the ground scrawl 2012-05-15 16:47:23 +0200
  • 7fbee0d488 use MyGUI::InputManager instead of MWInputManager to detect ctrl/shift scrawl 2012-05-15 13:00:26 +0200
  • 24a0fecd37 implemented item count selection dialog scrawl 2012-05-15 12:51:51 +0200
  • 320cc7d020 implemented ctrl and shift-keys for item drag&drop (take all, take 1) scrawl 2012-05-15 11:02:50 +0200
  • 933a40de14 better floating object label positioning. scrawl 2012-05-14 21:37:43 +0200
  • d3e162ec83 dropping items works scrawl 2012-05-14 17:41:17 +0200
  • 6c9f75b322 some unfinished work for dropping objects into the gameworld scrawl 2012-05-13 18:35:56 +0200
  • 967fb13fca remove the old inventory code, split HUD, map and mainmenu into seperate implementation files scrawl 2012-05-13 18:14:03 +0200
  • f300a5621c Merge branch 'master' into inventoryGUI scrawl 2012-05-13 17:45:57 +0200
  • 2bf12a4839 Merge remote branch 'scrawl/itemstacking' Marc Zinnschlag 2012-05-13 17:22:18 +0200
  • 82b9f835b1 make sure iterator is not end() before trying to get the equipped item scrawl 2012-05-13 16:54:18 +0200
  • a47d29c184 fix the inventory window overlapping with over windows in default layout scrawl 2012-05-13 16:41:00 +0200
  • 8c458fc5ce Merge branch 'master' into gui scrawl 2012-05-13 16:20:35 +0200
  • 471f6467ec Merge branch 'master' into graphics scrawl 2012-05-13 16:18:22 +0200
  • e9a1ef4269 Merge branch 'master' into inventoryGUI scrawl 2012-05-13 16:16:54 +0200
  • 73d19f9185 Merge remote branch 'scrawl/itemstacking' Marc Zinnschlag 2012-05-13 16:06:30 +0200
  • d341d2113c fixed some issues scrawl 2012-05-13 14:58:38 +0200
  • ddb0a91994 addition to last commit scrawl 2012-05-13 12:19:49 +0200
  • a54e52586b fix for a potential directx problem scrawl 2012-05-13 12:17:07 +0200
  • ee7e482cba implemented un-stacking scrawl 2012-05-13 11:52:17 +0200
  • 3a93df8db4 dynamic inventory layout like morrowind scrawl 2012-05-13 11:25:35 +0200
  • d266b4fe87 hide the cursor during drag&drop and don't allow hotkeys that change guimode scrawl 2012-05-13 10:18:17 +0200
  • f31853d30b mouse wheel works when mouse is over an item scrawl 2012-05-13 01:27:17 +0200
  • 16522ddc59 InventoryStore re-stacking unequipped items scrawl 2012-05-12 23:09:03 +0200
  • 78b06d0ebf inventory window pinning scrawl 2012-05-12 22:44:12 +0200
  • 822e5fbe1e add indication which filter is selected scrawl 2012-05-12 22:00:15 +0200
  • 902309a554 working filters scrawl 2012-05-12 21:44:33 +0200
  • 0114bf948c revised filters scrawl 2012-05-12 21:28:04 +0200
  • 8e6c943400 "take all"-button sound (first item) scrawl 2012-05-12 20:39:21 +0200
  • fd18c95c5f implemented filters (no gui yet) scrawl 2012-05-12 20:35:50 +0200
  • 24e54a81bd don't show icons in the inventory tooltips, exactly like MW does scrawl 2012-05-12 20:28:12 +0200
  • e6e50f4ad4 fix items getting cut off scrawl 2012-05-12 20:14:19 +0200
  • f3c88adc0b items can now also be dropped on another item (and will be placed in container) scrawl 2012-05-12 20:06:44 +0200