Marc Zinnschlag
|
68598f9b63
|
fixed handling of user directory defaultfilters file; some cleanup
|
11 years ago |
scrawl
|
9b0e82a37f
|
Projectile models are now spawned (no movement or impact yet). Refactored trap activation to apply range types properly. Handle ContinuousVFX for magic effects (note they aren't stopped yet when the effect ends)
|
11 years ago |
|
Marc Zinnschlag
|
a8274e5c86
|
Merge remote-tracking branch 'potatoesmaster/inventory-fix'
|
11 years ago |
Marek Kochanowicz
|
821d0c5c2d
|
Corrected filter template loading.
|
11 years ago |
sirherrbatka
|
08f8c93a71
|
Merge pull request #3 from zinnschlag/openmw-27
Openmw 27
|
11 years ago |
|
scrawl
|
0627e23d3c
|
Fix wrong skill level for spell success formula.
|
11 years ago |
Emanuel Guevel
|
baf13483c0
|
Update actor model only when in the current cell
|
11 years ago |
|
scrawl
|
60bec03987
|
Rename variables called 'slots' to work around wrong code parsing in QT Creator.
|
11 years ago |
|
scrawl
|
027f4152e4
|
Missing flagAsModified()
|
11 years ago |
|
scrawl
|
3c6a391507
|
Rename arguments again
|
11 years ago |
|
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.
|
11 years ago |
|
scrawl
|
0dab7031c0
|
Make sure effects are destroyed with the animation
|
11 years ago |
|
scrawl
|
eccb8f38ba
|
Apply "cast when strikes" enchantments when hitting with a weapon
|
11 years ago |
|
scrawl
|
5f209b120b
|
Use the new ContainerStore::remove method.
|
11 years ago |
|
scrawl
|
ffdb91bb21
|
Add particles for Cast + Hit. Not looking quite right yet.
|
11 years ago |
|
Marc Zinnschlag
|
2fff7fc843
|
save info records
|
11 years ago |
|
scrawl
|
6f3d737498
|
Missing const, thanks to jeaye
|
11 years ago |
|
scrawl
|
afafaf73e8
|
Fix a build error
|
11 years ago |
|
scrawl
|
1773c70455
|
Merge branch 'master' of https://github.com/zinnschlag/openmw into magic
|
11 years ago |
|
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 |