scrawl
a6e2f43b75
Stop continuous VFX when the effect is no longer active.
2013-11-13 15:44:43 +01:00
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)
2013-11-13 14:02:15 +01:00
scrawl
0627e23d3c
Fix wrong skill level for spell success formula.
2013-11-13 01:26:25 +01:00
scrawl
60bec03987
Rename variables called 'slots' to work around wrong code parsing in QT Creator.
2013-11-12 23:23:19 +01:00
scrawl
027f4152e4
Missing flagAsModified()
2013-11-12 23:17:03 +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
scrawl
0dab7031c0
Make sure effects are destroyed with the animation
2013-11-12 02:22:44 +01:00
scrawl
eccb8f38ba
Apply "cast when strikes" enchantments when hitting with a weapon
2013-11-12 02:07:51 +01:00
scrawl
5f209b120b
Use the new ContainerStore::remove method.
2013-11-12 01:26:16 +01:00
scrawl
ffdb91bb21
Add particles for Cast + Hit. Not looking quite right yet.
2013-11-11 23:43:28 +01:00
scrawl
6f3d737498
Missing const, thanks to jeaye
2013-11-10 23:27:11 +01:00
scrawl
afafaf73e8
Fix a build error
2013-11-10 22:40:46 +01:00
scrawl
1773c70455
Merge branch 'master' of https://github.com/zinnschlag/openmw into magic
2013-11-10 22:03:17 +01:00
Marc Zinnschlag
ef8360f346
silenced a warning
2013-11-10 21:45:27 +01:00
Marc Zinnschlag
cfbf444628
Merge remote-tracking branch 'potatoesmaster/inventory-remove'
2013-11-10 21:30:19 +01:00
scrawl
6cd373c5c6
Only allow using powers once every 24 h. Apply on touch effects.
2013-11-10 15:40:31 +01:00
scrawl
71828351e6
Code cleanup: use enum instead of integer
2013-11-10 15:28:26 +01:00
Marc Zinnschlag
b7bb7d6902
Merge remote-tracking branch 'scrawl/master'
...
Conflicts:
apps/opencs/editor.cpp
2013-11-10 11:49:48 +01:00
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.
2013-11-10 02:45:17 +01:00
Emanuel Guevel
d2dcf0b203
Add a warning comment to RefData::setCount()
2013-11-10 02:45:17 +01:00
Emanuel Guevel
467bd91651
Update actor model on inventory change
2013-11-10 02:45:17 +01:00
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.
2013-11-10 02:45:17 +01:00
Emanuel Guevel
4fcf427e1f
InventoryWindow: call InventoryStore::unequipItem() when an equipped item is dragged
...
The unequipped item is also re-stacked if needed.
2013-11-10 02:45:17 +01:00
Emanuel Guevel
37e91a278e
Add InventoryStore::unequipItem()
2013-11-10 02:45:17 +01:00
Emanuel Guevel
12dbbde1e3
InvStore::unequipSlot: return an iterator to the unequipped item
2013-11-10 02:45:17 +01:00
Emanuel Guevel
59c963b6cc
Auto-equip items when a clothe or an armor is removed from inventory
...
This fix auto-equip on corpses.
2013-11-10 02:45:16 +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
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
0691978603
Add item count to ManualRef constructor as optional argument
2013-11-10 02:45:16 +01:00
Emanuel Guevel
f4f2586e8c
Remove duplicate code for PlaceAtMe/PlaceAtPC using a template
2013-11-10 02:45:16 +01:00
Emanuel Guevel
8ff747fbef
Move some deleteObject logic from OpDelete to MWWorld::deleteObject
2013-11-10 02:45:16 +01:00
Emanuel Guevel
2786530430
Edit InventoryStore::equip() to call the new unequipSlot function…
...
…to unequip previously equipped item.
2013-11-10 02:45:16 +01:00
Emanuel Guevel
52cef19982
Update weapon/magic icons when items are removed from player inventory
2013-11-10 02:45:16 +01:00
Emanuel Guevel
d05baa8c22
Add method InventoryStore::unequipSlot()
...
This will permit to do run a treatment when an item is unequipped.
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
Emanuel Guevel
23b8206bdc
Add remove methods to MWWorld::ContainerStore
2013-11-10 02:45:16 +01:00
Marc Zinnschlag
a198751f21
Merge remote-tracking branch 'scrawl/magic'
2013-11-09 17:00:27 +01:00
scrawl
5c148a3d41
Fix effect source display
2013-11-09 11:09:44 +01:00
Marc Zinnschlag
8be3ffc2a0
Merge remote-tracking branch 'scrawl/magic'
...
Conflicts:
apps/openmw/mwworld/worldimp.cpp
2013-11-09 10:54:51 +01:00
scrawl
3e58655a90
Implemented Fortify/Drain skill magic effects. Scroll of icarian flight works!
2013-11-09 10:49:00 +01:00
scrawl
3ea7d58ca8
Advance skill on successfull spell cast
2013-11-09 10:34:46 +01:00
scrawl
976344f0a3
Handle CastOnce enchantments
2013-11-09 08:07:40 +01:00
scrawl
1051611ffa
Added spell failure sound
2013-11-09 07:59:17 +01:00
scrawl
cbe96a2170
Refactor ActiveSpells to track range type. Added basic self range magic.
2013-11-09 07:51:46 +01:00
Marc Zinnschlag
ef401a774b
Merge remote-tracking branch 'eroen/install-fix'
2013-11-08 09:10:44 +01:00
eroen
6b931f566d
Stop installing "Daedric Font License.txt"
...
It was removed in 3a827d9c12
2013-11-08 04:30:15 +01:00
Bret Curtis
36efe9605f
necessary dpkg rules to get opencs building and packaged on dpkg systems
2013-11-07 23:05:45 +01:00
Jordan Ayers
3fbf918751
Chargen Review Dialog: Init fix.
...
Load the starting Health/Magicka/Fatigue from the player stats when
creating the Review Dialog, and remove the extra copy of these stats.
In some cases, the old stat values were never updated from 0/0.
2013-11-06 23:19:53 -06:00
