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
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
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
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
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
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
1e8d894e1c
Starting inventory window
2012-04-21 10:51:01 +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
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
8d224f009f
toggleFogOfWar script command
2012-03-29 19:45:19 +02: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
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
abe38e5f87
Started to weire the dialogue manager and the dialogue GUI
2012-02-05 10:54:56 +01:00
Marc Zinnschlag
52a6605f10
Merge remote branch 'mirc/refactor_wm' into refactor_wm
...
- changed the way dynamics stats are passed to the character creation object
- some more clean up
Conflicts:
.gitignore
apps/openmw/mwgui/window_manager.cpp
apps/openmw/mwgui/window_manager.hpp
2012-02-03 11:24:28 +01:00
Cris Mihalache
4bc7051741
Finished refactoring, brought CharacterCreation up to standards
2012-02-02 18:31:28 +02:00
Cris Mihalache
ed5892eb5c
Finished moving the bulk of character creation code
2012-01-30 21:53:17 +02:00
Cris Mihalache
4b758376be
Created a class for char gen, and starting moving code to it
2012-01-30 16:38:43 +02:00
Cris Mihalache
6d4fa9274e
Moved OpenEngine systems into their appropriate classes
2012-01-29 17:31:18 +02:00
Marc Zinnschlag
e3631003e9
Merge remote branch 'yacoby/detailed_fps'
2012-01-17 14:04:00 +01:00
Jacob Essex
3b15170d09
Cleaned up and simplified the code relating to the fps display
2012-01-16 18:16:33 +00:00
Jacob Essex
18e4b73a86
Added a more detailed fps counter displaying the triangle and batch count
2012-01-16 15:33:21 +00:00
gugus
d59284a096
first attempt to read the journal
2011-12-29 17:58:58 +01:00
gugus
bc51ba5a38
Add the journal window (J key). It's still not in the right position.
2011-11-28 16:51:11 +01:00
Sebastian Wick
317c920e03
everything works, also the readPressedButton function should do the job
2011-07-12 20:05:04 +02:00
Sebastian Wick
a4217f8fb8
Everything should work fine but deleting the existing MessageBox'es.
2011-06-15 22:53:05 +02:00
Sebastian Wick
56dc9ffcf3
now, realy deleted needless code.
2011-06-14 18:29:55 +02:00
Marc Zinnschlag
717b5e1784
fixed a constness problem
2011-04-21 10:49:45 +02:00
Jan-Peter Nilsson
f83c5327f3
Move eventDone to WindowBase and make it tell which window is done
2011-03-12 10:56:10 +01:00
Jan-Peter Nilsson
54fc64cb6a
Decrease number of classes that need to know about other components
2011-03-12 10:56:10 +01:00
Jan-Peter Nilsson
67b4243a7f
Use one instead of five state variables to keep track of character creation progress
2011-03-12 10:56:10 +01:00
Jan-Peter Nilsson
183ccad872
Move ClassPoint struct definition from source to header file
2011-03-12 10:56:10 +01:00
Jan-Peter Nilsson
53b85eaaa9
Stat setValue, use the enum values all the way through instead of converting enum->string->same enum
2011-03-12 10:56:10 +01:00
