Commit Graph

184 Commits (master)

Author SHA1 Message Date
scrawl 224f288359 Don't attempt to change disposition for creatures 11 years ago
scrawl 0f5dc59176 Remove useless dependencies on InventoryWindow for getting player gold. Don't use string literals for gold_001 id, just to be sure. 11 years ago
scrawl 098f9712f1 Add getPlayerPtr() utility method. Reduces dependencies a lot. 11 years ago
scrawl c85c2cff4e Fix disposition changes from trades not applying properly 11 years ago
scrawl 617a65cdd2 Print message to dialogue window after successful trade 11 years ago
scrawl b42240be6d Implement Damage/restore skill/attribute effects. Use dedicated classes for skill and attribute values (instead of Stat<T>) since there are some important differences. 11 years ago
scrawl 6aa9e18915 Reset filter when starting a trade 11 years ago
scrawl b6c22ad5d9 Add starting gold for NPCs and creatures. Refactor gold removal in some gui windows (use containerstore method instead of a dependency on TradeWindow). Use real gold amount in trade window, not refill amount. 11 years ago
scrawl bab657fe2b Add a utility function to add items to a ContainerStore by RefID 11 years ago
scrawl 7eb1dcb682 Fix trade windows crashing after a new game 11 years ago
Emanuel Guevel aefa54d72d Pass item count to ManualRef constructor
This remove the need to call setCount in multiple places.
11 years ago
Emanuel Guevel 10abb9d297 Call ContainerStore::remove() to remove items from inventory
Make placeObject() and dropObjectOnGround() in MWWorld to copy objects
(and indicate it clearly).

Enchanting an item now unequips it.
11 years ago
Chris Robinson 46bc7bd9c8 Some cleanup since NpcStats is now also CreatureStats
This isn't a thorough cleaning, so keep an eye out for more
12 years ago
Emanuel Guevel 48d2554ac3 Auto-equip when items are added to the inventory
We limit that to armor pieces and clothing items.
No auto-equiping for the player nor werewolves.
12 years ago
scrawl 7dc30a01cd Some changes suggested by cppcheck 12 years ago
scrawl 3a6e54c4f5 Sell owned items in the cell 12 years ago
scrawl b56d50287e Barter mechanic fix 12 years ago
scrawl 0c4a963132 Container UI rewrite 12 years ago
Britt Mathis 60fadaeaf0 Cleaned up includes in implementation files 12 years ago
Marc Zinnschlag 3f846a50d9 Merge remote-tracking branch 'galdor557/master'
Conflicts:
	apps/openmw/mwgui/travelwindow.cpp
12 years ago
Britt Mathis f7383905b7 Finally eliminated calls to MWBase::WindowManager in constructors 12 years ago
Britt Mathis ce9bc6d9ba MwGui windowManager calls fixed to use MWBase::Environment::get().getWindowManager, filenames in MwGui now comply with naming conventions 12 years ago
scrawl 480467b6eb Reset the 'owner' field for items that were legitimately bought from an NPC. 12 years ago
scrawl f3c8cd2065 Don't buy/sell keys which are set to open a lock 12 years ago
scrawl 1a2daa3bc1 Merge branch 'master' of git://github.com/zinnschlag/openmw into companion 12 years ago
scrawl e27e53f607 Fix not playable body parts appearing in the race selection menu. 12 years ago
scrawl 0f0cc0e3e3 Fix a few gold conditions that I missed, trade window was affected 12 years ago
scrawl e7af718b55 Remove unnecessary WindowManager::messageBox arguments 12 years ago
scrawl 918cdcffc2 Split up components/esm/loadlocks 12 years ago
scrawl d7c4a622cf Create a separate rigid body / shape with full details for raycasting, remove the occlusion query hack 12 years ago
scrawl 0ee0dbdb97 Added "dispose corpse" button, added stealing (all items visible and no penalty yet) 12 years ago
Emanuel Guevel 8e07638699 Update the trading offer on "max sale" button click 12 years ago
Sergey Shambir a3adcf752d TradeWindow: fixed coding style
Mentioned here: https://github.com/zinnschlag/openmw/pull/554
12 years ago
Sergey Shambir 725bfe6372 TradeWindow: balance now changes per time if user holds +/- button
pressed
12 years ago
lazydev 04cca2a1ce fix for http://bugs.openmw.org/issues/517 12 years ago
Marc Zinnschlag 386eec51c1 some skill usage fixes 12 years ago
eduard ea8ee11ff7 tradding skill use 12 years ago
eduard 5332546541 tradding skill use 12 years ago
scrawl 94aeb15220 bartering disposition change 12 years ago
scrawl d53a7ade1e method names, disposition uint->int 12 years ago
scrawl b2afb1fd5c Merge branch 'next' of git://github.com/zinnschlag/openmw into MercantilImprovement
Conflicts:
	apps/openmw/mwbase/mechanicsmanager.hpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
	apps/openmw/mwgui/spellbuyingwindow.cpp
	apps/openmw/mwgui/trainingwindow.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
