Marc Zinnschlag
|
367919200f
|
moved CellRefList into a separate file
|
2014-02-23 20:11:05 +01:00 |
|
Marc Zinnschlag
|
1b5301eec0
|
Merge branch 'savedgame'
Conflicts:
apps/openmw/mwbase/mechanicsmanager.hpp
apps/openmw/mwbase/soundmanager.hpp
apps/openmw/mwgui/mapwindow.hpp
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
apps/openmw/mwsound/soundmanagerimp.hpp
components/esm/loadcell.cpp
|
2014-02-01 18:16:32 +01:00 |
|
Marc Zinnschlag
|
5b04c10e1d
|
added creature/NPC state to saved games (only container/inventory for now)
|
2014-02-01 17:36:23 +01:00 |
|
Marc Zinnschlag
|
d2ec3ffdc8
|
handle equipped items when serialising inventory state
|
2014-02-01 17:31:05 +01:00 |
|
Marc Zinnschlag
|
bcc5894e2d
|
changed implementation functions for container serialisation from free functions to member functions (will need some polymorphism later)
|
2014-02-01 15:24:01 +01:00 |
|
Marc Zinnschlag
|
dd674566a2
|
store content of containers in saved game files
|
2014-01-31 13:25:32 +01:00 |
|
scrawl
|
589fbbd871
|
Issue #777: Create InventoryStore for creatures with weapons/shields
|
2014-01-19 11:43:23 +01:00 |
|
scrawl
|
90b92a8f41
|
Move levelled list code out of ContainerStore
|
2014-01-14 05:37:06 +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
|
372cd437d1
|
Add a utility function for counting items in a container
|
2014-01-08 23:00:29 +01:00 |
|
scrawl
|
0285d18fc2
|
Respect items belonging to a faction
|
2014-01-07 20:24:01 +01:00 |
|
Marc Zinnschlag
|
48a08c4c4d
|
Merge remote-tracking branch 'endorph/master'
|
2014-01-07 14:12:15 +01:00 |
|
Dmitriy 'Endorph' Shkurskiy
|
9afa8e952e
|
tabs -> spaces
|
2014-01-07 14:32:14 +02:00 |
|
scrawl
|
2f35e5a04e
|
Stop merchants from autoequipping items sold to them
|
2014-01-05 22:43:09 +01:00 |
|
scrawl
|
dde2cd5d5a
|
Fix some code that still used setCount directly instead of using the ContainerStore interface. Also fix a related annoyance with the interface.
|
2014-01-05 20:53:45 +01:00 |
|
Dmitriy 'Endorph' Shkurskiy
|
18d4cdb2ac
|
Fix for VS2010-Debug: manual assignment operator and cctor added for MMWorld::ContainerStoreIterator
|
2014-01-04 07:46:29 +02:00 |
|
scrawl
|
27092a4494
|
flagAsModified should be private
|
2013-12-27 18:58:35 +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
|
00af6b5617
|
Use an inventory store listener for animation parts and VFX update instead of updating them directly. Slightly more flexible, reduces InventoryStore dependencies and solves a crash during character creation due to the preview doll's animation not being registered in World.
|
2013-11-15 02:08:36 +01:00 |
|
scrawl
|
427de69b79
|
Allow stacking enchanted items when charge is full
|
2013-11-14 21:02:37 +01:00 |
|
scrawl
|
ff7e4174f9
|
Fix some leftover code that still calculated random magnitude per spell rather than per effect. Major cleanup of InventoryStore: Magic effects are now updated when needed, rather than cached. Also allows to get rid of 'mutable' hacks and non-const method that should be const. Play sounds and particles when equipping a permanent enchantment item.
|
2013-11-13 18:51:28 +01:00 |
|
scrawl
|
3c6a391507
|
Rename arguments again
|
2013-11-12 23:12:56 +01:00 |
|
scrawl
|
700d06764c
|
Order of arguments for ContainerStore::stacks shouldn't matter. Supplying them in the correct order is error prone, and also caused a bug where equipped items would incorrectly stack.
|
2013-11-12 22:58:56 +01:00 |
|
Emanuel Guevel
|
750f1fd760
|
Edit ContainerStore::stacks for clarifications and correctness
Rename arguments and fix some potential errors (add checks).
|
2013-11-10 02:45:16 +01:00 |
|
Emanuel Guevel
|
26e4ccb8c2
|
Cosmetic changes
Rename ContainerStore::addImpl to addNewStack (it was confusing, since
ContainerStore had methods named 'addImp' and 'addImpl').
|
2013-11-10 02:45:16 +01:00 |
|
Emanuel Guevel
|
23b8206bdc
|
Add remove methods to MWWorld::ContainerStore
|
2013-11-10 02:45:16 +01:00 |
|
Marc Zinnschlag
|
e94fcce622
|
accessing references via their ID now also works for references in containers in active cells
|
2013-08-15 14:45:13 +02: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
|
0c4a963132
|
Container UI rewrite
|
2013-05-11 18:38:27 +02:00 |
|
scrawl
|
9e08497f02
|
Initial container content should inherit the owner of its container
|
2013-04-07 22:07:04 +02:00 |
|
scrawl
|
2d2196b0d6
|
Implemented levelled items
|
2013-04-07 21:01:02 +02:00 |
|
scrawl
|
918cdcffc2
|
Split up components/esm/loadlocks
|
2013-03-22 05:50:54 +01:00 |
|
Tom Mason
|
665a530e10
|
renamed realAdd to addImp
|
2013-01-20 14:14:34 +00:00 |
|
Tom Mason
|
6fc64e8a4e
|
scripts run for items added to containers, and scripted items in player inv handled correctly
|
2013-01-13 19:49:56 +00:00 |
|
greye
|
2057f5619e
|
move ESMStore to MWWorld
|
2012-11-05 17:18:01 +04:00 |
|
guidoj
|
0549e949ba
|
Mostly removal of unnecessary #include's and a little clean up
|
2012-07-17 09:27:12 +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 |
|
Marc Zinnschlag
|
3e85151c9d
|
Merge remote branch 'scrawl/inventoryGUI'
Conflicts:
apps/openmw/CMakeLists.txt
|
2012-05-21 10:13:27 +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 |
|
Marc Zinnschlag
|
124ea77612
|
Issue #256: consider equipped items when calculating magic effects
|
2012-05-18 15:48:55 +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
|
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
|
82b9f835b1
|
make sure iterator is not end() before trying to get the equipped item
|
2012-05-13 16:54:18 +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
|
16522ddc59
|
InventoryStore re-stacking unequipped items
|
2012-05-12 23:09:03 +02:00 |
|
Marc Zinnschlag
|
47828f91f0
|
Issue #217: added getWeight function to ContainerStore
|
2012-03-22 09:45:48 +01:00 |
|
Marc Zinnschlag
|
3dcfcf46cb
|
Issue #217: container change tracking
|
2012-03-21 12:48:05 +01:00 |
|
Marc Zinnschlag
|
ea336214de
|
more inventory sanity checks
|
2012-03-13 14:04:19 +01:00 |
|