Marc Zinnschlag
|
3c71378fad
|
Issue 61: improved ingredients handling in alchemy and documenation
|
2012-10-18 14:41:57 +02:00 |
|
Marc Zinnschlag
|
3fe0a73cf2
|
Issue #61: increase alchemy skill on successful potion creation
|
2012-10-18 14:38:38 +02:00 |
|
Marc Zinnschlag
|
510674aa5e
|
Merge branch 'master' into alchemy
Conflicts:
components/esm/loadmgef.hpp
|
2012-10-18 14:37:05 +02:00 |
|
Marc Zinnschlag
|
5fbca239dd
|
Issue #61: potion creation (1st part; still missing some implementations)
|
2012-10-18 14:02:06 +02:00 |
|
Marc Zinnschlag
|
35d099a638
|
disabling gcc extensions
|
2012-10-09 17:10:25 +02:00 |
|
Marc Zinnschlag
|
1cc2c2055f
|
Issue #61: Implemented basic ingredient handling in Alchemy class
|
2012-10-02 10:20:26 +02:00 |
|
Marc Zinnschlag
|
6469933ce8
|
Merge branch 'master' into alchemy
Conflicts:
apps/openmw/mwgui/alchemywindow.cpp
|
2012-10-02 09:30:49 +02:00 |
|
greye
|
2fa4ac177a
|
initial resolving
|
2012-10-01 00:23:49 +04:00 |
|
Marc Zinnschlag
|
42f02f3ccd
|
Issue #61: Re-implemented tool selection in Alchemy class
|
2012-09-30 18:54:20 +02:00 |
|
Marc Zinnschlag
|
c6fd864a76
|
Issue #61: Forgot to add some files
|
2012-09-29 10:02:46 +02:00 |
|
Marc Zinnschlag
|
a34bdb9623
|
per NPC ID interaction tracking
|
2012-09-25 10:48:57 +02:00 |
|
scrawl
|
9f2668b45b
|
Task #400 Review GMST access
|
2012-09-22 21:35:57 +02:00 |
|
scrawl
|
b91d74d394
|
fix normalized encumbrance
|
2012-09-21 17:56:15 +02:00 |
|
scrawl
|
872fcf3e3d
|
sleeping restoration of health, magicka, and fatigue
|
2012-09-21 17:53:16 +02:00 |
|
greye
|
18cc435aa1
|
resolving conflicts
|
2012-09-21 13:13:11 +04:00 |
|
greye
|
7606ebafd6
|
resolving conflicts, minor update
|
2012-09-17 11:37:50 +04:00 |
|
scrawl
|
cf358fa79d
|
>= instead of ==
|
2012-09-15 19:20:13 +02:00 |
|
scrawl
|
0dc242c603
|
don't increase skill beyond 100
|
2012-09-15 19:10:48 +02:00 |
|
scrawl
|
f5237ff1a6
|
skill gain from books
|
2012-09-15 19:06:56 +02:00 |
|
scrawl
|
234f8fa5d5
|
added the missing sound & notification for skill increase
|
2012-09-15 18:35:59 +02:00 |
|
scrawl
|
b34b894d6a
|
removed some debug stuff
|
2012-09-15 17:20:47 +02:00 |
|
scrawl
|
76b494100e
|
finished?
|
2012-09-15 17:12:42 +02:00 |
|
Marc Zinnschlag
|
2ccd7a480d
|
Issue #356: added a missing return
|
2012-09-13 13:01:59 +02:00 |
|
Marc Zinnschlag
|
9de7b3bf90
|
Issue #356: Properly support ingredients effect in ActiveSpells (hopefully)
|
2012-09-13 11:30:59 +02:00 |
|
Marc Zinnschlag
|
0af0dc0d5d
|
Issue #356: More CreatureStats cleanup
|
2012-09-13 11:13:05 +02:00 |
|
Marc Zinnschlag
|
2934987f78
|
Issue #356: Some CreatureStats cleanup
|
2012-09-13 10:52:34 +02:00 |
|
Marc Zinnschlag
|
9dcf8939e9
|
Issue #356: added function for fatigue term calculation
|
2012-09-13 10:45:32 +02:00 |
|
Marc Zinnschlag
|
fca3b67507
|
Issue #356: basic support for ingredients in ActiveSpells (still using the wrong formula)
|
2012-09-13 09:30:47 +02:00 |
|
Marc Zinnschlag
|
ead04e1cc3
|
Issue #389: added AI sequence to CreatureStats; execute AI packages during the regular actor update
|
2012-09-04 13:32:35 +02:00 |
|
Marc Zinnschlag
|
345eec1135
|
Issue #389: added AI package base class and AI packages management class
|
2012-09-04 13:25:53 +02:00 |
|
scrawl
|
6161f81c24
|
last bits of the quick key menu.
|
2012-08-27 20:44:14 +02:00 |
|
Marc Zinnschlag
|
e97d23e626
|
Issue #361: reset skill level in race selection stage
|
2012-08-16 15:42:37 +02:00 |
|
Marc Zinnschlag
|
6534c2a55a
|
Issue #107: WindowManager is accessed only through the interface class from now on
|
2012-08-12 18:11:09 +02:00 |
|
Marc Zinnschlag
|
b68f9d6a28
|
Issue #107: MechanicsManager is accessed only through the interface class from now on
|
2012-08-11 17:30:55 +02:00 |
|
greye
|
32b1350b63
|
CreatureStats class
|
2012-07-22 18:29:54 +04:00 |
|
Marc Zinnschlag
|
483b125aad
|
avoid locking up in case actor updates repeatedly throw exceptions
|
2012-07-17 18:37:20 +02:00 |
|
Marc Zinnschlag
|
beb18282bb
|
Issue #342: various fixes
|
2012-07-17 16:44:55 +02:00 |
|
Marc Zinnschlag
|
76de2f7360
|
Issue #342: handle magic effects 79-82 and 17-20
|
2012-07-17 15:49:37 +02:00 |
|
Marc Zinnschlag
|
a3652f16ce
|
Issue #342: factored out dynamic stats calculation into a separate function
|
2012-07-17 12:18:43 +02:00 |
|
Marc Zinnschlag
|
ec9ebe6b58
|
Merge branch 'skillgain' into potions
Conflicts:
apps/openmw/mwmechanics/activespells.cpp
|
2012-07-10 14:08:30 +02:00 |
|
Marc Zinnschlag
|
0d8150f4bd
|
Issue #324: added useSkill function to NpcStats (adjust skill level according to use)
|
2012-07-09 21:15:52 +02:00 |
|
Marc Zinnschlag
|
25a5657d80
|
Issue #324: Modified the interface for modified stats
|
2012-07-09 20:34:12 +02:00 |
|
Marc Zinnschlag
|
fe86ce5a2c
|
DrawState workaround
|
2012-07-07 20:53:19 +02:00 |
|
Marc Zinnschlag
|
0f41cc499d
|
Issue #324: Added skill gain calculation function
|
2012-07-06 21:07:04 +02:00 |
|
Marc Zinnschlag
|
d30ba14a17
|
Issue #324: Finished turning NpcStats into a proper class
|
2012-07-06 18:23:48 +02:00 |
|
Marc Zinnschlag
|
771863e73b
|
Issue #324: Started turning NpcStats into a proper class; fixed a cmake script bug; fixed a namespace issue
|
2012-07-06 15:50:26 +02:00 |
|
Marc Zinnschlag
|
c85aaafac2
|
more include cleanup (most removing Ogre.h)
|
2012-07-03 15:32:38 +02:00 |
|
Marc Zinnschlag
|
87667ab57e
|
Issue #107: Ptr related include cleanup
|
2012-07-03 13:55:53 +02:00 |
|
Marc Zinnschlag
|
4c39fefd1e
|
Issue #107: World is accessed only through the interface class from now on; some include cleanup
|
2012-07-03 12:30:50 +02:00 |
|
Marc Zinnschlag
|
83c3972a89
|
Issue #314: added return value to addSpell function
|
2012-06-24 16:23:43 +02:00 |
|
Marc Zinnschlag
|
aa827442e8
|
Issue #314: Generalised ActiveSpells class so that it can handle lasting effects from potions too
|
2012-06-24 11:39:21 +02:00 |
|
Marc Zinnschlag
|
ea29b74bb4
|
added per NPC/creature basic AI-settings (hello, fight, flee, alarm)
|
2012-06-16 16:17:42 +02:00 |
|
scrawl
|
298ae4f7f8
|
HUD icons for selected weapon / selected spell / selected enchanted item
|
2012-05-29 18:33:01 +02:00 |
|
scrawl
|
48ba293e88
|
added the success formula, and spell deleting (shift+click)
|
2012-05-29 15:13:44 +02:00 |
|
scrawl
|
5412d6ed9e
|
fixed a typo that prevented spells from getting added
|
2012-05-29 10:47:48 +02:00 |
|
scrawl
|
a54623bcd2
|
reset attributes when building player
|
2012-05-28 11:37:56 +02:00 |
|
Marc Zinnschlag
|
c0ee382c72
|
Issue #176: made actor deregistration more robust
|
2012-05-24 13:21:52 +02:00 |
|
Marc Zinnschlag
|
3e85151c9d
|
Merge remote branch 'scrawl/inventoryGUI'
Conflicts:
apps/openmw/CMakeLists.txt
|
2012-05-21 10:13:27 +02:00 |
|
scrawl
|
76d71f86bc
|
fixed a faction case folding issue
|
2012-05-21 03:10:55 +02:00 |
|
Marc Zinnschlag
|
9f1919a230
|
Issue #256: added active spell management (completely untested)
|
2012-05-19 15:01:07 +02:00 |
|
Marc Zinnschlag
|
635a89c35c
|
Issue #256: RNG fix
|
2012-05-19 14:43:02 +02:00 |
|
Marc Zinnschlag
|
124ea77612
|
Issue #256: consider equipped items when calculating magic effects
|
2012-05-18 15:48:55 +02:00 |
|
Marc Zinnschlag
|
372efaafd7
|
Issue #256: changed implementation of MagicEffects::operator+=
|
2012-05-18 15:27:41 +02:00 |
|
Marc Zinnschlag
|
40c58c1bb7
|
Issue #256: fixed a capitalisation mistake
|
2012-05-18 15:26:08 +02:00 |
|
Marc Zinnschlag
|
5236bcb557
|
Issue #256: added operator+= for MagicEffects
|
2012-05-18 15:12:11 +02:00 |
|
Marc Zinnschlag
|
79055e281d
|
Issue #256: Force update after building the player character
|
2012-05-18 13:54:07 +02:00 |
|
Marc Zinnschlag
|
e1997b7f04
|
Issue #256: added MagicEffects::add overload for EffectLists
|
2012-05-18 13:17:35 +02:00 |
|
Marc Zinnschlag
|
e56ff9283d
|
Issue #256: moved magic effects update from MechanicsManager to Actors
|
2012-05-17 13:21:49 +02:00 |
|
Marc Zinnschlag
|
1fddbf9a40
|
Issue #256: moved dynamic stats update from MechanicsManager to Actors
|
2012-05-17 13:15:31 +02:00 |
|
scrawl
|
4655ec94f0
|
Merge branch 'master' into physicsaedra2 & fix warnings
Conflicts:
apps/openmw/mwworld/scene.cpp
|
2012-04-30 18:46:51 +02:00 |
|
Marc Zinnschlag
|
35f478071e
|
Issue #255: deleted the old environment class and using the new one instead
|
2012-04-23 15:27:03 +02:00 |
|
Jason Hooks
|
1ce759af06
|
Merging in master
|
2012-04-17 18:12:05 -04:00 |
|
Alexander "Ace" Olofsson
|
0c6862e3e6
|
Undefining some windows defines
|
2012-04-13 15:09:38 +02:00 |
|
Marc Zinnschlag
|
37f478b69a
|
Merge branch 'spells'
Conflicts:
apps/openmw/CMakeLists.txt
apps/openmw/mwmechanics/npcstats.hpp
|
2012-04-13 11:32:33 +02:00 |
|
Marc Zinnschlag
|
52c7ee3b6a
|
moved selected spell from NpcStats to Spells
|
2012-04-13 10:49:45 +02:00 |
|
Marc Zinnschlag
|
26a529111c
|
removed old known spell list from NpcStats
|
2012-04-11 19:45:56 +02:00 |
|
Marc Zinnschlag
|
77065390d7
|
simplifying Spells class
|
2012-04-11 19:40:42 +02:00 |
|
Marc Zinnschlag
|
e04ccfced0
|
replaced old abilities container in CreatureStats with a Spells object
|
2012-04-11 19:03:36 +02:00 |
|
Marc Zinnschlag
|
750d79eaf0
|
added spell container class
|
2012-04-11 19:03:06 +02:00 |
|
Marc Zinnschlag
|
5e9d209b21
|
Merge remote branch 'minty3/testbranch'
|
2012-04-08 23:40:48 +02:00 |
|
Aleksandar Jovanov
|
23cc1d17ca
|
missing ; added
|
2012-04-08 13:28:34 +02:00 |
|
Aleksandar Jovanov
|
c589cbd4ff
|
enum bug fix
|
2012-04-08 13:25:28 +02:00 |
|
Marc Zinnschlag
|
ab2a1297b0
|
exclude player from auto equip
|
2012-04-08 13:01:03 +02:00 |
|
Marc Zinnschlag
|
dcab6737e5
|
consider skills when auto equipping
|
2012-04-08 12:26:21 +02:00 |
|
Aleksandar Jovanov
|
b1259ca15c
|
added a 'backend' for NPC/Player draw state
|
2012-04-08 12:25:33 +02:00 |
|
Marc Zinnschlag
|
12f7bae526
|
added known spells and selected spell to NpcStats
|
2012-04-07 18:37:41 +02:00 |
|
Marc Zinnschlag
|
751e7d2199
|
basic auto-equipping (picks the first matching item
|
2012-03-31 17:26:15 +02:00 |
|
Marc Zinnschlag
|
0892df0ad3
|
framework for gamemechanics-realted actor updated
|
2012-03-30 17:01:55 +02:00 |
|
Marc Zinnschlag
|
d717b7b9dd
|
factored out actor related game mechanics code into a separate class
|
2012-03-30 16:18:58 +02:00 |
|
Jason Hooks
|
18a139cd66
|
adding up and down move buttons
|
2012-03-24 22:03:08 -04:00 |
|
Jason Hooks
|
ee98a2af1a
|
Empty npcs
|
2011-12-09 00:08:30 -05:00 |
|
Jason Hooks
|
7bd911b401
|
Problems with handles
|
2011-11-24 23:13:34 -05: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 |
|
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 |
|
gugus
|
84dce2eb36
|
add physic and solve a problem with window.h macro min/max
|
2011-02-19 19:18:03 +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
|
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
|
b48a5084be
|
added NPC stances
|
2011-01-18 10:45:29 +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 |
|
Jan Borsodi
|
51f26e059a
|
Make sure player is updated after birthsign is set.
|
2010-10-23 01:28:30 +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 |
|
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
|
283e0df3a0
|
send skill updates to GUI sub-system
|
2010-09-21 17:42:07 +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 |
|
Marc Zinnschlag
|
be8f852663
|
implemented skill value handling during character creation (untested)
|
2010-09-16 10:45:08 +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
|
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 |
|
Marc Zinnschlag
|
fff4bc29f4
|
store results of character creation and update GUI
|
2010-09-15 14:33:02 +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 |
|
Marc Zinnschlag
|
9dffa75a15
|
handle name change during character creation
|
2010-09-15 12:22:06 +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 |
|
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 |
|
Marc Zinnschlag
|
8e6a765603
|
fixed a stats bug (reducing modified stats via setModified didn't work correctly
|
2010-08-05 16:40:21 +02:00 |
|
Marc Zinnschlag
|
ca842d1b4d
|
reimplemented access to creature stats via new class interface
|
2010-08-03 11:49:12 +02:00 |
|
Marc Zinnschlag
|
b584215680
|
moved stats label <-> GMST text mapping from mwmechanics to mwgui; added missing stats window labels
|
2010-08-01 10:25:50 +02:00 |
|
Marc Zinnschlag
|
9fafac1ef8
|
removed encoding workaround for attribute names
|
2010-07-31 19:41:15 +02:00 |
|
Marc Zinnschlag
|
3b6b343c9b
|
added GUI update for health, magicka and fatigue
|
2010-07-28 18:48:01 +02:00 |
|
Marc Zinnschlag
|
455bcf3b01
|
added get, set and mod instructions for health, magicka and fatigue
|
2010-07-28 18:27:46 +02:00 |
|
Marc Zinnschlag
|
63f686ffab
|
update attribute values in stats window
|
2010-07-27 15:59:41 +02:00 |
|
Marc Zinnschlag
|
335425bb12
|
added MechanicsManager::update function (doesn't update anything yet)
|
2010-07-27 14:46:05 +02:00 |
|
Marc Zinnschlag
|
1d9df6cf40
|
implemented handling of disabled actors
|
2010-07-27 14:43:46 +02:00 |
|
Marc Zinnschlag
|
3d987f1b7a
|
register actors in active cells with MechanicsManager
|
2010-07-27 14:05:05 +02:00 |
|
Marc Zinnschlag
|
77a0215d53
|
added get-, set- and mod-instructions for attributes
|
2010-07-26 23:09:37 +02:00 |
|
Marc Zinnschlag
|
04b86f7e1e
|
added first set of character and creature stats (attributes)
|
2010-07-26 12:52:32 +02:00 |
|
Marc Zinnschlag
|
ecd05fd15e
|
fixed an include guard
|
2010-07-26 11:58:49 +02:00 |
|
Marc Zinnschlag
|
61d09c4768
|
read attribute names from GMST instead of using hard-coded names (doesn't fully work yet, because of encoding issues)
|
2010-07-26 11:15:38 +02:00 |
|