Commit Graph

2502 Commits (d1736ad0c8f10cea05baec60bede218e4fd1f6b0)

Author SHA1 Message Date
sergoz 5132531f73 added fps counter 14 years ago
Marc Zinnschlag d865c3cfc6 backend for tab completion: identifiers 14 years ago
Marc Zinnschlag 6848115c18 backend for tab completion: keywords 14 years ago
Marc Zinnschlag bb2bc0b518 getting rid of the nullptr compatibility nonsense. Hopefully once and for all 14 years ago
athile c459eb7c55 Visual Studio 2010 build fixes. Don't let MyGUI redefine the C++0x keyword nullptr and use _MSC_VER to check if Visual Studio is being used. MSVER is not necessarily defined on VS2010. 14 years ago
Marc Zinnschlag 42ef7a61a0 Merge branch 'script'
Conflicts:
	apps/openmw/engine.cpp
	apps/openmw/mwworld/world.cpp
	apps/openmw/mwworld/world.hpp
14 years ago
Pieter van der Kloet dd4d022301 Converted all tabs to four spaces 14 years ago
Marc Zinnschlag 4a12be11bf moved PlayerPos class from MWRender to MWWorld and renamed it to Player 14 years ago
Marc Zinnschlag 2628b5143c Merge remote branch 'jpn/dialouge' 14 years ago
Marc Zinnschlag e404d71e4f fixes for class selection merge 14 years ago
Jan-Peter Nilsson d9d626cc95 Make DialogueWindow use the new WindowBase 14 years ago
Jan-Peter Nilsson 180164b2f3 Remove unnecessary includes 14 years ago
Jan-Peter Nilsson 770b490539 Make CreateClassDialog use the new WindowBase 14 years ago
Jan-Peter Nilsson 6fc0e4d6d6 Make DescriptionDialog use the new WindowBase 14 years ago
Jan-Peter Nilsson 12dee62307 Make SelectSkillDialog use the new WindowBase 14 years ago
Jan-Peter Nilsson 8f334d1df2 Make SelectAttributeDialog use the new WindowBase 14 years ago
Jan-Peter Nilsson 037c1021e3 Make SelectSpecializationDialog use the new WindowBase 14 years ago
Jan-Peter Nilsson 4e8f55b630 Make PickClassDialog use the new WindowBase 14 years ago
Jan-Peter Nilsson ed05c5752b Make GenerateClassResultDialog use the new WindowBase 14 years ago
Jan-Peter Nilsson 0d97200e18 Make InfoBoxDialog use the new WindowBase 14 years ago
Jan-Peter Nilsson 6c7f59725f Make StatsWindow use the new WindowBase 14 years ago
Jan-Peter Nilsson 2e7e79f596 Make ReviewDialog use the new WindowBase 14 years ago
Jan-Peter Nilsson 5db021e99b Make TextInputDialog use the new WindowBase 14 years ago
Jan-Peter Nilsson e551c60e75 Make RaceDialog use the new WindowBase 14 years ago
Jan-Peter Nilsson 933af72d60 Make BirthDialog use the new WindowBase 14 years ago
Jan-Peter Nilsson 6bf10c93c8 Create a base class for dialog windows 14 years ago
Jan-Peter Nilsson 1ff81354eb Remove unused variables 14 years ago
Jan-Peter Nilsson cb3fa7c3b2 Remove unused variables 14 years ago
Jan-Peter Nilsson 6f608f1400 Make loose functions part of the InfoBoxDialog class 14 years ago
Jan-Peter Nilsson 9d57b4f0d6 Do not store StaticTextPtr in WidgetPtr and use setTextColour 14 years ago
Jan-Peter Nilsson bb212e20f4 Do not store StaticTextPtr in WidgetPtr and use setTextColour 14 years ago
Jan-Peter Nilsson e5509ce7b1 Use arrays in CreateClassDialog 14 years ago
Jan-Peter Nilsson 528c39f1bd Use arrays in PickClassDialog 14 years ago
Jan-Peter Nilsson ef54401407 Use arrays in SelectSkillDialog 14 years ago
Jan-Peter Nilsson d7b76809ac Remove unnecessary member variables from SelectAttributeDialog 14 years ago
Jan-Peter Nilsson be5562cb2c Added dialouge window 14 years ago
Jan-Peter Nilsson 700e379d56 Fix some compiler warnings 14 years ago
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. 14 years ago
Jan Borsodi cefd5fb338 Reputation and bounty was not initialized to 0. 14 years ago
Jan Borsodi 38b434771a Merge remote branch 'zini/master' into gui-windows 14 years ago
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. 14 years ago
Jan Borsodi cf9b90386c Do not set the birth sign ID if it is empty. 14 years ago
Jan Borsodi a0447bcd95 Made sure review dialog is removed before going to previous dialogs. 14 years ago
Jan Borsodi 1c6b9a9b7b Activated buttons in review dialog to go to the respective dialogs. 14 years ago
Jan Borsodi 025af1717f Removed gameWindowSize parameter from all dialogs that had it, instead this is fetched via the environment variable. 14 years ago
Jan Borsodi 12fe9305a6 Further unification of dialog API, all dialogs now have an open() method which updates gui content and makes it visible. 14 years ago
Jan Borsodi e39f700372 Removed unnecessary methods. 14 years ago
Jan Borsodi 2bf29c17f5 Made sure current player name is shown in name dialog. 14 years ago
Jan Borsodi e6ad68b8d0 Avoid exception if class ID is not found, instead don't show any fields in the gui. 14 years ago
Jan Borsodi aaa80d1eb0 Made sure race and class dialog shows the current player values. 14 years ago
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. 14 years ago
Jan Borsodi 06f226f2d8 Updated WindowManager to use the new removeDialog function. 14 years ago
Jan Borsodi f756e171cc Made sure dialog garbage is also cleaned up on destruction. 14 years ago
Jan Borsodi 1f7659cb12 Only set the class and race IDs if they contain a non-empty string. 14 years ago
Jan Borsodi 6d71094f3b Updated description dialog (from create class) to use WindowManager::removeDialog. 14 years ago
Jan Borsodi 506f61d254 Added a method to remove a dialog safely, first hides the dialog then schedules for deletion in the garbage list. 14 years ago
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.
14 years ago
Marc Zinnschlag 493b1ff081 gcc compatibility fix 14 years ago
Jan Borsodi 3e5f278882 Fixed birthsign and skill list in review dialog, they were not properly set. 14 years ago
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. 14 years ago
Jan Borsodi 1c1d33e723 Initial work on the stat review dialog. 14 years ago
Jan Borsodi c45811770a Added a custom widget for displaying dynamic stats (health, magicka, fatigue). Can show a title/label, graphical bar and detailed text. 14 years ago
Jan Borsodi 76ab7302b1 Fixed crash when entering the birth dialog two or more times. Array should not have been static. 14 years ago
Jan Borsodi 0cc8f84393 Finished handling of Create Class dialog, now a new class is created and set in the mechanics manager. 14 years ago
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. 14 years ago
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).
14 years ago
Jan Borsodi 3af1c66f8d Switched to correct GMST values in the Create Class dialog. 14 years ago
Jan Borsodi 8acf04fc08 Added dialog for editing description in custom class dialog. 14 years ago
Jan Borsodi ee101440a2 Continued work on Class Create dialog. Added sub-dialogs for picking specialization, attribute and skill. Also added some definitions in ESM for attributes and specializations. 14 years ago
Jan Borsodi d97dad7a86 Initial work on the Class Create dialog. 14 years ago
Jan Borsodi 404aacae1b Call setPlayerClass when the class has been chosen. 14 years ago
Jan Borsodi cd3e976b7c Added birthsign dialog and spell effect widget. 14 years ago
Jan Borsodi 3e611b5d4c Added widget for spells, updated race dialog to use that. 15 years ago
Jan Borsodi cd8b88dea1 Introduced custom widgets (skill and attribute) which should make it easier to make new windows. Changed race and class dialog to use the new skill and attribute widgets. 15 years ago
Jan Borsodi eec34e9f0e Added dialog for picking class from a list. 15 years ago
Jan Borsodi 07b1b21b29 Fixed incorrect comparison with current race, should use the ID not the name. 15 years ago
Jan Borsodi 7bfae798e8 Changed indentation of stats window class from 2 spaces and to 4 spaces. 15 years ago
Jan Borsodi 4f296896e1 Moved code for the stats window from the header file and to the cpp file. 15 years ago
Jan Borsodi 001fc0c6e8 The content of the skill list in the stat window is now scrollable with a vertical scroller. 15 years ago
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. 15 years ago
Jan Borsodi 9a0aea1718 Changed name of function use to set birth sign in stats window. 15 years ago
Jan Borsodi ccdff570ad Factions now has a rank value in the stats window. 15 years ago
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(). 15 years ago
Jan Borsodi 41ef0bc08f Added possibility to configure stat page to show factions, birth sign as well as reputation and bounty. 15 years ago
Jan Borsodi 9683a7094d Added faction, birth sign, reputation and bounty to stat screen. All values are currently hardcoded. 15 years ago
Jan Borsodi 46e828dbd9 Split code for generating skill list into reusable methods, this makes it easier to add other items to the list. 15 years ago
Jan Borsodi 0868e76ffb Added display of skills in stat window, the skills are configured with MWGui::WindowManager::configureSkills(). 15 years ago
Marc Zinnschlag bd983717de fixed compile problem (gcc related?) 15 years ago
Marc Zinnschlag 8de9619579 Merge commit 'amos/gui-windows' into newchar 15 years ago
Jan Borsodi ff6315a8a6 Improved parameter name for size sent to text input dialog. 15 years ago
Jan Borsodi 3cf8472ddc Centre race dialog on screen. 15 years ago
Jan Borsodi 31a728bf07 Made sure name and race dialog is properly reset when opening again. 15 years ago
Jan Borsodi 1d69689f77 Uppercase OK. 15 years ago
Jan Borsodi dbc3a43f13 Adjusting y coord of ok button is wrong, should be width. 15 years ago
Jan Borsodi 8770e4bc92 Made sure text edit widget gets focus when dialog is reopened. 15 years ago
Jan Borsodi 84acab03ec Avoid delegates being called repeatedly when pressing enter in name dialog. 15 years ago
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. 15 years ago
Jan Borsodi 5802930500 Text edit field now gets focus when the dialog is shown. 15 years ago
Marc Zinnschlag 2527fe92a7 implemented creature/NPC level 15 years ago
Marc Zinnschlag de04ae0900 class name wasn't displayed correctly 15 years ago
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?).
15 years ago
Marc Zinnschlag fff4bc29f4 store results of character creation and update GUI 15 years ago
Jan Borsodi 30e0d713ed Changed list of skill names to contain the ID of the names instead, the actual names are then fetched from GMST. 15 years ago
Jan Borsodi 869bc4d084 Silence the compiler. 15 years ago
Jan Borsodi b037780a7d Disable the invenory window for now, it's not complete and gives compiler warnings. 15 years ago
Jan Borsodi 3f1b90e732 When a dialog is done and no new is to be shown we return to Game mode. 15 years ago
Jan Borsodi 850b8eb6a7 Race dialog uses the ID of the race object instead of the name when referencing it. 15 years ago
Jan Borsodi 0dafd30dfc The race dialog now fetches strings from GMST. 15 years ago
Jan Borsodi a676763aa6 Dialog now goes to next dialog if the "next" button is shown, this follows Morrowind's behavior. 15 years ago
Jan Borsodi 3cc57a058a The label for the name dialog is now fetched from the GMST store. 15 years ago
Marc Zinnschlag 9dffa75a15 handle name change during character creation 15 years ago
Jan Borsodi 481734ee20 Implemented a general text input dialog which can be used to get text input from the player. Used the text input dialog to implement the name dialog for the character creation. 15 years ago
Jan Borsodi 85ded0edc3 Update description of the race dialog file. 15 years ago
Jan Borsodi cd9bb37f1f Change name of ifdef guard to reflect new filename. 15 years ago
Jan Borsodi 18cdb3cccc Removed prefix from mw_layout.hpp. 15 years ago
Jan Borsodi 4675402e0b Updated code to use the new name for the race dialog. 15 years ago
Jan Borsodi 93608ca892 Removed prefix from filename and changed name as only the race dialog will be placed in it. 15 years ago
Jan Borsodi 415426c30b Convert tabs to spaces. 15 years ago
Jan Borsodi 7c17e27be4 Set mode back to GM_Game when mode was not handled. 15 years ago
Jan Borsodi fb0f8d9386 Removed race dialog activation from the inventory mode for real this time. 15 years ago
Jan Borsodi ae4d5291b2 Change text for ok button to next when showNext is true, also adjust position/sizes. 15 years ago
Jan Borsodi de554dffd2 Race dialog is now triggered by setMode(GM_Race) and not part of the inventory mode anymore. Initial implementation of the dialog management of back/ok/next buttons. 15 years ago
Jan Borsodi a59a53882f Added events for ok/back buttons on race dialog, this is now hooked to functions in the window manager. For now they simple hide the window. 15 years ago
Jan Borsodi 670174004a Extra check in case of invalid index values. 15 years ago
Jan Borsodi b1451c4349 Only show playable races. 15 years ago
Jan Borsodi cb98bd1a79 Spellpower list is now fetched from the ESM store. 15 years ago
Jan Borsodi 8f6d24bea4 Race dialog now gets the list of races and skills from the ESM store. 15 years ago
Jan Borsodi e88f67bb3c Merged public functions for controlling gender, face and hair with the event function, no need to have both. 15 years ago
Jan Borsodi e60b1f88d2 Added unique names for skill/power sub-widgets. 15 years ago
Jan Borsodi 4d36cf2b55 Changed some variable names to follow Morrowind naming. 15 years ago
Jan Borsodi beee17b36f Implemented race dialog for character creation, it currently only contains hardcoded values. 15 years ago
Jan Borsodi 0e1a761167 Added initial implementation of inventory window, contains basic layout with hardcoded values. 15 years ago
Nicolay Korslund d911653846 Merge with athile's WIP windows build 15 years ago
athile 336fb1636c Windows fixes 15 years ago
Marc Zinnschlag 08d2b80434 message box fix 15 years ago
Marc Zinnschlag 17135a6403 routed message box output through window manager 15 years ago
Marc Zinnschlag 09a258253c removed custom messageBox implementation for console 15 years ago
Marc Zinnschlag 276a9db6f7 added missing button implementation for MessageBox 15 years ago
Nicolay Korslund 05b3140740 Enabled crosshairs 15 years ago
Marc Zinnschlag b584215680 moved stats label <-> GMST text mapping from mwmechanics to mwgui; added missing stats window labels 15 years ago
Marc Zinnschlag 3b6b343c9b added GUI update for health, magicka and fatigue 15 years ago
Marc Zinnschlag 63f686ffab update attribute values in stats window 15 years ago
Marc Zinnschlag 61d09c4768 read attribute names from GMST instead of using hard-coded names (doesn't fully work yet, because of encoding issues) 15 years ago
Marc Zinnschlag cf7150e585 implemented naked expressions in lineparser (used in console; result is send through messagebox interface) 15 years ago
Marc Zinnschlag a87175446c disable windows on startup when --new-game is used 15 years ago
Marc Zinnschlag 281f2d1136 added script interpreter for console 15 years ago
Marc Zinnschlag d72ed19460 implemented script compiler for console 15 years ago
Nicolay Korslund 5ff9344a87 Finished console GUI window 15 years ago
Nicolay Korslund c61212202b Moved mwgui/ back to apps/openmw/. Fixed mouse position bug. 15 years ago
Nicolay Korslund 4d74f85ae0 Moved mwgui manager to components, ready for testing 15 years ago
Marc Zinnschlag 0efe4742a6 added script-gui interface and gui-related script instructions 15 years ago
Marc Zinnschlag 2c63d67ceb added gui manager skeleton and a cmake fix 15 years ago