scrawl
7ef0ad4e39
show faction & birthsign in the stats window
2012-05-19 14:55:09 +02:00
scrawl
24ce88de2a
working mygui tag replacement system for GMST strings
2012-05-19 14:19:21 +02:00
scrawl
8a0c859c16
Merge branch 'iterator' of https://github.com/zinnschlag/openmw into inventoryGUI
2012-05-18 22:27:48 +02:00
scrawl
fb47681fbd
fix a bug, some cleanup
2012-05-18 17:58:33 +02:00
scrawl
52e5e14654
use GMST sDefaultCellname for the map window when cell has no region or name.
2012-05-17 23:42:09 +02:00
scrawl
41efea4c1d
in the trade window, don't show items that the merchant has equipped.
2012-05-17 21:56:16 +02:00
scrawl
6ae642aa06
complete trade window layout
2012-05-17 21:15:48 +02:00
scrawl
4213b4370f
trade window shows up and shows the vendor's inventory items.
2012-05-17 19:53:04 +02:00
scrawl
1f85475536
Merge branch 'master' into inventoryGUI
2012-05-17 19:03:41 +02:00
scrawl
0afda15ce9
fix for cells that have no region.
2012-05-17 18:14:33 +02:00
scrawl
5da4da820e
beginnings of trade window layout.
2012-05-17 17:15:44 +02:00
scrawl
c5d685c780
added an assert
2012-05-16 14:28:57 +02:00
scrawl
b18ee198b4
use a raycast to determine where to place object, if distance is too far
...
drop it on the ground
2012-05-15 16:47:23 +02:00
scrawl
7fbee0d488
use MyGUI::InputManager instead of MWInputManager to detect ctrl/shift
2012-05-15 13:00:26 +02:00
scrawl
24a0fecd37
implemented item count selection dialog
2012-05-15 12:51:51 +02:00
scrawl
933a40de14
better floating object label positioning.
2012-05-14 21:37:43 +02:00
scrawl
6c9f75b322
some unfinished work for dropping objects into the gameworld
2012-05-13 18:35:56 +02:00
scrawl
967fb13fca
remove the old inventory code, split HUD, map and mainmenu into seperate implementation files
2012-05-13 18:14:03 +02:00
scrawl
3a93df8db4
dynamic inventory layout like morrowind
2012-05-13 11:25:35 +02:00
scrawl
d266b4fe87
hide the cursor during drag&drop and don't allow hotkeys that change guimode
2012-05-13 10:18:17 +02:00
scrawl
78b06d0ebf
inventory window pinning
2012-05-12 22:44:12 +02:00
scrawl
19e8e84f9a
more cleanup, removed the redundant ItemWidget and use widget userdata
2012-05-12 18:50:19 +02:00
scrawl
a1b86acc38
Merge branch 'master' into inventoryGUI
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwgui/window_manager.cpp
apps/openmw/mwgui/window_manager.hpp
files/mygui/core.xml
2012-05-11 16:41:27 +02:00
gugus
9dd65dce30
Finished merging.
2012-05-11 11:52:07 +02:00
gugus
8e8f80807e
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI
...
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwclass/apparatus.cpp
apps/openmw/mwclass/armor.cpp
apps/openmw/mwclass/book.cpp
apps/openmw/mwclass/clothing.cpp
apps/openmw/mwclass/container.cpp
apps/openmw/mwclass/ingredient.cpp
apps/openmw/mwclass/light.cpp
apps/openmw/mwclass/lockpick.cpp
apps/openmw/mwclass/misc.cpp
apps/openmw/mwclass/potion.cpp
apps/openmw/mwclass/probe.cpp
apps/openmw/mwclass/repair.cpp
apps/openmw/mwclass/weapon.cpp
apps/openmw/mwgui/window_manager.cpp
apps/openmw/mwgui/window_manager.hpp
apps/openmw/mwworld/class.cpp
2012-05-11 10:40:40 +02:00
gugus
e9134717d6
the GUI part of drag and drop is working
2012-05-08 12:59:47 +02:00
scrawl
499dd26398
dialogue window topic list word-wrapping
2012-05-04 23:53:50 +02:00
scrawl
9fc1138a87
opening, closing and taking books/scrolls works
2012-05-03 05:26:05 +02:00
scrawl
0e6b82284f
book & scroll windows
2012-05-03 03:33:33 +02:00
gugus
5f8c08b18b
some work for dropping objects.
2012-04-30 13:01:18 +02:00
scrawl
b82c39c8be
renamed Widgets::MWEnchantment to Widgets::MWEffectList so it can be
...
reused for potion effects
2012-04-30 01:08:10 +02:00
scrawl
f733382f74
tooltip now contains info about item enchantment
2012-04-30 00:57:41 +02:00
gugus
5603cb312c
Objects can now be selected and follow mouse movements.
2012-04-27 20:54:39 +02:00
scrawl
1b5bfc52a1
Merge branch 'next' of https://github.com/zinnschlag/openmw into tooltips
...
Conflicts:
apps/openmw/engine.cpp
apps/openmw/mwclass/apparatus.cpp
apps/openmw/mwclass/book.cpp
apps/openmw/mwclass/container.cpp
apps/openmw/mwclass/ingredient.cpp
apps/openmw/mwclass/misc.cpp
apps/openmw/mwclass/npc.cpp
apps/openmw/mwclass/potion.cpp
apps/openmw/mwclass/repair.cpp
apps/openmw/mwgui/window_manager.cpp
2012-04-24 02:02:03 +02:00
Marc Zinnschlag
35f478071e
Issue #255 : deleted the old environment class and using the new one instead
2012-04-23 15:27:03 +02:00
gugus
33654535c1
The inventory window now display the inventory of the player
2012-04-21 11:05:30 +02:00
gugus
1e8d894e1c
Starting inventory window
2012-04-21 10:51:01 +02:00
scrawl
2e57cf5730
fixed the tooltip for doors leading to exteriors, fixed map window cell name
2012-04-17 18:47:51 +02:00
scrawl
cdd4d83d9e
moved the tooltip info to the appropriate MWWorld::Class classes
2012-04-16 22:58:16 +02:00
scrawl
f5ab127a39
toggleFullHelp
2012-04-16 15:00:44 +02:00
scrawl
705d4c6d54
mostly complete
2012-04-15 21:14:14 +02:00
gugus
78c8a22cd1
more clean up. The container GUI shows up now
2012-04-15 19:32:41 +02:00
gugus
a38db39e88
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into inventoryGUI
...
Conflicts:
apps/openmw/CMakeLists.txt
2012-04-15 17:54:13 +02:00
gugus
b309d245c5
cleaning up hircine work
2012-04-15 17:52:39 +02:00
scrawl
d37bc9cba8
basic mouse-over info for in-game objects
2012-04-15 17:10:08 +02:00
scrawl
cac662ca98
basic tooltips
2012-04-14 17:47:44 +02:00
scrawl
e3486931ae
F10 hotkey toggle FPS
2012-04-13 13:17:50 +02:00
Roman Melnik
bdbb8a8d84
Merge remote-tracking branch 'upstream/master' into windowsPinning
...
Conflicts:
apps/openmw/mwgui/window_manager.cpp (keep both changes)
2012-04-07 17:30:20 +03:00
Roman Melnik
ef0a185e11
Pinnable windows: hide hud elements
...
Hide elements of the HUD (health/magicka/stamina bars,
minimap) when the corresponding windows (stats/map) are pinned.
Rearrange the remaining hud elements in such cases (like in the
original Morrowind).
2012-04-06 01:17:23 +03:00
scrawl
0a5757791c
Merge branch 'master' into minimap
2012-04-01 20:17:07 +02:00