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
Jan-Peter Nilsson
5342bd77f1
Use one event with a parameters instead of four events to tell with dialog we want to see
2011-03-12 10:56:10 +01:00
Jan-Peter Nilsson
a0ee11c51b
Don't care about the widget
2011-03-12 10:56:10 +01:00
sergoz
5132531f73
added fps counter
2011-02-18 17:46:24 +03:00
Marc Zinnschlag
2628b5143c
Merge remote branch 'jpn/dialouge'
2010-12-30 15:11:17 +01:00
Jan-Peter Nilsson
be5562cb2c
Added dialouge window
2010-11-06 01:09:37 +01:00
Jan Borsodi
f8b96703e6
Added all questions for the generate class dialogs and implemented calculation of class based on the answers given. There are some combinations which does not yield a class yet, will need to figure out the remaining combinations.
2010-10-24 00:45:21 +02:00
Jan Borsodi
1c6b9a9b7b
Activated buttons in review dialog to go to the respective dialogs.
2010-10-23 01:00:07 +02:00
Jan Borsodi
e39f700372
Removed unnecessary methods.
2010-10-23 00:04:00 +02:00
Jan Borsodi
06f226f2d8
Updated WindowManager to use the new removeDialog function.
2010-10-22 23:34:41 +02:00
Jan Borsodi
f756e171cc
Made sure dialog garbage is also cleaned up on destruction.
2010-10-22 23:21:15 +02:00
Jan Borsodi
506f61d254
Added a method to remove a dialog safely, first hides the dialog then schedules for deletion in the garbage list.
2010-10-22 23:14:21 +02:00
Jan Borsodi
16aa13721a
Updated all dialogs to use a garbage list for postponed cleanup, this list is cleared in update() which is called for each frame.
...
Fixed incorrect code in onCreateClassDialogBack, should use set class from pickClassDialog.
Add private method setGuiMode() which calls the input manager, updated all gui-mode changes in WindowManager to use that.
2010-10-22 22:54:15 +02:00
Jan Borsodi
970a7a3498
Removed hardcoded values from review dialog and added functionality for setting all fields in the dialog. Window manager keeps track of player values set from the outside and passes these to the review dialog.
2010-10-21 09:28:09 +02:00
Jan Borsodi
1c1d33e723
Initial work on the stat review dialog.
2010-10-20 21:40:32 +02:00
Jan Borsodi
0cc8f84393
Finished handling of Create Class dialog, now a new class is created and set in the mechanics manager.
2010-10-10 02:43:44 +02:00
Jan Borsodi
232164bfb0
Implemented the final dialog for Generate Class which shows the class that was chosen by the game based on the players chosen questions. The class is currently hardcoded to Acrobat.
2010-10-10 01:52:08 +02:00
Jan Borsodi
b364d47b0b
Implemented the Class Choice dialog which allows the player to choose between three ways to define a class.
...
Added a generic infobox dialog which displays some text and a set of buttons (vertical only for now), this is used for the Class Choice dialogs and the dialogs which shows various questions the player must choose from. The questions are currently hardcoded.
Added more gui states to handle the extra class dialogs (Generate, Pick or Create).
2010-10-10 01:50:19 +02:00
Jan Borsodi
cd3e976b7c
Added birthsign dialog and spell effect widget.
2010-09-21 12:34:47 +02:00
Jan Borsodi
eec34e9f0e
Added dialog for picking class from a list.
2010-09-19 04:29:22 +02:00
Jan Borsodi
573917f3e1
Removed the need to configure the misc skills, they are now automatically set to any skills not part of the major/minor group.
2010-09-18 19:26:45 +02:00
