Marc Zinnschlag
53e77d4196
Merge remote branch 'scrawl/tooltips' into next
2012-04-30 10:21:21 +02:00
scrawl
2f0a69160c
small fix
2012-04-30 02:10:55 +02:00
scrawl
22f524f8d5
potion effects in tooltip
2012-04-30 01:53:22 +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
scrawl
eca18f3e1d
dialogue topic and choice sorting independent of case
2012-04-29 18:13:03 +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
9f1199ee7e
removing a using directive from a header file
2012-04-23 15:29:15 +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
scrawl
4889902b98
magic effect widget improvements, read name of effect from GMST and don't show duration/target for constant effects
2012-04-18 21:18:53 +02:00
scrawl
c7381d4491
adding widget MWEnchantment
2012-04-18 18:09:30 +02:00
scrawl
d568b27b92
spell widget i18n improvements (used e.g. in birth menu)
2012-04-18 16:53:56 +02:00
scrawl
8231cab599
correct case for dialogue topics
2012-04-17 23:47:50 +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
94993b515c
clean up and tooltip padding
2012-04-17 16:49:28 +02:00
scrawl
8eb0636344
restored gui-mode tooltips
2012-04-17 16:00:13 +02:00
scrawl
cdd4d83d9e
moved the tooltip info to the appropriate MWWorld::Class classes
2012-04-16 22:58:16 +02:00
scrawl
c4825cdb43
fixed gold pickup sound for international MW versions, fix npc tooltip
2012-04-16 20:20:18 +02:00
scrawl
cfa37b0e77
fix another bunch of gui stuff, some strings were untranslated and buttons were not resized to fit their text
2012-04-16 19:14:05 +02:00
scrawl
424a90aa92
back & ok button caption
2012-04-16 17:46:54 +02:00
scrawl
14377ba789
window caption fix
2012-04-16 17:30:57 +02:00
scrawl
b3dc1931a9
general GUI refactoring, part 1
2012-04-16 15:48:01 +02:00
scrawl
f5ab127a39
toggleFullHelp
2012-04-16 15:00:44 +02:00
scrawl
194ecf274c
attribute tooltips
2012-04-16 00:16:35 +02:00
scrawl
5d9648d645
fix const reference
2012-04-15 22:00:28 +02:00
scrawl
705d4c6d54
mostly complete
2012-04-15 21:14:14 +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
scrawl
800df7376c
use the cursors from morrowind.bsa and remove mwpointer.png
2012-04-12 14:26:21 +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
Roman Melnik
91a377df86
Fix behaviour of the MapWindow
...
The map now will track player's position/rotation when
pinned, and will not update if position/rotation didn't
change since last frame.
2012-04-01 23:51:49 +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
Roman Melnik
d09f0610ea
Add basic windows pinning
...
Create WindowPinnableBase class for windows which should be
allowed to be pinned.
Add skin for pinnable windows - currently just a copy of normal
window with 1 extra button (hopefully this can be improved later).
Handle clicking on PinToggle button (pinning/unpinning a window).
2012-04-01 20:36:57 +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
d3f31c3498
dialogue window enhancements
2012-03-30 13:53:35 +02:00
scrawl
8d224f009f
toggleFogOfWar script command
2012-03-29 19:45:19 +02:00
Marc Zinnschlag
a0c5ccf974
Merge remote branch 'lgro/valgrind'
2012-03-28 21:46:47 +02:00
Lukasz Gromanowski
f86d53636d
Issue #225 : Correction to commit fa4c4b8.
...
Correction to commit fa4c4b8
2012-03-28 21:36:38 +02:00
Lukasz Gromanowski
fa4c4b8f21
Issue #225 : Initialize members in class constructor.
2012-03-27 23:07:25 +02:00
Marc Zinnschlag
a996cfed71
Merge remote branch 'ace/win-fixes' into next
2012-03-27 20:11:46 +02:00
Alexander "Ace" Olofsson
55f1053b4f
Windows fixes for compiling and linking
2012-03-27 00:36:53 +02:00
Lukasz Gromanowski
5185a28b60
Issue #225 : Initialize all class members in constructor.
2012-03-26 19:09:55 +02:00
scrawl
f959a5cbeb
auto adjust size of map window title bar
2012-03-24 23:24:19 +01:00
scrawl
a6259a1b0d
bugfixes
2012-03-23 17:37:56 +01:00
