Marc Zinnschlag
|
ef8360f346
|
silenced a warning
|
11 years ago |
|
Marc Zinnschlag
|
cfbf444628
|
Merge remote-tracking branch 'potatoesmaster/inventory-remove'
|
11 years ago |
Nikolay Kasyanov
|
05e19b37e3
|
Removed obsolete comment
|
11 years ago |
|
Nikolay Kasyanov
|
dafe80874a
|
Added empty line
|
11 years ago |
|
Nikolay Kasyanov
|
96714fc2c1
|
OpenCS: proper working dir & library path on OS X
|
11 years ago |
|
Nikolay Kasyanov
|
fa13818360
|
OS X: OpenCS packaging
|
11 years ago |
|
Nikolay Kasyanov
|
dfa900e4e3
|
OS X: Fixed “macro redefined” warning
|
11 years ago |
|
Nikolay Kasyanov
|
0494fa543f
|
OpenCS: set current directory to bundle location on OS X, like in OpenMW binary
|
11 years ago |
|
Nikolay Kasyanov
|
df5b52b45b
|
OpenCS.app icon & bundle properties
|
11 years ago |
|
Nikolay Kasyanov
|
04edd25add
|
OpenCS as a separate app bundle
|
11 years ago |
scrawl
|
6cd373c5c6
|
Only allow using powers once every 24 h. Apply on touch effects.
|
11 years ago |
|
scrawl
|
71828351e6
|
Code cleanup: use enum instead of integer
|
11 years ago |
|
Marc Zinnschlag
|
8c4303399f
|
Merge branch 'master' into dialogue
Conflicts:
apps/opencs/model/world/columns.cpp
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/data.cpp
components/esm/loadinfo.hpp
|
11 years ago |
|
Marc Zinnschlag
|
583f1ae9c2
|
fixed info record ordering and performance problems by determining topic ranges in the record collection instead of in the index collection
|
11 years ago |
|
Marc Zinnschlag
|
ec6018928c
|
some fixes to info record sorting (doesn't address the main problem)
|
11 years ago |
|
Marc Zinnschlag
|
b7bb7d6902
|
Merge remote-tracking branch 'scrawl/master'
Conflicts:
apps/opencs/editor.cpp
|
11 years ago |
Emanuel Guevel
|
bbfd7f4c9d
|
Disable equipped item re-stacking when the item is removed from inventory
The item was not removed if it was re-stacked.
|
11 years ago |
|
Emanuel Guevel
|
d2dcf0b203
|
Add a warning comment to RefData::setCount()
|
11 years ago |
|
Emanuel Guevel
|
467bd91651
|
Update actor model on inventory change
|
11 years ago |
|
Emanuel Guevel
|
f428921b93
|
Always update the source container view on drag&drop
This fix the indicator not being displayed for items auto-equipped
after an other item is removed.
|
11 years ago |
|
Emanuel Guevel
|
4fcf427e1f
|
InventoryWindow: call InventoryStore::unequipItem() when an equipped item is dragged
The unequipped item is also re-stacked if needed.
|
11 years ago |
|
Emanuel Guevel
|
37e91a278e
|
Add InventoryStore::unequipItem()
|
11 years ago |
|
Emanuel Guevel
|
12dbbde1e3
|
InvStore::unequipSlot: return an iterator to the unequipped item
|
11 years ago |
|
Emanuel Guevel
|
59c963b6cc
|
Auto-equip items when a clothe or an armor is removed from inventory
This fix auto-equip on corpses.
|
11 years ago |
|
Emanuel Guevel
|
750f1fd760
|
Edit ContainerStore::stacks for clarifications and correctness
Rename arguments and fix some potential errors (add checks).
|
11 years ago |
|
Emanuel Guevel
|
26e4ccb8c2
|
Cosmetic changes
Rename ContainerStore::addImpl to addNewStack (it was confusing, since
ContainerStore had methods named 'addImp' and 'addImpl').
|
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
|
0691978603
|
Add item count to ManualRef constructor as optional argument
|
11 years ago |
|
Emanuel Guevel
|
f4f2586e8c
|
Remove duplicate code for PlaceAtMe/PlaceAtPC using a template
|
11 years ago |
|
Emanuel Guevel
|
8ff747fbef
|
Move some deleteObject logic from OpDelete to MWWorld::deleteObject
|
11 years ago |
|
Emanuel Guevel
|
2786530430
|
Edit InventoryStore::equip() to call the new unequipSlot function…
…to unequip previously equipped item.
|
11 years ago |
|
Emanuel Guevel
|
52cef19982
|
Update weapon/magic icons when items are removed from player inventory
|
11 years ago |
|
Emanuel Guevel
|
d05baa8c22
|
Add method InventoryStore::unequipSlot()
This will permit to do run a treatment when an item is unequipped.
|
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 |
|
Emanuel Guevel
|
23b8206bdc
|
Add remove methods to MWWorld::ContainerStore
|
11 years ago |
|
Marc Zinnschlag
|
a198751f21
|
Merge remote-tracking branch 'scrawl/magic'
|
11 years ago |
|
Marc Zinnschlag
|
935d9241d8
|
first attempt at proper info record loading: partially incorrect and way too slow
|
11 years ago |
|
scrawl
|
5c148a3d41
|
Fix effect source display
|
11 years ago |
|
Marc Zinnschlag
|
8be3ffc2a0
|
Merge remote-tracking branch 'scrawl/magic'
Conflicts:
apps/openmw/mwworld/worldimp.cpp
|
11 years ago |
|
scrawl
|
3e58655a90
|
Implemented Fortify/Drain skill magic effects. Scroll of icarian flight works!
|
11 years ago |
|
scrawl
|
3ea7d58ca8
|
Advance skill on successfull spell cast
|
11 years ago |
|
scrawl
|
976344f0a3
|
Handle CastOnce enchantments
|
11 years ago |
|
scrawl
|
1051611ffa
|
Added spell failure sound
|
11 years ago |
|
scrawl
|
cbe96a2170
|
Refactor ActiveSpells to track range type. Added basic self range magic.
|
11 years ago |
|
Marc Zinnschlag
|
3d8da2b9e0
|
proper sorting for newly created records and some case smashing fixes
|
11 years ago |
|
Marc Zinnschlag
|
a06aa881cb
|
make sure case handling in info IDs is consistent
|
11 years ago |
|
Marc Zinnschlag
|
982024a328
|
Topic range access in InfoCollection
|
11 years ago |
|
Marc Zinnschlag
|
0745a86039
|
added InfoCreator
|
11 years ago |
|
Marc Zinnschlag
|
ef401a774b
|
Merge remote-tracking branch 'eroen/install-fix'
|
11 years ago |
|
Marc Zinnschlag
|
224aa5d38c
|
Merge remote-tracking branch 'eroen/install-fix-17' into openmw-27
|
11 years ago |