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
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
ed5892eb5c
Finished moving the bulk of character creation code
2012-01-30 21:53:17 +02:00
Cris Mihalache
d17ba6ce19
Forgot the CharacterCreation files
2012-01-30 19:27:49 +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
Marc Zinnschlag
5a70f28f47
removed a warning
2012-01-29 20:29:02 +01: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
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
28bd9ce362
Merge branch 'master' of https://github.com/zinnschlag/openmw.git into journal
2011-12-11 11:21:57 +01:00
gugus
4087ab3cda
correct CMake and add some text formating attempt.
2011-12-01 13:44:34 +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
Marc Zinnschlag
39af941d6f
Issue #19 : Moved code from Engine to WindowManager and ScriptManager
2011-10-09 12:05:13 +02:00
Sebastian Wick
317c920e03
everything works, also the readPressedButton function should do the job
2011-07-12 20:05:04 +02:00
Sebastian Wick
23194a932f
creating the buttons on the fly
2011-06-19 19:41:42 +02:00
Sebastian Wick
5db8e8c449
InterMessageBox game mode
2011-06-19 19:10:44 +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
fc25ccef4e
MW_Dialog set ro right propertys
2011-06-14 22:11:36 +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
2a53afc2bf
Move StatsWindow class to it's own file.
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
Jan-Peter Nilsson
03158f4b62
Change indentation to four spaces
2011-03-12 10:56:10 +01:00
Jan-Peter Nilsson
6840e2c42f
Fix mising of signed/unsigned types in WindowManager::showClassQuestionDialog
2011-03-07 19:13:24 +01:00
sergoz
53ac8776ec
added box for fps counter and changed font colour to white
2011-02-19 18:55:58 +03: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
Marc Zinnschlag
e404d71e4f
fixes for class selection merge
2010-12-30 14:27:19 +01:00
Jan-Peter Nilsson
be5562cb2c
Added dialouge window
2010-11-06 01:09:37 +01:00
Jan-Peter Nilsson
700e379d56
Fix some compiler warnings
2010-11-06 01:07:48 +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
38b434771a
Merge remote branch 'zini/master' into gui-windows
2010-10-23 01:13:11 +02:00
Jan Borsodi
81e83a0813
Player member variables in WindowManager are updated directly when a dialog finishes, needed for review dialog which is shown directly after another closes.
2010-10-23 01:09:33 +02:00
Jan Borsodi
cf9b90386c
Do not set the birth sign ID if it is empty.
2010-10-23 01:01:03 +02:00
Jan Borsodi
a0447bcd95
Made sure review dialog is removed before going to previous dialogs.
2010-10-23 01:00:25 +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
025af1717f
Removed gameWindowSize parameter from all dialogs that had it, instead this is fetched via the environment variable.
2010-10-23 00:17:41 +02:00
Jan Borsodi
12fe9305a6
Further unification of dialog API, all dialogs now have an open() method which updates gui content and makes it visible.
2010-10-23 00:11:54 +02:00
Jan Borsodi
e39f700372
Removed unnecessary methods.
2010-10-23 00:04:00 +02:00
Jan Borsodi
2bf29c17f5
Made sure current player name is shown in name dialog.
2010-10-23 00:00:09 +02:00
Jan Borsodi
aaa80d1eb0
Made sure race and class dialog shows the current player values.
2010-10-22 23:51:53 +02:00
Jan Borsodi
2affe7cf78
Removed earlier workaround code for dialog callbacks, no need to reset them anymore as the dialogs are cleaned up at a later point.
2010-10-22 23:38:36 +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
1f7659cb12
Only set the class and race IDs if they contain a non-empty string.
2010-10-22 23:18:57 +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
Marc Zinnschlag
493b1ff081
gcc compatibility fix
2010-10-22 10:21:42 +02:00
Jan Borsodi
3e5f278882
Fixed birthsign and skill list in review dialog, they were not properly set.
2010-10-21 09:47:34 +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
404aacae1b
Call setPlayerClass when the class has been chosen.
2010-09-21 15:44:48 +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
Jan Borsodi
9a0aea1718
Changed name of function use to set birth sign in stats window.
2010-09-18 18:44:20 +02:00
Jan Borsodi
ccdff570ad
Factions now has a rank value in the stats window.
2010-09-18 18:31:13 +02:00
Jan Borsodi
6f1a41c1bd
The skill values are now stored in the stats window instead of fetching the current player stats. Values can be set with setValue().
2010-09-18 18:31:13 +02:00
Jan Borsodi
41ef0bc08f
Added possibility to configure stat page to show factions, birth sign as well as reputation and bounty.
2010-09-18 02:24:42 +02:00
Jan Borsodi
0868e76ffb
Added display of skills in stat window, the skills are configured with MWGui::WindowManager::configureSkills().
2010-09-18 01:30:23 +02:00
Marc Zinnschlag
bd983717de
fixed compile problem (gcc related?)
2010-09-15 22:22:27 +02:00
Marc Zinnschlag
8de9619579
Merge commit 'amos/gui-windows' into newchar
2010-09-15 22:20:00 +02:00
Jan Borsodi
3cf8472ddc
Centre race dialog on screen.
2010-09-15 21:48:10 +02:00
Jan Borsodi
31a728bf07
Made sure name and race dialog is properly reset when opening again.
2010-09-15 21:36:32 +02:00
Jan Borsodi
8770e4bc92
Made sure text edit widget gets focus when dialog is reopened.
2010-09-15 19:48:37 +02:00
Jan Borsodi
84acab03ec
Avoid delegates being called repeatedly when pressing enter in name dialog.
2010-09-15 19:44:53 +02:00
Jan Borsodi
07dd5e5631
Race and name dialog are now kept in memory after ok/next is clicked, this avoids a crash where MyGUI would call into the dialog widgets after being destroyed.
2010-09-15 19:37:06 +02:00
Marc Zinnschlag
2527fe92a7
implemented creature/NPC level
2010-09-15 15:32:35 +02:00
Jan Borsodi
1907aeb6c6
The game mode is now properly restored once a dialog is finished. Previously the game mode was only set in the window manager but it has to go through the input manager firs to get correct input state. Also updated the gui script commands to also use the input manager and not the window manager.
...
At some point the gui mode code should be moved to a class that handles all game mode (engine?).
2010-09-15 14:48:19 +02:00
Jan Borsodi
869bc4d084
Silence the compiler.
2010-09-15 13:16:54 +02:00
Jan Borsodi
b037780a7d
Disable the invenory window for now, it's not complete and gives compiler warnings.
2010-09-15 13:15:58 +02:00
Jan Borsodi
3f1b90e732
When a dialog is done and no new is to be shown we return to Game mode.
2010-09-15 13:10:47 +02:00
