Mark Siewert
8ea9f00e6f
Merge remote-tracking branch 'upstream/master' into multiple_esm_esp
...
Conflicts:
apps/openmw/mwrender/terrain.cpp
apps/openmw/mwworld/cells.cpp
apps/openmw/mwworld/cells.hpp
apps/openmw/mwworld/cellstore.cpp
apps/openmw/mwworld/cellstore.hpp
apps/openmw/mwworld/containerstore.cpp
apps/openmw/mwworld/localscripts.cpp
apps/openmw/mwworld/scene.cpp
apps/openmw/mwworld/worldimp.cpp
apps/openmw/mwworld/worldimp.hpp
components/esm_store/reclists.hpp
components/esm_store/store.cpp
extern/shiny
- Re-implement some patches that were broken by the removal of reclists.hpp and store.cpp/.hpp.
- NOTE: Not everything works as before, I'll have to test some more stuff before we are back to where we were.
2012-11-25 14:12:44 +01:00
Mark Siewert
31fb715bd7
- Add support for moving existing references by plugin files. No cell changing yet.
...
- Change CellRefList::list from list<> to map<int,> so we can identify live references by their Refnumber.
- Introduce ContainerRefList, a clone of the original CellRefList. It is now used for containers, which do not track Refnumbers.
- Many small tweaks so that the new CellRefList does not conflict with existing code.
2012-11-17 21:50:25 +01:00
greye
ff8da265ed
applying new interface vol.9, inconsistent
2012-11-06 12:36:21 +04:00
greye
d205723a17
resolving m prefix/ESMStore movement
2012-11-05 18:02:47 +04:00
greye
2057f5619e
move ESMStore to MWWorld
2012-11-05 17:18:01 +04:00
greye
3c2ce25f5f
m prefix for mwworld/cellstore.hpp
2012-11-05 16:07:59 +04:00
Marc Zinnschlag
4bc4ca775c
Issue #432 : fixed MWWorld::ContainerStore::clear
2012-11-01 15:11:13 +01: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
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
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
30461438f6
still left: spell success formula
2012-05-29 12:35:03 +02:00
scrawl
9ca579ba63
slightly revamped gold stacking, now always uses the gold_001 base object to be script-friendly
2012-05-19 00:36:01 +02:00
scrawl
8a0c859c16
Merge branch 'iterator' of https://github.com/zinnschlag/openmw into inventoryGUI
2012-05-18 22:27:48 +02:00
Marc Zinnschlag
498530fad7
container iterator fix
2012-05-18 22:24:19 +02:00
scrawl
3cacc8feec
add re-stocking items to containers (though restocking isn't implemented)
2012-05-17 23:22:41 +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
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
scrawl
9f2595183b
type
2012-05-12 16:30:27 +02:00
scrawl
5b0251b09f
item stacking
2012-05-12 16:17: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
0adbe258fd
Issue #217 : made Ptr track container; fixed a cmake script bug
2012-03-21 12:20:19 +01:00
Marc Zinnschlag
ea336214de
more inventory sanity checks
2012-03-13 14:04:19 +01:00
Marc Zinnschlag
84c8cd3720
added InventoryStore class (doesn't do anything yet)
2012-03-10 12:49:27 +01:00
Marc Zinnschlag
06e0706b35
added fill and clear functions to container store
2012-03-10 12:11:07 +01:00
Marc Zinnschlag
e13e858c7a
fixed container store iterator; new add function
2012-02-23 12:34:25 +01:00
Marc Zinnschlag
1beaea0115
forgot to add cone file
2012-02-20 14:14:39 +01:00