12 years ago
scrawl bf4e855260 fixed creatures 12 years ago
gugus 4634227f1c notify the user when the merchant doesn't accept the offer 12 years ago
gugus 0a883f4492 The player can now barter with merchants 12 years ago
greye a9c1ce412a applying new interface vol.7, inconsistent 12 years ago
gugus aaf1b66c7e BarterOffer is used in other trading services too 12 years ago
greye 3c2ce25f5f m prefix for mwworld/cellstore.hpp 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 fde69d0c87 Merge branch 'master' of https://github.com/zinnschlag/openmw into dynamic_sizing 12 years ago
scrawl bc6a1979b0 replaced everything with the new method 12 years ago
Adam Hogan ebf80943a9 Added spell buying window 13 years ago
greye a90547bbbe code formatting 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 cc7c6aa0ad Merge branch 'decouple' 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
scrawl d27863bf8e rename layout files to .layout to get them recognized by layout editor 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 15e959868c make some of the gui mode changes a bit safer 13 years ago
scrawl b8464d4ce5 allow picking up objects from the gameworld with the mouse in inventory mode 13 years ago
scrawl 298ae4f7f8 HUD icons for selected weapon / selected spell / selected enchanted item 13 years ago
scrawl f1d3978897 Issue #290: Auto-Close MW-reference related GUI windows 13 years ago
scrawl 7ebbc099b3 allow stacking gui modes 13 years ago
scrawl 2a4c55f1ab use Class::getInventoryStore instead of casting ContainerStore. 13 years ago
scrawl 7a4de0ed1d changed more gui stuff to use the new tag system 13 years ago
scrawl 24ce88de2a working mygui tag replacement system for GMST strings 13 years ago
scrawl 656b08f620 removed the workaround for the ContainerStore bug. 13 years ago
scrawl f28f36f262 added sounds to trade window 13 years ago
scrawl c30b9e4bb9 add/remove gold from the player at the end of the transaction. 13 years ago
scrawl c004f5d570 adjust the "total cost"/"total sold" value when trading items, added some checks with respective user notifications 13 years ago
scrawl db49e2c046 bought/sold items now use a separate ContainerStore, this fixes a stacking issue among other things 13 years ago
scrawl 50a8eb05d9 transfering items between player and merchant works and shows a red frame for bought/sold items. 13 years ago
scrawl e2400ca7b2 only show items in the trade window that the NPC actually trades (services enum) 13 years ago
scrawl adf0550292 fixed a wrong label. 13 years ago
scrawl 9a3fd96a0c display the merchant gold. 13 years ago
scrawl 41efea4c1d in the trade window, don't show items that the merchant has equipped. 13 years ago
scrawl 6ae642aa06 complete trade window layout 13 years ago
scrawl 4213b4370f trade window shows up and shows the vendor's inventory items. 13 years ago
scrawl 5da4da820e beginnings of trade window layout. 13 years ago
scrawl 0c1d06d9f7 added some trade window stuff, which does nothing yet. 13 years ago