Marc Zinnschlag
|
6fe6f3d282
|
adjust initial magicka based on Fortify Maximum Magicka effect
|
2010-09-30 15:58:31 +02:00 |
|
Marc Zinnschlag
|
98405a5716
|
implemented magic effects from abilities (effects are not applied yet)
|
2010-09-30 15:42:28 +02:00 |
|
Marc Zinnschlag
|
eeca39220b
|
added spell list to creature stats (for now only type Ability; magic effects not applied yet), generate spell list according to race and birthsign during character creation
|
2010-09-30 14:28:01 +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 |
|
Marc Zinnschlag
|
49f68e08bf
|
Redemption compatibility fix
|
2010-09-26 10:01:30 +02:00 |
|
Marc Zinnschlag
|
12a15e3fb7
|
implemented class effects on player skills
|
2010-09-26 09:55:00 +02:00 |
|
Marc Zinnschlag
|
19fdd48f75
|
fixed a bug in class-part of setting initial skills
|
2010-09-26 09:36:15 +02:00 |
|
Marc Zinnschlag
|
9a0618fbb8
|
fixed a comment
|
2010-09-25 20:23:38 +02:00 |
|
Marc Zinnschlag
|
5260cb2d16
|
first set of additional doxygen comments
|
2010-09-25 15:03:53 +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 |
|
Marc Zinnschlag
|
283e0df3a0
|
send skill updates to GUI sub-system
|
2010-09-21 17:42:07 +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
|
647129c866
|
The type used for Stat/DynamicStat templates are now stored as a typedef. Added some convenience constructors for initializing Stat/DynamicStat objects.
|
2010-09-20 13:10:15 +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
|
54996684aa
|
Merge branch 'master' into gui-windows
|
2010-09-19 02:04:36 +02:00 |
|
Jan Borsodi
|
64fce8d321
|
Added an option (USE_DEBUG_CONSOLE) to cmake file to disable the console for debug builds on windows. If set to false all debug output is redirect to the debug output of Visual Studio.
|
2010-09-19 02:01:01 +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 |
|
Jan Borsodi
|
cf20233d7e
|
Merge remote branch 'zini/newchar' into gui-windows
|
2010-09-18 18:32:10 +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 |
|
Marc Zinnschlag
|
7cd40fc7e4
|
made engine framelistener more crash-resistant
|
2010-09-18 08:39:21 +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
|
9683a7094d
|
Added faction, birth sign, reputation and bounty to stat screen. All values are currently hardcoded.
|
2010-09-18 01:53:54 +02:00 |
|
Jan Borsodi
|
46e828dbd9
|
Split code for generating skill list into reusable methods, this makes it easier to add other items to the list.
|
2010-09-18 01:44:40 +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
|
be8f852663
|
implemented skill value handling during character creation (untested)
|
2010-09-16 10:45:08 +02:00 |
|
Nicolay Korslund
|
3e170002e2
|
Merge remote branch 'zinnschlag/cell'
|
2010-09-16 10:25:11 +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
|
ff6315a8a6
|
Improved parameter name for size sent to text input dialog.
|
2010-09-15 21:48:55 +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
|
1d69689f77
|
Uppercase OK.
|
2010-09-15 19:55:09 +02:00 |
|
Jan Borsodi
|
dbc3a43f13
|
Adjusting y coord of ok button is wrong, should be width.
|
2010-09-15 19:50:11 +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 |
|
Jan Borsodi
|
5802930500
|
Text edit field now gets focus when the dialog is shown.
|
2010-09-15 16:12:36 +02:00 |
|
Marc Zinnschlag
|
2527fe92a7
|
implemented creature/NPC level
|
2010-09-15 15:32:35 +02:00 |
|
Marc Zinnschlag
|
d910baebe6
|
adjust player's attributes according to class boni
|
2010-09-15 15:23:38 +02:00 |
|
Marc Zinnschlag
|
de04ae0900
|
class name wasn't displayed correctly
|
2010-09-15 15:12:42 +02:00 |
|
Marc Zinnschlag
|
243c9712a6
|
set player attributes according to race and gender
|
2010-09-15 15:10:13 +02:00 |
|
Marc Zinnschlag
|
53df82e293
|
fixed race name (was using internal ID as display name)
|
2010-09-15 15:01:02 +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 |
|
Marc Zinnschlag
|
fff4bc29f4
|
store results of character creation and update GUI
|
2010-09-15 14:33:02 +02:00 |
|
Jan Borsodi
|
30e0d713ed
|
Changed list of skill names to contain the ID of the names instead, the actual names are then fetched from GMST.
|
2010-09-15 13:44:24 +02:00 |
|
Marc Zinnschlag
|
5b0cb097cf
|
calculate dynamic stats during character creation
|
2010-09-15 13:41:39 +02:00 |
|
Marc Zinnschlag
|
c0b9424bcf
|
added framework for character creation
|
2010-09-15 13:31:26 +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 |
|
Jan Borsodi
|
850b8eb6a7
|
Race dialog uses the ID of the race object instead of the name when referencing it.
|
2010-09-15 13:04:57 +02:00 |
|
Jan Borsodi
|
0dafd30dfc
|
The race dialog now fetches strings from GMST.
|
2010-09-15 12:56:44 +02:00 |
|
Jan Borsodi
|
a676763aa6
|
Dialog now goes to next dialog if the "next" button is shown, this follows Morrowind's behavior.
|
2010-09-15 12:44:43 +02:00 |
|
Jan Borsodi
|
3cc57a058a
|
The label for the name dialog is now fetched from the GMST store.
|
2010-09-15 12:41:53 +02:00 |
|
Marc Zinnschlag
|
9dffa75a15
|
handle name change during character creation
|
2010-09-15 12:22:06 +02:00 |
|
Jan Borsodi
|
edb2df7d27
|
Merge remote branch 'zini/newchar' into gui-windows
|
2010-09-14 23:27:43 +02:00 |
|
Jan Borsodi
|
e47568ea2e
|
Merge branch 'master' into gui-windows
|
2010-09-14 23:27:35 +02:00 |
|
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.
|
2010-09-14 23:26:34 +02:00 |
|
Jan Borsodi
|
85ded0edc3
|
Update description of the race dialog file.
|
2010-09-14 23:26:34 +02:00 |
|
Jan Borsodi
|
cd9bb37f1f
|
Change name of ifdef guard to reflect new filename.
|
2010-09-14 23:26:34 +02:00 |
|
Jan Borsodi
|
18cdb3cccc
|
Removed prefix from mw_layout.hpp.
|
2010-09-14 23:26:33 +02:00 |
|
Jan Borsodi
|
4675402e0b
|
Updated code to use the new name for the race dialog.
|
2010-09-14 23:26:33 +02:00 |
|
Jan Borsodi
|
93608ca892
|
Removed prefix from filename and changed name as only the race dialog will be placed in it.
|
2010-09-14 23:26:33 +02:00 |
|
Jan Borsodi
|
415426c30b
|
Convert tabs to spaces.
|
2010-09-14 23:26:32 +02:00 |
|
Jan Borsodi
|
7c17e27be4
|
Set mode back to GM_Game when mode was not handled.
|
2010-09-14 23:26:32 +02:00 |
|
Jan Borsodi
|
fb0f8d9386
|
Removed race dialog activation from the inventory mode for real this time.
|
2010-09-14 23:26:32 +02:00 |
|
Jan Borsodi
|
ae4d5291b2
|
Change text for ok button to next when showNext is true, also adjust position/sizes.
|
2010-09-14 23:26:31 +02:00 |
|
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.
|
2010-09-14 23:26:31 +02:00 |
|
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.
|
2010-09-14 23:26:31 +02:00 |
|
Jan Borsodi
|
670174004a
|
Extra check in case of invalid index values.
|
2010-09-14 23:26:30 +02:00 |
|
Jan Borsodi
|
b1451c4349
|
Only show playable races.
|
2010-09-14 23:26:30 +02:00 |
|
Jan Borsodi
|
cb98bd1a79
|
Spellpower list is now fetched from the ESM store.
|
2010-09-14 23:26:30 +02:00 |
|
Jan Borsodi
|
8f6d24bea4
|
Race dialog now gets the list of races and skills from the ESM store.
|
2010-09-14 23:26:29 +02:00 |
|
Nicolay Korslund
|
004541f5cf
|
Tested and applied Chris' sound patch.
|
2010-09-14 13:27:20 +02:00 |
|
Marc Zinnschlag
|
a077e2cb2c
|
changed character creation interface to enforce a Redemption-compatible implementation
|
2010-09-14 09:34:00 +02:00 |
|
Marc Zinnschlag
|
e411c6e833
|
added callback-interface for character creation
|
2010-09-13 22:59:28 +02:00 |
|
Jan Borsodi
|
e88f67bb3c
|
Merged public functions for controlling gender, face and hair with the event function, no need to have both.
|
2010-09-13 21:52:08 +02:00 |
|
Jan Borsodi
|
e60b1f88d2
|
Added unique names for skill/power sub-widgets.
|
2010-09-13 21:52:08 +02:00 |
|
Jan Borsodi
|
4d36cf2b55
|
Changed some variable names to follow Morrowind naming.
|
2010-09-13 21:52:08 +02:00 |
|
Jan Borsodi
|
beee17b36f
|
Implemented race dialog for character creation, it currently only contains hardcoded values.
|
2010-09-13 21:52:07 +02:00 |
|
Jan Borsodi
|
0e1a761167
|
Added initial implementation of inventory window, contains basic layout with hardcoded values.
|
2010-09-13 21:52:07 +02:00 |
|
Marc Zinnschlag
|
814d721e33
|
build external cell names from name of region instead of from internal region id
|
2010-09-11 15:12:42 +02:00 |
|
Marc Zinnschlag
|
db2b238328
|
adjusted coordinates for coc/coe for exteriors (place player in the middle of the cell instead of at the border)
|
2010-09-11 12:21:55 +02:00 |
|
Marc Zinnschlag
|
5f84b680af
|
implemented exterior coc
|
2010-09-11 11:55:28 +02:00 |
|
Marc Zinnschlag
|
7ea6a75a26
|
another merge fix
|
2010-09-10 13:01:37 +02:00 |
|
Marc Zinnschlag
|
1dc805d0d4
|
Merge branch 'master' into exterior
Conflicts:
apps/openmw/mwscript/docs/vmformat.txt
|
2010-09-08 15:38:19 +02:00 |
|
Nicolay Korslund
|
93ef530c93
|
Minor fix on the last commit
|
2010-09-07 19:52:54 +02:00 |
|
athile
|
11022f1520
|
Fix crash at shutdown. updater() is still referenced by OGRE after it is deleted, since the SoundImpl is deleted by ~Engine before mRoot is deleted.
|
2010-09-07 15:21:38 +01:00 |
|
Nicolay Korslund
|
d911653846
|
Merge with athile's WIP windows build
|
2010-09-02 12:55:27 +02:00 |
|