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
|
c5d3a40fde
|
Fixed ESM bug (quest records).
|
2010-09-02 14:57:26 +02:00 |
|
Nicolay Korslund
|
d911653846
|
Merge with athile's WIP windows build
|
2010-09-02 12:55:27 +02:00 |
|
Marc Zinnschlag
|
6c4c90ef2d
|
Merge branch 'script'
|
2010-09-01 21:04:16 +02:00 |
|
Marc Zinnschlag
|
147dd57162
|
added Lock and Unlock instructions
|
2010-08-30 12:30:34 +02:00 |
|
athile
|
336fb1636c
|
Windows fixes
|
2010-08-30 11:19:45 +01:00 |
|
Marc Zinnschlag
|
61c4fa0630
|
blocked using of locked doors (keys are not considered yet)
|
2010-08-30 12:02:47 +02:00 |
|
Marc Zinnschlag
|
459dd82896
|
implemented locking/unlocking for doors (can not be invoked by user interaction yet)
|
2010-08-30 11:56:55 +02:00 |
|
athile
|
9e2129c4b3
|
WIP Windows build
|
2010-08-30 10:34:13 +01:00 |
|
athile
|
d955a0efc4
|
WIP Windows build
|
2010-08-30 02:12:54 +01:00 |
|
Marc Zinnschlag
|
a899a290c0
|
modified code to avoid a warning on MSVC
|
2010-08-29 23:40:59 +02:00 |
|
Marc Zinnschlag
|
d4bf916f18
|
fixed uninitialized variable in engine
|
2010-08-29 17:46:06 +02:00 |
|
Marc Zinnschlag
|
07c06acc08
|
implemented loading of 3x3 exterior cell grid
|
2010-08-25 11:50:13 +02:00 |
|
Marc Zinnschlag
|
7bb2041418
|
made rendering more robust (no more crashes, even if Ogre throws an exception)
|
2010-08-25 09:43:06 +02:00 |
|
Marc Zinnschlag
|
bdb5749b57
|
temporarily removed statics from raycast test (makes object activation easier by removing inactive obstacles, that overlap the AABB of the object)
|
2010-08-25 09:19:15 +02:00 |
|
Marc Zinnschlag
|
9e8251e6b4
|
finally got rid of the nasty coordinates bug
|
2010-08-22 21:30:48 +02:00 |
|
Marc Zinnschlag
|
15878b12fd
|
Merge branch 'master' into exterior
|
2010-08-22 21:12:16 +02:00 |
|
Marc Zinnschlag
|
0fce360908
|
more refactoring
|
2010-08-22 20:55:22 +02:00 |
|
Marc Zinnschlag
|
f3bf46f1a9
|
fixed AiTravel and changed GetAiPackageDone to return 0 (returning one would interfere with character creation testing at this point)
|
2010-08-22 15:16:11 +02:00 |
|
Marc Zinnschlag
|
68a788b2c8
|
added instructions for enabling/disabling player controls (they don't do anything yet)
|
2010-08-22 15:11:40 +02:00 |
|
Marc Zinnschlag
|
14cf007a3f
|
added first batch of AI-related instructions and functions (they don't do anything at this point)
|
2010-08-22 14:49:25 +02:00 |
|
Marc Zinnschlag
|
b3cc3073a3
|
changed encoding of segment 3 opcodes (increasing the number of opcodes, while reducing the width of the argument)
|
2010-08-22 13:15:56 +02:00 |
|
Marc Zinnschlag
|
08d2b80434
|
message box fix
|
2010-08-22 12:56:35 +02:00 |
|
Marc Zinnschlag
|
17135a6403
|
routed message box output through window manager
|
2010-08-22 11:22:10 +02:00 |
|
Marc Zinnschlag
|
09a258253c
|
removed custom messageBox implementation for console
|
2010-08-22 11:17:19 +02:00 |
|
Marc Zinnschlag
|
276a9db6f7
|
added missing button implementation for MessageBox
|
2010-08-22 11:14:14 +02:00 |
|
Marc Zinnschlag
|
033c771be8
|
load/unload cells while player is moving around in the exteriors
|
2010-08-21 12:41:59 +02:00 |
|
Marc Zinnschlag
|
0d20719158
|
re-routed player movement through MWWorld::World
|
2010-08-21 12:31:04 +02:00 |
|
Marc Zinnschlag
|
fe3b6230fc
|
refactored cell unloading
|
2010-08-21 11:43:07 +02:00 |
|
Marc Zinnschlag
|
b8fee8f1ee
|
removed stray debugging output
|
2010-08-21 09:58:47 +02:00 |
|
Marc Zinnschlag
|
c6f4bcbf68
|
another coordinate system fix; still not working properly
|
2010-08-21 09:48:56 +02:00 |
|
Marc Zinnschlag
|
1f077a5d5f
|
partial coordinates fix (slightly better results when changing cells, but still not completely correct)
|
2010-08-20 17:14:07 +02:00 |
|
Marc Zinnschlag
|
978c73add5
|
fixed sound removal on cell change
|
2010-08-20 15:24:05 +02:00 |
|
Marc Zinnschlag
|
bdd5e2f064
|
modified teleport action to support exteriors; coordinates are wrong here too
|
2010-08-20 14:56:26 +02:00 |
|
Marc Zinnschlag
|
13409b546f
|
Merge commit 'upstream/master'
|
2010-08-20 14:23:18 +02:00 |
|
Nicolay Korslund
|
2ad9850070
|
Added .wav -> .mp3 sound file lookup
|
2010-08-20 14:20:05 +02:00 |
|
Marc Zinnschlag
|
f98012d143
|
Merge commit 'upstream/master'
|
2010-08-20 13:34:16 +02:00 |
|