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
Star-Demon
43c33ee85f
Merge remote branch 'zinnschlag/master'
2011-01-09 16:43:33 -05:00
Star-Demon
e98eef8cd3
corrected grammar for merge
2011-01-09 16:42:38 -05:00
Marc Zinnschlag
46a8ccc2ff
changed collision mode instruction from enable/disable to toggle
2011-01-09 21:07:27 +01: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
Marc Zinnschlag
bb34f6e7fc
added Enable/DisableCollision instructions
2011-01-09 20:44:17 +01:00
Marc Zinnschlag
0a832f2d23
Merge branch 'playerpos' into script
2011-01-09 19:22:27 +01:00
Marc Zinnschlag
f01a3d5e35
split Player class into a MWWorld and a MWRender component
2011-01-08 15:11:37 +01:00
Marc Zinnschlag
4f51391003
general player class cleanup
2011-01-06 10:07:01 +01:00
Marc Zinnschlag
4dd8616f87
Merge remote branch 'pvdk/master'
...
Conflicts:
apps/openmw/engine.cpp
apps/openmw/mwsound/soundmanager.cpp
2011-01-06 09:45:14 +01:00
Pieter van der Kloet
dd4d022301
Converted all tabs to four spaces
2011-01-05 22:18:21 +01:00
Jan-Peter Nilsson
ba18dc46ef
Don't try to play random tunes when sound is disabled
2011-01-05 02:12:43 +01:00
Jan-Peter Nilsson
d38f2f0a00
See if we have an instance of mData before trying to use it otherwise we get a crash when starting with --nosound
2011-01-05 02:12:13 +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
Star-Demon
fec90122c3
Added enumerated States to inputmanager to handle future standard actions.
2011-01-02 11:55:00 -05:00
Jason Hooks
f3ae1ea737
NPC leg appearance changed
2011-01-01 13:00:58 -05:00
Jason Hooks
ba168b22e9
cleanupandupdate
2011-01-01 11:47:12 -05:00
Jason Hooks
11406ae6f3
cleanupandupdate
2011-01-01 11:45:11 -05:00
Marc Zinnschlag
2ffe1206a6
merged opcode classes that came in explicit and implicit variants
2010-12-31 19:09:25 +01:00
Marc Zinnschlag
67a745cdf6
workaround for NPC activation crash
2010-12-31 15:50:54 +01:00
Marc Zinnschlag
2628b5143c
Merge remote branch 'jpn/dialouge'
2010-12-30 15:11:17 +01:00
Marc Zinnschlag
5336b90149
music player and NPC rendering branch
2010-12-30 14:50:35 +01:00
Marc Zinnschlag
e404d71e4f
fixes for class selection merge
2010-12-30 14:27:19 +01:00
Jason Hooks
60601682cd
Beast races fixed
2010-12-21 21:45:54 -05:00
Jason Hooks
1896a6a2e8
Preliminary npcs4
2010-12-13 16:01:52 -05:00
Jason Hooks
467988455c
Preliminary npcs3
2010-12-12 22:05:47 -05:00
Jason Hooks
dfe20033ea
Preliminary npcs2
2010-11-25 18:36:25 -05:00
Jason Hooks
6aaedff86a
Preliminary NPCs
2010-11-25 15:44:56 -05:00
Jason Hooks
a9892161af
MP3 functions moved to soundmanager
2010-11-11 19:47:26 -05:00
Jason Hooks
be1582a88f
Regional Sounds
2010-11-08 18:01:33 -05:00
Jason Hooks
a038c67e5a
Preliminary region sound framework2
2010-11-07 12:51:59 -05:00
Jason Hooks
cab2341259
Preliminary region sound framework
2010-11-06 13:11:09 -04: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
54319b0117
Use the input manager to enable the dialog
2010-11-06 01:09:05 +01:00
Jan-Peter Nilsson
700e379d56
Fix some compiler warnings
2010-11-06 01:07:48 +01:00
Jason Hooks
a7c3a29ffd
Music Player with directory mp3 lookup
2010-11-01 17:06:13 -04:00
Jason Hooks
74aba13053
Music Player
2010-10-31 12:23:03 -04:00
Jason Hooks
ffaaad188a
using theirs
2010-10-27 12:32:50 -04: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
51f26e059a
Make sure player is updated after birthsign is set.
2010-10-23 01:28:30 +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
38ab9f7a3d
Merge branch 'newchar'
...
Conflicts:
components/esm_store/store.hpp
2010-10-22 10:27:32 +02:00
Marc Zinnschlag
493b1ff081
gcc compatibility fix
2010-10-22 10:21:42 +02:00
Marc Zinnschlag
cc86fe54d5
Merge remote branch 'amos/gui-windows' into newchar
2010-10-22 10:12:39 +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
Marc Zinnschlag
a8c974d2e7
added set/get/mod instructions for skills
2010-10-20 11:31:42 +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
Marc Zinnschlag
1c4db82a0e
added --script-all switch
2010-10-06 14:52:53 +02:00
Marc Zinnschlag
8659ce3a82
extended --start switch for exterior cell support
2010-10-05 18:23:53 +02:00
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
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
Marc Zinnschlag
0111631ee9
very early implementation of exterior rendering
2010-08-20 13:33:03 +02:00
Nicolay Korslund
3127602c57
Added file_finder component. Used by sound system.
2010-08-20 12:56:46 +02:00
Marc Zinnschlag
de6e8b4cad
Merge commit 'upstream/master'
2010-08-20 09:42:14 +02:00
Nicolay Korslund
104f3fdd50
Added path conversion for say() sounds
2010-08-20 09:36:34 +02:00
Marc Zinnschlag
b15c917c01
Merge commit 'upstream/master'
2010-08-19 16:13:16 +02:00
Nicolay Korslund
064bc4b6c9
Finished sound system
2010-08-19 16:05:48 +02:00
Marc Zinnschlag
67a067e49c
changed name of teleport doors to the name of the destination cell
2010-08-19 13:19:23 +02:00
Marc Zinnschlag
6e46ddae33
more detailed report of unhandled info record fields
2010-08-19 13:06:15 +02:00
Marc Zinnschlag
3b49d6c826
added NPC stats
2010-08-19 12:49:13 +02:00
Nicolay Korslund
38ad2d98f9
Fixed windows issues + one minor optimization on to_utf8
2010-08-18 19:50:59 +02:00
Nicolay Korslund
358e1ca5a5
Added custom UTF8 converter. Removed iconv dependency.
2010-08-18 18:45:44 +02:00
Nicolay Korslund
9a5e7816eb
Renabled music. WILL CRASH WITH MPG123 v1.12.1.
2010-08-18 14:50:49 +02:00
Nicolay Korslund
65c2070086
Temporarily disabled music
2010-08-18 13:05:31 +02:00
Nicolay Korslund
9300e60514
Merge branch 'master' of http://github.com/zinnschlag/openmw
2010-08-18 11:22:51 +02:00
Nicolay Korslund
31017447eb
Added --nosound switch
2010-08-18 11:16:15 +02:00
Marc Zinnschlag
4f3f174016
fixed a dialogue bug
2010-08-18 11:06:41 +02:00
Nicolay Korslund
304692dc8e
Merge branch 'master' of http://github.com/zinnschlag/openmw
2010-08-18 10:49:55 +02:00
