Marc Zinnschlag
e818d43bc3
removed an outdated typedef and some dead code
2013-12-05 13:21:26 +01:00
Marc Zinnschlag
63721682f6
GUI fix: previous character was selected when saving new character
2013-12-03 15:19:13 +01:00
Marc Zinnschlag
0f971163f7
use Entry instead of plain string for topic and quest entries
2013-12-01 14:50:25 +01:00
Marc Zinnschlag
b273f9e387
splitting JournalEntry into Entry and JournalEntry
2013-12-01 14:44:27 +01:00
Marc Zinnschlag
43f5f16731
removed a todo comment
2013-11-30 12:54:44 +01:00
Marc Zinnschlag
177aab536d
storing topic name in MWDialogue::Topic (avoids a lookup in the GUI and also serves as preparation for better localisation support in OpenMW 1.1)
2013-11-30 12:41:18 +01:00
Marc Zinnschlag
aebc2791a5
fixed selecting current character based on value stored in settings
2013-11-30 11:08:41 +01:00
Marc Zinnschlag
71436b1160
changed interface for global variable access
2013-11-28 09:10:38 +01:00
Marc Zinnschlag
99ea63dc4a
factored out code for generating month names
2013-11-26 12:47:30 +01:00
Marc Zinnschlag
e6dc927f11
removed duplicates of the cell name function
2013-11-26 11:49:07 +01:00
Marc Zinnschlag
eea433f141
restore last played character selection across sessions
2013-11-26 10:37:58 +01:00
Marc Zinnschlag
e3670cff8a
improved character selection logic
2013-11-24 16:58:41 +01:00
Marc Zinnschlag
67cd0887e6
added description field to saved game record; make use of description in GUI
2013-11-24 15:19:56 +01:00
Marc Zinnschlag
7efac4c9a5
fixed handling of characters without a valid slot
2013-11-24 15:05:00 +01:00
scrawl
2e87cbc231
Add basic functionality to SaveGameDialog
2013-11-21 20:34:34 +01:00
scrawl
cf79a83d4f
Avoid recreating widgets in MainMenu::updateMenu. Fix crash when pressing new game due to the button being destroyed from within it's own delegate.
2013-11-21 19:07:54 +01:00
Marc Zinnschlag
c165894869
load saved game record
2013-11-21 12:24:24 +01:00
Marc Zinnschlag
5e64888227
added basic save slot management and connected main menu save to save function (bypassing the save GUI for now)
2013-11-19 15:38:26 +01:00
Marc Zinnschlag
1c7a4d4b3a
adjust availability of main menu items based on game state
2013-11-18 15:52:25 +01:00
Marc Zinnschlag
ec5b2e9a7e
added running flag; moved new game code to MWState
2013-11-16 12:22:28 +01:00
Marc Zinnschlag
f19973450f
moved exit game flag from Environment to StateManager
2013-11-16 11:07:23 +01:00
Marc Zinnschlag
eddd6bf48d
enabled load and save items in main menu
2013-11-15 10:29:53 +01:00
scrawl
065f14579f
Fix a container window regression (oops)
2013-11-15 02:57:21 +01:00
scrawl
992a8e9c36
Refactor NpcAnimation: get rid of delayed update (no longer required), make sure that the Animation is set up *before* the inventory store is accessed anywhere (which now triggers auto equip and animation update). Allows better tracking of magic VFX for permanent enchantments in InventoryStore.
2013-11-14 14:41:10 +01:00
scrawl
956d8adb99
Merge branch 'master' of https://github.com/zinnschlag/openmw into magic
...
Conflicts:
apps/openmw/mwgui/inventoryitemmodel.cpp
2013-11-14 14:25:22 +01:00
Marc Zinnschlag
9f0dac00ec
silenced a warning
2013-11-14 12:22:24 +01:00
scrawl
a6e2f43b75
Stop continuous VFX when the effect is no longer active.
2013-11-13 15:44:43 +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
60bec03987
Rename variables called 'slots' to work around wrong code parsing in QT Creator.
2013-11-12 23:23:19 +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
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
