Marc Zinnschlag
53e0e38862
added missing TCL instruction
2011-04-06 09:49:00 +02:00
Marc Zinnschlag
f321e549a4
added instruction GetPCCell
2011-04-04 15:10:37 +02:00
Marc Zinnschlag
e4a0702bb4
added journal-related script instructions
2011-04-04 14:49:26 +02:00
Marc Zinnschlag
b40117449a
added journal script interface
2011-04-04 11:23:15 +02:00
Marc Zinnschlag
190f77f6c9
added journal class
2011-04-04 11:16:56 +02:00
Jan-Peter Nilsson
dc4e6216c3
Initialize member variables in the same order they are defined to avoid compiler warning
2011-04-03 13:20:42 +02:00
Jan-Peter Nilsson
a94de76801
Whitespace changes only tabs->spaces and removal of traling space (including mangle and openengline)
2011-04-03 13:20:42 +02:00
Jan-Peter Nilsson
2e2d490c78
Remove unused variable (compiler warning)
2011-04-03 13:20:18 +02:00
Marc Zinnschlag
beb1422c77
allow multiple --master and --plugin command line arguments
2011-03-29 13:57:56 +02:00
Pieter van der Kloet
833a61dd82
Fixed Boost errors with 1.46 caused by the deprecated name file_string()
2011-03-28 17:36:05 +02:00
Marc Zinnschlag
53e1d0e7e7
more cleanup
2011-03-23 23:05:15 +01:00
Marc Zinnschlag
a70e582ae2
removed debugging leftovers from the tab_complition branch
2011-03-23 23:03:41 +01:00
Marc Zinnschlag
c571148bef
Merge branch 'collision'
2011-03-23 22:57:56 +01:00
Marc Zinnschlag
5661dc27c2
removed a leftover from physics debugging
2011-03-23 22:56:58 +01:00
gugus
3ad2b9986e
fix actors not beeing deleted. Need the latest OEngine.
2011-03-23 19:16:51 +01:00
Marc Zinnschlag
d7226fc9c2
Merge branch 'tab_completion'
2011-03-23 17:08:52 +01:00
Marc Zinnschlag
7144657cfc
Merge branch 'script'
2011-03-23 17:07:05 +01:00
gugus
773b7635a4
decrease the range of the raycast, and modifie the gravity/speed of the player.
2011-03-22 21:30:46 +01:00
Marc Zinnschlag
0866e4d4fe
fix: NPCs were not added to physics system
2011-03-22 20:31:33 +01:00
Marc Zinnschlag
9946bb36f7
Merge remote branch 'gus/collision' into collision
2011-03-22 20:20:49 +01:00
gugus
7a28c9f3aa
fix the door bug
2011-03-22 20:15:19 +01:00
Marc Zinnschlag
7653caea27
Merge branch 'master' into collision
...
Conflicts:
apps/openmw/mwclass/npc.cpp
2011-03-22 20:02:03 +01:00
gugus
0cc94c81d4
Merge remote branch 'upstream/collision' into collision
2011-03-22 14:14:56 +01:00
Marc Zinnschlag
7b5d24c853
fixed a bug in phyiscs update code
2011-03-22 13:48:31 +01:00
gugus
3dddcbd958
fix a camera problem and increase player speed
2011-03-22 13:01:23 +01:00
Marc Zinnschlag
91ea36509d
gus' fly mode fix; manually applied
2011-03-21 14:08:56 +01:00
Marc Zinnschlag
8788dcebcf
Merge remote branch 'gus/collisions' into collision
2011-03-20 22:38:42 +01:00
gugus
8aeefd2af8
fix the fall bug when using ToggleCollision. Require lastest change with OEngine.
2011-03-20 21:52:31 +01:00
Marc Zinnschlag
647e88003e
build and activation fix
2011-03-19 19:54:37 +01:00
gugus
21c224af25
add gravity change to the ToggleCollisionMode function.
2011-03-18 13:32:42 +01:00
gugus
102f1ee5dc
filled the toggleCollisionMode function. It needs the lastest change in OEngine
2011-03-18 13:23:26 +01:00
gugus
2aee958789
Not sure about this commit: the PhysicEngine was initialized twice...
2011-03-18 13:22:51 +01:00
Marc Zinnschlag
72ce493123
non-unique NPC ID workaround
2011-03-18 10:20:14 +01:00
gugus
98b27813b7
change raycasting
2011-03-17 10:54:38 +01:00
Marc Zinnschlag
72a84356e2
added tcg/tcb instructions (toggle collision rendering); not fully working yet (problem in OpenEngine or MWScene)
2011-03-16 09:09:45 +01:00
Marc Zinnschlag
8ebdd77772
Merge branch 'collision' into script
2011-03-16 08:48:13 +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
Marc Zinnschlag
4100a72e8d
don't do physics calculations while the GUI is up
2011-03-13 22:39:44 +01:00
Marc Zinnschlag
f1bfca7c7c
player class cleanup
2011-03-13 22:37:54 +01:00
Marc Zinnschlag
eb93ef68f1
fixed collision mode interface and redirected collision mode script instruction from Player class to MWScene class
2011-03-13 22:33:55 +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
Nikolay Kasyanov
edcac879d7
Oops. Used tabs instead of 4 spaces. Fixed.
2011-03-12 03:00:42 +03:00
Marc Zinnschlag
a14db99aa8
Merge remote branch 'gus/collisions' into collision
2011-03-11 22:09:01 +01:00
gugus
9b606be4b8
fix direction bug
2011-03-11 19:39:45 +01:00
Marc Zinnschlag
8ed1c59059
Merge remote branch 'jpn/collision' into collision
2011-03-09 19:31:18 +01:00
gugus
00de2e6d98
correct some stuff with the physic implementation
2011-03-09 19:09:11 +01:00
gugus
40193253b0
fix some time bug
2011-03-09 18:29:57 +01:00
Nikolay Kasyanov
768c9bdf07
On OS X openmw now sets current directory to bundle root, openmw.cfg values is relative to bundle root
2011-03-09 01:42:04 +03:00
Nikolay Kasyanov
943eea8104
.app bundle finally works
2011-03-08 22:27:57 +03:00
Nikolay Kasyanov
3d75eea377
Merge remote-tracking branch 'upstream/master'
2011-03-08 19:03:20 +03:00
Jan-Peter Nilsson
12db15d9a2
Reset arm position changed by commit 27f69d0f5b
2011-03-07 19:13:24 +01:00
Jan-Peter Nilsson
d68141d203
Remove unused variables
2011-03-07 19:13:24 +01:00
Jan-Peter Nilsson
6840e2c42f
Fix mising of signed/unsigned types in WindowManager::showClassQuestionDialog
2011-03-07 19:13:24 +01:00
Nikolay Kasyanov
4028600768
Builds on OS X now
2011-03-07 05:09:29 +03:00
Jan-Peter Nilsson
fb2f6f3c02
Delete mPhysicEngine when we are done with it
2011-02-27 13:37:17 +01:00
Jan-Peter Nilsson
1ce77229c0
Don't create physics before we have initialized ogre
2011-02-27 00:50:08 +01:00
Marc Zinnschlag
1e9dc4b435
de-Windownizing and some build-fixes
2011-02-26 16:37:47 +01:00
gugus
33f22fd68b
fix camera bug
2011-02-23 12:28:13 +01:00
gugus
903f39cb50
change the rayCasting system. It use bullet now. NOT TESTED!
2011-02-22 20:52:05 +01:00
gugus
d3c1640723
add physic support
2011-02-22 14:11:53 +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
gugus
ff941b5963
add physic
2011-02-19 17:59:40 +01:00
sergoz
53ac8776ec
added box for fps counter and changed font colour to white
2011-02-19 18:55:58 +03:00
gugus
ee0d73e142
Merge branch 'bullet' of git://github.com/zinnschlag/openmw.git into collisions
2011-02-19 15:54:00 +01:00
gugus
746cf3a45a
add physic.
2011-02-19 11:36:57 +01:00
sergoz
5132531f73
added fps counter
2011-02-18 17:46:24 +03:00
Marc Zinnschlag
ef7a06dea5
player was not registered at mwscene (for physics)
2011-02-11 09:51:11 +01:00
Marc Zinnschlag
9807e7dadc
simplified actor-related physics interface to mwscene
2011-02-11 09:24:59 +01:00
Marc Zinnschlag
5c1aae3e26
added object movement code in mwscene (will be replaced by physics code later); does not work well, because OpenEngine manipulates camera instead of player node
2011-02-10 13:32:34 +01:00
Marc Zinnschlag
9c6bc4975c
attached camera to a scene node
2011-02-10 12:56:19 +01:00
Marc Zinnschlag
151560b882
added missing run flag for NPCs
2011-02-10 11:08:25 +01:00
Marc Zinnschlag
9a3158675a
reworked cell changing mechanism
2011-02-10 10:38:45 +01:00
Marc Zinnschlag
f773cf27cb
replaced old movement input system
2011-02-03 12:16:59 +01:00
Marc Zinnschlag
3cd1088695
crash bug fix
2011-02-03 12:16:20 +01:00
Marc Zinnschlag
65232008a5
fixed a crash bug in NPC rendering
2011-02-03 11:47:42 +01:00
Marc Zinnschlag
8a3445beec
collect movement vectors from all actors
2011-02-03 11:43:29 +01:00
Marc Zinnschlag
4468a2b6a8
added movement data to MW references; added movement interface to MWWorld::Class
2011-02-03 11:37:17 +01:00
Marc Zinnschlag
ca44b3640a
pasing movement data from mwmechanics to mwscene and fixed a very stupid interface bug
2011-02-01 10:11:41 +01:00
Marc Zinnschlag
7449de22b1
removed a leftover debugging breadcrumb
2011-01-30 13:21:54 +01:00
Marc Zinnschlag
8b2252e7a1
first attempt at building with bullet
2011-01-30 13:19:41 +01:00
Marc Zinnschlag
40d772b33a
call doPhysics function once per frame
2011-01-29 17:39:34 +01:00
Marc Zinnschlag
88b0908104
adding physics when insertering objects into the OGRE scene
2011-01-29 17:33:48 +01:00
Marc Zinnschlag
6a14ea8ec3
handle physics during player changing cells
2011-01-29 16:57:33 +01:00
Marc Zinnschlag
5486c70edf
connected object-manipulator functions in world to physics interface
2011-01-27 09:46:54 +01:00
Marc Zinnschlag
9a5a6eac2b
stop reporting changes originating from physics system back to physics system
2011-01-27 09:29:55 +01:00
Marc Zinnschlag
ec88aee581
added a missing function
2011-01-25 18:12:13 +01:00
Marc Zinnschlag
843a0288c3
added more physics interface to MWScene
2011-01-25 17:56:49 +01:00
Marc Zinnschlag
162db31a5f
physics interface
2011-01-23 15:28:42 +01:00
Marc Zinnschlag
36cb10572a
fixed tab problem
2011-01-18 15:20:36 +01:00
Marc Zinnschlag
eb5e4427c1
Merge remote branch 'star/master' into movement
2011-01-18 15:15:00 +01:00
Star-Demon
588e6e9995
Fixed a syntax error! Oops!
2011-01-18 08:36:42 -05:00
Marc Zinnschlag
b48a5084be
added NPC stances
2011-01-18 10:45:29 +01:00
Star-Demon
09023bb853
Toggle now toggles, conventions...
2011-01-18 00:16:01 -05:00
Star-Demon
962b8c9781
Cleaned up inputmanager, tightened up player.exectueAutoMove()
2011-01-17 16:36:44 -05:00
Star-Demon
1bc9a46c6b
Cleaned up and changed executeAutoMove()
2011-01-17 15:48:12 -05:00
Marc Zinnschlag
18b8cdce29
added GetInterior script function
2011-01-17 10:18:12 +01:00
Star-Demon
90e6029bad
Fixed object reference error in player gets
2011-01-16 13:45:54 -05:00
Star-Demon
81c0909dbf
Player constructor now inits new variables.
2011-01-16 12:39:54 -05:00
Star-Demon
1a56ef9a67
More AutoMove, now including walking - ready for a look and then test
2011-01-16 11:05:03 -05:00
Star-Demon
5aec3815fd
The player should now be able to run AND walk...
2011-01-16 10:47:03 -05:00
Star-Demon
f96f53484c
More AutoMove stuff, Sneak bools, cleaning
2011-01-16 10:25:33 -05:00
Jan-Peter Nilsson
a724de2429
Follow the 'XDG Base Directory Specification' instead of putting the configfile in ~/.openmw/
...
Also updated based on feedback from athile:
Fix broken Linux elif.
Use boost:filesystem instead of mkdir for increased future portability.
Break appart class definition and implementation.
2011-01-14 22:51:47 +01:00
Star-Demon
60c9c31c7a
Silly error Fixed in binding
2011-01-14 10:03:45 -05:00
Star-Demon
bfcfcecab6
Most of AutoMove finished - just needs some speed in Player class.
2011-01-14 09:52:28 -05: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
Star-Demon
3ab4a4487f
Sneak State, Bound Sneak and AutoMove, began outlining AutoMove
2011-01-12 12:19:33 -05:00
Star-Demon
d4dccc0b54
Merge remote branch 'zinnschlag/master'
2011-01-12 12:19:25 -05:00
Jan-Peter Nilsson
851385d989
Allow override of OpenMW user configuration path with OPENMW_HOME environment variable
2011-01-12 18:18:06 +01:00
Jan-Peter Nilsson
8cb8481b37
Use a local plugins.cfg if available (allow us to run without installing)
2011-01-12 18:18:06 +01:00
Jan-Peter Nilsson
4221824681
Build debian package using cpack if dpkg is available
...
Derive version from last tag and get name and email for package maintainer from user's git config if .git is available
2011-01-12 18:18:06 +01:00
Jan-Peter Nilsson
0b1f18cc12
plugins.cfg is global config
2011-01-12 18:18:06 +01:00
Jan-Peter Nilsson
429775d485
Store configuration in /etc/openmw/ and ~/.openmw/ on linux
...
Requires new openengine version.
2011-01-12 18:18:06 +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
27f69d0f5b
Fix some double-to-float Visual Studio warnings in npc.cpp. Add 'm' prefix to member variables in esm_reader.hpp.
2011-01-10 16:13:32 -07:00
athile
75f77e9659
Add 'm' prefix to member variables in ExteriorCell
2011-01-10 15:26:13 -07: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
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
