Marc Zinnschlag
717b5e1784
fixed a constness problem
2011-04-21 10:49:45 +02:00
Marc Zinnschlag
a70e582ae2
removed debugging leftovers from the tab_complition branch
2011-03-23 23:03:41 +01:00
Marc Zinnschlag
d7226fc9c2
Merge branch 'tab_completion'
2011-03-23 17:08:52 +01:00
gugus
0fb2107265
Merge branch 'master' of git://github.com/zinnschlag/openmw.git into collisions
...
Conflicts:
apps/openmw/mwclass/npc.cpp
2011-03-15 13:36:25 +01:00
Jan-Peter Nilsson
0f2152903e
Get rid of deprecated warning for eventWindowChangeCoord
2011-03-12 13:54:00 +01: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
0695e8d8b2
Move HUD implementation out of the header file
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
gugus
7386fd0442
solve error with min/max macro for windows
2011-02-19 19:21:32 +01:00
gugus
84dce2eb36
add physic and solve a problem with window.h macro min/max
2011-02-19 19:18:03 +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
d865c3cfc6
backend for tab completion: identifiers
2011-01-12 18:48:37 +01:00
Marc Zinnschlag
6848115c18
backend for tab completion: keywords
2011-01-12 18:24:00 +01:00
Marc Zinnschlag
bb2bc0b518
getting rid of the nullptr compatibility nonsense. Hopefully once and for all
2011-01-11 10:11:08 +01:00
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.
2011-01-10 13:48:16 -07:00
Marc Zinnschlag
42ef7a61a0
Merge branch 'script'
...
Conflicts:
apps/openmw/engine.cpp
apps/openmw/mwworld/world.cpp
apps/openmw/mwworld/world.hpp
2011-01-09 20:56:21 +01:00
Pieter van der Kloet
dd4d022301
Converted all tabs to four spaces
2011-01-05 22:18:21 +01:00
Marc Zinnschlag
4a12be11bf
moved PlayerPos class from MWRender to MWWorld and renamed it to Player
2011-01-04 15:58:22 +01: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
d9d626cc95
Make DialogueWindow use the new WindowBase
2010-11-06 11:47:46 +01:00
Jan-Peter Nilsson
180164b2f3
Remove unnecessary includes
2010-11-06 11:45:13 +01:00
Jan-Peter Nilsson
770b490539
Make CreateClassDialog use the new WindowBase
2010-11-06 11:44:02 +01:00
Jan-Peter Nilsson
6fc0e4d6d6
Make DescriptionDialog use the new WindowBase
2010-11-06 11:42:54 +01:00
Jan-Peter Nilsson
12dee62307
Make SelectSkillDialog use the new WindowBase
2010-11-06 11:41:41 +01:00
Jan-Peter Nilsson
8f334d1df2
Make SelectAttributeDialog use the new WindowBase
2010-11-06 11:40:41 +01:00
Jan-Peter Nilsson
037c1021e3
Make SelectSpecializationDialog use the new WindowBase
2010-11-06 11:39:38 +01:00
Jan-Peter Nilsson
4e8f55b630
Make PickClassDialog use the new WindowBase
2010-11-06 11:38:29 +01:00
Jan-Peter Nilsson
ed05c5752b
Make GenerateClassResultDialog use the new WindowBase
2010-11-06 11:37:00 +01:00
Jan-Peter Nilsson
0d97200e18
Make InfoBoxDialog use the new WindowBase
2010-11-06 11:33:30 +01:00
Jan-Peter Nilsson
6c7f59725f
Make StatsWindow use the new WindowBase
2010-11-06 11:29:49 +01:00
Jan-Peter Nilsson
2e7e79f596
Make ReviewDialog use the new WindowBase
2010-11-06 11:29:03 +01:00
Jan-Peter Nilsson
5db021e99b
Make TextInputDialog use the new WindowBase
2010-11-06 11:27:53 +01:00
Jan-Peter Nilsson
e551c60e75
Make RaceDialog use the new WindowBase
2010-11-06 11:26:45 +01:00
Jan-Peter Nilsson
933af72d60
Make BirthDialog use the new WindowBase
2010-11-06 11:26:17 +01:00
Jan-Peter Nilsson
6bf10c93c8
Create a base class for dialog windows
2010-11-06 11:25:16 +01:00
Jan-Peter Nilsson
1ff81354eb
Remove unused variables
2010-11-06 01:17:05 +01:00
Jan-Peter Nilsson
cb3fa7c3b2
Remove unused variables
2010-11-06 01:17:05 +01:00
Jan-Peter Nilsson
6f608f1400
Make loose functions part of the InfoBoxDialog class
2010-11-06 01:15:56 +01:00
Jan-Peter Nilsson
9d57b4f0d6
Do not store StaticTextPtr in WidgetPtr and use setTextColour
2010-11-06 01:14:29 +01:00
Jan-Peter Nilsson
bb212e20f4
Do not store StaticTextPtr in WidgetPtr and use setTextColour
2010-11-06 01:14:29 +01:00
Jan-Peter Nilsson
e5509ce7b1
Use arrays in CreateClassDialog
2010-11-06 01:13:34 +01:00
Jan-Peter Nilsson
528c39f1bd
Use arrays in PickClassDialog
2010-11-06 01:13:34 +01:00
Jan-Peter Nilsson
ef54401407
Use arrays in SelectSkillDialog
2010-11-06 01:11:37 +01:00
Jan-Peter Nilsson
d7b76809ac
Remove unnecessary member variables from SelectAttributeDialog
2010-11-06 01:10:33 +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
cefd5fb338
Reputation and bounty was not initialized to 0.
2010-10-23 01:23:09 +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
e6ad68b8d0
Avoid exception if class ID is not found, instead don't show any fields in the gui.
2010-10-22 23:52:24 +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
6d71094f3b
Updated description dialog (from create class) to use WindowManager::removeDialog.
2010-10-22 23:14:52 +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
c45811770a
Added a custom widget for displaying dynamic stats (health, magicka, fatigue). Can show a title/label, graphical bar and detailed text.
2010-10-20 21:39:18 +02:00
Jan Borsodi
76ab7302b1
Fixed crash when entering the birth dialog two or more times. Array should not have been static.
2010-10-10 02:54:45 +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
3af1c66f8d
Switched to correct GMST values in the Create Class dialog.
2010-09-28 12:06:42 +02:00
Jan Borsodi
8acf04fc08
Added dialog for editing description in custom class dialog.
2010-09-27 12:56:48 +02:00
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.
2010-09-24 15:28:14 +02:00
Jan Borsodi
d97dad7a86
Initial work on the Class Create dialog.
2010-09-22 20:59:13 +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
3e611b5d4c
Added widget for spells, updated race dialog to use that.
2010-09-20 13:36:55 +02:00
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.
2010-09-20 13:17:02 +02:00
Jan Borsodi
eec34e9f0e
Added dialog for picking class from a list.
2010-09-19 04:29:22 +02:00
Jan Borsodi
07b1b21b29
Fixed incorrect comparison with current race, should use the ID not the name.
2010-09-19 04:28:12 +02:00
Jan Borsodi
7bfae798e8
Changed indentation of stats window class from 2 spaces and to 4 spaces.
2010-09-18 21:36:16 +02:00
Jan Borsodi
4f296896e1
Moved code for the stats window from the header file and to the cpp file.
2010-09-18 21:34:49 +02:00
Jan Borsodi
001fc0c6e8
The content of the skill list in the stat window is now scrollable with a vertical scroller.
2010-09-18 21:24:05 +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
