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
Roman Melnik
911ca4be89
Move MapWindow to separate files
...
Separate MapWindow from bunch of classes in layouts.cpp/hpp
Inherit it from WindowPinnableBase.
TODO: map arrow (player position) updates orientation only
when you open the inventory. When the map window is pinned,
the arrow direction is not updated.
2012-04-01 20:39:53 +03:00
Marc Zinnschlag
ca4ad74151
more cleanup
2012-03-31 21:29:46 +02:00
Eli2
3cc81d74bc
Cleanup, replaced if with switch
2012-03-31 19:50:21 +02:00
scrawl
521b9eec6c
Merge branch 'master' into minimap
...
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
apps/openmw/mwworld/world.cpp
2012-03-30 15:31:07 +02:00
scrawl
4bbedeb3e7
made all dialogs semi transparent (like in morrowind)
2012-03-30 14:01:43 +02:00
scrawl
8d224f009f
toggleFogOfWar script command
2012-03-29 19:45:19 +02:00
Lukasz Gromanowski
5185a28b60
Issue #225 : Initialize all class members in constructor.
2012-03-26 19:09:55 +02:00
scrawl
7a3034701f
functional HUD map
2012-03-23 16:51:56 +01:00
scrawl
ce63d29d4a
rotate hud player arrow
2012-03-23 15:26:24 +01:00
scrawl
06fa310e29
player arrow rotated correctly
2012-03-23 15:00:48 +01:00
scrawl
2dd329938a
automatically zoom in on the player while moving
2012-03-23 08:16:04 +01:00
scrawl
ab9aa1ba74
Merge branch 'next' into minimap
...
Conflicts:
files/mygui/openmw_map_window_layout.xml
2012-03-22 19:36:37 +01:00
scrawl
26aae9d2ce
fix class name typo
2012-03-22 15:10:29 +01:00
scrawl
97ab48993e
more deprecated fixes
2012-03-21 13:32:32 +01:00
scrawl
5e939e4818
map window now works for interiors
2012-03-17 13:59:51 +01:00
scrawl
91d2031eb7
first attempt at map window
2012-03-16 17:09:31 +01:00
scrawl
fa68be2b19
set map window cell name
2012-03-10 16:05:12 +01:00
Marc Zinnschlag
d9945a976d
Merge remote branch 'gus/DialogueSystem' into dialogue
2012-02-12 13:47:04 +01:00
gugus
c65c160e7b
finished connecting the dialogue GUI and the dialogue manager
2012-02-05 12:25:23 +01:00
gugus
abe38e5f87
Started to weire the dialogue manager and the dialogue GUI
2012-02-05 10:54:56 +01:00
