teamnwah/openmw-tes3coop
2
0
Fork 1
forked from mirror/openmw-tes3mp
Code Issues Pull requests 1 Releases Wiki Activity
949 commits 34 branches 0 tags 66 MiB
Commit graph

150 commits

Author SHA1 Message Date
sergoz
5132531f73 added fps counter 2011-02-18 17:46:24 +03: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