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
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
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
Jordan Ayers
d48cc27a89
Chargen fix: Back sequence control.
...
Related to bug #894 .
Eliminate double windows when using 'Back' from the review screen.
Force consistent back behavior (handling was changing after
a individual change button had been used).
2013-11-06 23:19:53 -06:00
Jordan Ayers
e94da61ff0
Chargen cleanup.
...
Move common gui state pop out of if checks.
Move health update before gui state push (used as input for some windows).
2013-11-06 23:19:53 -06:00
Marc Zinnschlag
d85360e7fd
Merge remote-tracking branch 'scrawl/ui'
2013-11-06 10:21:41 +01:00
Marc Zinnschlag
418ccf705d
Merge branch 'openmw-27'
...
Conflicts:
apps/launcher/graphicspage.hpp
components/CMakeLists.txt
2013-11-06 10:21:25 +01:00
scrawl
9e2b1942fc
Fix journal for not installed tribunal (Options button should become Topics). Don't log an error when optional journal buttons (Tribunal) are not found.
2013-11-05 22:50:53 +01:00
scrawl
bf5529819d
Added combo box widget and use it in options menu. Fixes to VBox / HBox. Added savegame dialog.
2013-11-05 19:50:24 +01:00
Marc Zinnschlag
245d7b0ae4
Merge remote-tracking branch 'scrawl/windowclosefix'
2013-11-05 08:19:53 +01:00
Marc Zinnschlag
f4e6f31658
Merge remote-tracking branch 'scrawl/openmw-27'
2013-11-05 08:19:29 +01:00
scrawl
c3d9bc31bb
Fix exiting OpenMW via the window close button (regression)
2013-11-05 03:02:28 +01:00
scrawl
3a827d9c12
Deleted Obliviontt.zip
2013-11-05 00:32:06 +01:00
Alexander "Ace" Olofsson
468e8e3635
Missing iostream include
2013-11-04 10:36:22 +01:00
Marc Zinnschlag
dec1483fa4
Merge branch 'saving' into openmw-27
2013-11-04 08:57:32 +01:00
Lukasz Gromanowski
afce10cf37
Fixes #597 : Assertion `dialogue->mId == id' failed in esmstore.cpp
...
It seems that assertion was unnecessary, after removing it, dialogs
related to moon-and-star in "Path of the Incarnate" quest were
correctly loaded (dumped DialInfo records were correct).
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-11-02 16:39:05 +01:00
scrawl
636d399c7f
Refactored Ogre initialisation into a component
2013-10-30 14:04:33 +01:00
scrawl
4f35fd8184
Removed a workaround from Renderer, some cleanup
2013-10-30 13:05:28 +01:00
Alex "rainChu" Haddad
23eaf90846
Breath meter flashes when drowning
2013-10-27 04:05:01 -04:00
Marc Zinnschlag
c995533e07
Merge branch 'dialogue' into saving
...
Conflicts:
apps/opencs/model/world/columnimp.hpp
apps/opencs/model/world/columns.cpp
apps/opencs/model/world/columns.hpp
apps/opencs/model/world/data.cpp
components/esm/loaddial.hpp
2013-10-21 16:45:43 +02:00
scrawl
3a3f2a37c8
Add cut, copy & paste of text
2013-10-17 12:47:49 +02:00
Marc Zinnschlag
8c139783b7
silenced a warning
2013-10-16 21:33:11 +02:00
Marc Zinnschlag
19bd0f90b9
Merge remote-tracking branch 'rainChu/torches'
2013-10-16 21:24:45 +02:00
Alex "rainChu" Haddad
65818155d8
Fixed punctuation consistency
2013-10-16 15:14:35 -04:00
Alex "rainChu" Haddad
e11da5c0a3
Added a constructor to Light CustomData
2013-10-16 15:13:36 -04:00
Alex "rainChu" Haddad
2643214ca6
Lights extinguish underwater
2013-10-15 21:50:32 -04:00
Alex "rainChu" Haddad
30ee3c5cf6
Equipped torches and lights run out of fuel
2013-10-15 21:50:14 -04:00
Emanuel Guevel
ba4b8a37e2
Remember pressed message box button longer
...
Remember which button was pressed until a new interactive message box is
displayed or until the pressed button number is read.
Before that, it was not possible to get the pressed button after the
message box was hidden/destroyed.
2013-10-14 12:55:06 +02:00
