scrawl
|
224f288359
|
Don't attempt to change disposition for creatures
|
2014-01-11 21:30:26 +01:00 |
|
scrawl
|
0f5dc59176
|
Remove useless dependencies on InventoryWindow for getting player gold. Don't use string literals for gold_001 id, just to be sure.
|
2014-01-08 23:37:46 +01:00 |
|
scrawl
|
098f9712f1
|
Add getPlayerPtr() utility method. Reduces dependencies a lot.
|
2014-01-08 18:39:44 +01:00 |
|
scrawl
|
c85c2cff4e
|
Fix disposition changes from trades not applying properly
|
2014-01-08 01:46:42 +01:00 |
|
scrawl
|
617a65cdd2
|
Print message to dialogue window after successful trade
|
2014-01-03 17:40:14 +01:00 |
|
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.
|
2014-01-03 03:48:43 +01:00 |
|
scrawl
|
6aa9e18915
|
Reset filter when starting a trade
|
2013-11-30 08:33:18 +01:00 |
|
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.
|
2013-11-21 17:19:30 +01:00 |
|
scrawl
|
bab657fe2b
|
Add a utility function to add items to a ContainerStore by RefID
|
2013-11-21 17:14:30 +01:00 |
|
scrawl
|
7eb1dcb682
|
Fix trade windows crashing after a new game
|
2013-11-16 22:29:40 +01:00 |
|
Emanuel Guevel
|
aefa54d72d
|
Pass item count to ManualRef constructor
This remove the need to call setCount in multiple places.
|
2013-11-10 02:45:16 +01:00 |
|
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.
|
2013-11-10 02:45:16 +01:00 |
|
Chris Robinson
|
46bc7bd9c8
|
Some cleanup since NpcStats is now also CreatureStats
This isn't a thorough cleaning, so keep an eye out for more
|
2013-08-09 01:14:08 -07:00 |
|
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.
|
2013-08-07 15:17:55 +02:00 |
|
scrawl
|
7dc30a01cd
|
Some changes suggested by cppcheck
|
2013-07-31 18:46:32 +02:00 |
|
scrawl
|
3a6e54c4f5
|
Sell owned items in the cell
|
2013-05-27 02:18:36 +02:00 |
|
scrawl
|
b56d50287e
|
Barter mechanic fix
|
2013-05-11 22:56:36 +02:00 |
|
scrawl
|
0c4a963132
|
Container UI rewrite
|
2013-05-11 18:38:27 +02:00 |
|
Britt Mathis
|
60fadaeaf0
|
Cleaned up includes in implementation files
|
2013-04-16 20:16:22 -04:00 |
|
Marc Zinnschlag
|
3f846a50d9
|
Merge remote-tracking branch 'galdor557/master'
Conflicts:
apps/openmw/mwgui/travelwindow.cpp
|
2013-04-11 10:15:42 +02:00 |
|
Britt Mathis
|
f7383905b7
|
Finally eliminated calls to MWBase::WindowManager in constructors
|
2013-04-10 14:46:21 -04:00 |
|
Britt Mathis
|
ce9bc6d9ba
|
MwGui windowManager calls fixed to use MWBase::Environment::get().getWindowManager, filenames in MwGui now comply with naming conventions
|
2013-04-10 00:32:05 -04:00 |
|
scrawl
|
480467b6eb
|
Reset the 'owner' field for items that were legitimately bought from an NPC.
|
2013-04-07 21:53:11 +02:00 |
|
scrawl
|
f3c8cd2065
|
Don't buy/sell keys which are set to open a lock
|
2013-04-07 21:38:53 +02:00 |
|
scrawl
|
1a2daa3bc1
|
Merge branch 'master' of git://github.com/zinnschlag/openmw into companion
|
2013-03-31 14:50:03 +02:00 |
|
scrawl
|
e27e53f607
|
Fix not playable body parts appearing in the race selection menu.
|
2013-03-30 20:04:05 +01:00 |
|
scrawl
|
0f0cc0e3e3
|
Fix a few gold conditions that I missed, trade window was affected
|
2013-03-30 18:29:21 +01:00 |
|
scrawl
|
e7af718b55
|
Remove unnecessary WindowManager::messageBox arguments
|
2013-03-30 12:56:37 +01:00 |
|
scrawl
|
918cdcffc2
|
Split up components/esm/loadlocks
|
2013-03-22 05:50:54 +01:00 |
|
scrawl
|
d7c4a622cf
|
Create a separate rigid body / shape with full details for raycasting, remove the occlusion query hack
|
2013-03-08 23:46:25 +01:00 |
|
scrawl
|
0ee0dbdb97
|
Added "dispose corpse" button, added stealing (all items visible and no penalty yet)
|
2013-03-07 14:00:13 +01:00 |
|
Emanuel Guevel
|
8e07638699
|
Update the trading offer on "max sale" button click
|
2013-03-04 12:24:41 +01:00 |
|
Sergey Shambir
|
a3adcf752d
|
TradeWindow: fixed coding style
Mentioned here: https://github.com/zinnschlag/openmw/pull/554
|
2013-02-23 13:51:21 +01:00 |
|
Sergey Shambir
|
725bfe6372
|
TradeWindow: balance now changes per time if user holds +/- button
pressed
|
2013-02-10 08:50:36 +04:00 |
|
lazydev
|
04cca2a1ce
|
fix for http://bugs.openmw.org/issues/517
|
2013-01-02 18:58:52 +04:00 |
|
Marc Zinnschlag
|
386eec51c1
|
some skill usage fixes
|
2012-12-07 11:36:38 +01:00 |
|
eduard
|
ea8ee11ff7
|
tradding skill use
|
2012-12-06 14:25:53 +01:00 |
|
eduard
|
5332546541
|
tradding skill use
|
2012-12-06 13:58:52 +01:00 |
|
scrawl
|
94aeb15220
|
bartering disposition change
|
2012-11-10 00:38:45 +01:00 |
|
scrawl
|
d53a7ade1e
|
method names, disposition uint->int
|
2012-11-09 14:42:09 +01:00 |
|
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
|
2012-11-08 23:16:40 +01:00 |
|
scrawl
|
bf4e855260
|
fixed creatures
|
2012-11-08 22:31:08 +01:00 |
|
gugus
|
4634227f1c
|
notify the user when the merchant doesn't accept the offer
|
2012-11-08 21:50:56 +01:00 |
|
gugus
|
0a883f4492
|
The player can now barter with merchants
|
2012-11-08 13:38:20 +01:00 |
|
greye
|
a9c1ce412a
|
applying new interface vol.7, inconsistent
|
2012-11-06 11:29:18 +04:00 |
|
gugus
|
aaf1b66c7e
|
BarterOffer is used in other trading services too
|
2012-11-05 19:53:55 +01:00 |
|
greye
|
3c2ce25f5f
|
m prefix for mwworld/cellstore.hpp
|
2012-11-05 16:07:59 +04:00 |
|
greye
|
2fa4ac177a
|
initial resolving
|
2012-10-01 00:23:49 +04:00 |
|
scrawl
|
9f2668b45b
|
Task #400 Review GMST access
|
2012-09-22 21:35:57 +02:00 |
|
greye
|
7606ebafd6
|
resolving conflicts, minor update
|
2012-09-17 11:37:50 +04:00 |
|
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)
|
2012-09-10 17:44:59 +02:00 |
|
scrawl
|
fde69d0c87
|
Merge branch 'master' of https://github.com/zinnschlag/openmw into dynamic_sizing
|
2012-09-10 13:40:34 +02:00 |
|
scrawl
|
bc6a1979b0
|
replaced everything with the new method
|
2012-09-10 13:39:22 +02:00 |
|
Adam Hogan
|
ebf80943a9
|
Added spell buying window
|
2012-09-08 18:17:03 -04:00 |
|
greye
|
a90547bbbe
|
code formatting
|
2012-08-29 21:35:06 +04:00 |
|
Marc Zinnschlag
|
6534c2a55a
|
Issue #107: WindowManager is accessed only through the interface class from now on
|
2012-08-12 18:11:09 +02:00 |
|
Marc Zinnschlag
|
6bd48d12af
|
Issue #107: SoundManager is accessed only through the interface class from now on
|
2012-08-09 14:33:21 +02:00 |
|
Marc Zinnschlag
|
cc7c6aa0ad
|
Merge branch 'decouple'
|
2012-07-03 15:47:57 +02:00 |
|
Marc Zinnschlag
|
4c39fefd1e
|
Issue #107: World is accessed only through the interface class from now on; some include cleanup
|
2012-07-03 12:30:50 +02:00 |
|
scrawl
|
d27863bf8e
|
rename layout files to .layout to get them recognized by layout editor
|
2012-07-03 11:34:20 +02:00 |
|
Marc Zinnschlag
|
7fcd41c69d
|
Issue #107: Detemplateised CellStore; some include cleanup
|
2012-06-29 18:54:23 +02:00 |
|
Marc Zinnschlag
|
76174098c7
|
Issue #107: CellStore moved from ESMS to MWWorld
|
2012-06-29 16:48:50 +02:00 |
|
scrawl
|
15e959868c
|
make some of the gui mode changes a bit safer
|
2012-06-19 17:07:00 +02:00 |
|
scrawl
|
b8464d4ce5
|
allow picking up objects from the gameworld with the mouse in inventory mode
|
2012-06-02 14:19:02 +02:00 |
|
scrawl
|
298ae4f7f8
|
HUD icons for selected weapon / selected spell / selected enchanted item
|
2012-05-29 18:33:01 +02:00 |
|
scrawl
|
f1d3978897
|
Issue #290: Auto-Close MW-reference related GUI windows
|
2012-05-27 01:14:33 +02:00 |
|
scrawl
|
7ebbc099b3
|
allow stacking gui modes
|
2012-05-23 12:23:35 +02:00 |
|
scrawl
|
2a4c55f1ab
|
use Class::getInventoryStore instead of casting ContainerStore.
|
2012-05-19 16:04:34 +02:00 |
|
scrawl
|
7a4de0ed1d
|
changed more gui stuff to use the new tag system
|
2012-05-19 15:32:32 +02:00 |
|
scrawl
|
24ce88de2a
|
working mygui tag replacement system for GMST strings
|
2012-05-19 14:19:21 +02:00 |
|
scrawl
|
656b08f620
|
removed the workaround for the ContainerStore bug.
|
2012-05-18 22:32:06 +02:00 |
|
scrawl
|
f28f36f262
|
added sounds to trade window
|
2012-05-18 22:27:27 +02:00 |
|
scrawl
|
c30b9e4bb9
|
add/remove gold from the player at the end of the transaction.
|
2012-05-18 22:21:44 +02:00 |
|
scrawl
|
c004f5d570
|
adjust the "total cost"/"total sold" value when trading items, added some checks with respective user notifications
|
2012-05-18 22:06:25 +02:00 |
|
scrawl
|
db49e2c046
|
bought/sold items now use a separate ContainerStore, this fixes a stacking issue among other things
|
2012-05-18 20:53:24 +02:00 |
|
scrawl
|
50a8eb05d9
|
transfering items between player and merchant works and shows a red frame for bought/sold items.
|
2012-05-18 17:27:55 +02:00 |
|
scrawl
|
e2400ca7b2
|
only show items in the trade window that the NPC actually trades (services enum)
|
2012-05-18 15:51:33 +02:00 |
|
scrawl
|
adf0550292
|
fixed a wrong label.
|
2012-05-18 00:14:31 +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
|
4213b4370f
|
trade window shows up and shows the vendor's inventory items.
|
2012-05-17 19:53:04 +02:00 |
|
scrawl
|
5da4da820e
|
beginnings of trade window layout.
|
2012-05-17 17:15:44 +02:00 |
|
scrawl
|
0c1d06d9f7
|
added some trade window stuff, which does nothing yet.
|
2012-05-17 13:36:25 +02:00 |
|