Marc Zinnschlag
9f0dac00ec
silenced a warning
2013-11-14 12:22:24 +01:00
Marc Zinnschlag
a8274e5c86
Merge remote-tracking branch 'potatoesmaster/inventory-fix'
2013-11-13 13:55:24 +01:00
Emanuel Guevel
baf13483c0
Update actor model only when in the current cell
2013-11-13 00:04:04 +01:00
scrawl
6f3d737498
Missing const, thanks to jeaye
2013-11-10 23:27:11 +01:00
scrawl
1773c70455
Merge branch 'master' of https://github.com/zinnschlag/openmw into magic
2013-11-10 22:03: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
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
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
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
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
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
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
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
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
Marc Zinnschlag
ce8694c84e
Merge remote-tracking branch 'scrawl/master'
2013-10-13 18:55:49 +02:00
scrawl
683ad40e21
No need for this ifdef since there is a default argument.
2013-10-13 18:28:22 +02:00
scrawl
fa264935ff
We can apply vsync at runtime now that the Ogre bug is fixed.
2013-10-13 17:56:26 +02:00
scrawl
f504ab42fe
Turn off vsync while in the loading screen
2013-10-13 17:52:14 +02:00
Marc Zinnschlag
2606feec3a
Merge remote-tracking branch 'lgro/cfg_without_data_path'
2013-10-12 13:52:38 +02:00
Lukasz Gromanowski
5ce1f50fab
Cleanup in MWGui::WindowManager constructor initialzation list.
...
Corrected order of initialization list, and added missing
member field initializations - without this openmw crashes when
installer is interrupted and there are no valid data path
in openmw.cfg, as reported by BrotherBrick in:
https://forum.openmw.org/viewtopic.php?f=20&p=19501#p19499
Signed-off-by: Lukasz Gromanowski <lgromanowski@gmail.com>
2013-10-10 23:06:37 +02:00
Jordan Ayers
6e4978643c
Magic Effect descriptions: support feet / level modes.
...
Show proper suffixes for all magnitudes.
Drop extra 'times' symbol in 'timesInt format (not consistent
with other magnitude displays).
2013-10-09 00:08:11 -05:00
Jordan Ayers
6ab7002908
MagicEffect: Put magnitude type into ESM::MagicEffect helper.
2013-10-07 22:28:55 -05:00
Jordan Ayers
065f435225
Format fix: remove extra spaces from ranged TimesINT formatting.
2013-10-07 20:02:20 -05:00
Jordan Ayers
6303e56ce4
Magic Effect Display cleanup: Don't put spaces in percentages.
2013-10-06 20:35:59 -05:00
Jordan Ayers
707f45aa8e
Magic Effect Display improvement.
...
Related to Bug #794 .
Always show one decimal point precision for Fortify Max. Magicka effect.
2013-10-06 20:26:39 -05:00
Jordan Ayers
6983a55a16
Magic effect display improvement.
...
Related to Bug #794 .
Show the "x INT" notation for Fortify Max. Magicka.
Show "%" notation for weakness / resistance effects.
2013-10-06 19:32:40 -05:00
Marc Zinnschlag
0f1c4cb00e
cleanup
2013-09-23 15:34:52 +02:00
Berulacks
91d7291c0c
Switched to using proper enums as opposed to ints.
2013-09-23 08:31:36 -04:00
Berulacks
0c518fb047
Replaced tabs with spaces.
2013-09-23 07:36:50 -04:00
Berulacks
c423479f20
Fixed bug #887
2013-09-23 07:31:14 -04:00
scrawl
d5ef843f56
Fix a missing model update
2013-09-16 19:22:08 +02:00
scrawl
09e692f1f6
Fixed polish font
2013-09-10 22:11:57 +02:00
scrawl
5918b84666
Don't crash on resize events during load
2013-08-28 17:05:28 +02:00
scrawl
d3d6dfbde8
Refactored loading screen
...
- Add loading progress for data files, global map, terrain
- Refactored and improved cell loading progress
2013-08-27 15:48:13 +02:00
scrawl
c6d2d1999a
Fix an item duplication glitch
2013-08-25 17:40:08 +02:00
vorenon
3bf3bd4b8c
Silenced some warnings
2013-08-21 13:53:49 +02:00
scrawl
0545622f5a
Fix werewolf state not getting completely reset when starting a new game
2013-08-20 11:24:19 +02:00
scrawl
ebf9debb80
Enabled terrain self shadows, implemented getHeightAt, some optimizations
2013-08-19 20:39:37 +02:00
Chris Robinson
2853b56ed5
Throw an exception when trying to get an empty Ptr's type
2013-08-15 04:52:01 -07:00
Chris Robinson
48c07fbd98
Remove some unnecessary fields from Ptr
2013-08-14 17:05:42 -07:00
Marc Zinnschlag
e2e76147c8
Merge remote-tracking branch 'potatoesmaster/magic'
2013-08-13 15:36:43 +02:00
Emanuel Guevel
ad3646cb15
Fix spell icons displayed when effect ended
2013-08-13 04:57:45 +02:00
Emanuel Guevel
37ea0f3fb9
Display refusal message when weapon/magic icons are clicked as werewolf
2013-08-12 15:36:16 +02:00
