mirror/openmw-tes3mp
1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 12:49:56 +00:00
Code Issues Releases Wiki Activity
22107 commits 38 branches 54 tags 122 MiB
Commit graph

2711 commits

Author SHA1 Message Date
Chris Robinson
6905bd18ba Filter out the group name from the text keys 
It's already in the animation name, and the text keys are animation-specific
anyway.
 2013-01-21 02:59:12 -08:00
Chris Robinson
85ca1e993f Properly check if an animation exists before playing it 2013-01-19 21:55:04 -08:00
Chris Robinson
68779375b2 Implement WalkLeft and WalkRight character states 2013-01-19 16:19:47 -08:00
Chris Robinson
a7b07ee5cf Don't reset the animation when setting the same state 
Unless looping is being toggled on.
 2013-01-19 15:46:22 -08:00
Chris Robinson
e0541b52c4 Use a list to store and get state information 2013-01-19 14:56:24 -08:00
Chris Robinson
de2d084e61 Add a looping property to handle if an animation should loop 2013-01-19 14:22:15 -08:00
Chris Robinson
0b68953f0d Scale animation speed using the direction length 
The direction length doesn't currently give a good speed, but it's something.
 2013-01-18 21:40:47 -08:00
Chris Robinson
aecfc0829a Implement WalkForward and WalkBack character states 2013-01-18 18:04:00 -08:00
Chris Robinson
e33f59e0fe Ensure the direction vector is initialized and copied properly 2013-01-18 17:41:36 -08:00
Chris Robinson
1cdd64cd9b Return the animation movement from the character controller. 
Consequently, dead actors don't move anymore. The doPhysics call apparently
isn't moving them.
 2013-01-18 17:05:58 -08:00
Chris Robinson
9235fba770 Store the movement vector in the character controller 2013-01-18 16:00:51 -08:00
Chris Robinson
40f8e75763 Use a SpecialIdle state for PlayGroup/LoopGroup invoked animations 
Note that actors will *not* automatically resume a normal idle state afterward.
Their AI will need to control what to do when the special idle is finished.
 2013-01-18 15:39:28 -08:00
Chris Robinson
a527cb8349 Loop the current animation when not dead 
This should be better, but it's not perfect. It misses the case where
start < loop start == loop stop <= stop
 2013-01-18 15:22:14 -08:00
Chris Robinson
c7684cb979 Pass the key time to markerEvent 2013-01-18 14:50:55 -08:00
Chris Robinson
3e9b0a333c Allow specifying the accumulation for animations 
Animations that move a character may do so either visually or physically. An
axis' accumuluation value specifies whether the movement is visual (0) or
physical (1). Idle animations, for instance, typically don't physically move a
character, while death animations may physically move them along the X and Y
planes, but not along Z (the vertical movement is purely visual).
 2013-01-18 14:25:32 -08:00
Chris Robinson
5cafc24ee2 Rename CharState_Alive back to CharState_Idle 2013-01-18 13:43:45 -08:00
Chris Robinson
a94947029e Check the marker name before deciding what to do with it 
Also, don't force 'idle' after a playgroup
 2013-01-18 00:59:48 -08:00
Chris Robinson
9d7ccfda1f Rename CharState_Idle to CharState_Alive 2013-01-17 21:07:36 -08:00
Chris Robinson
8720433fa9 Do not automatically loop animations 
There are 0 length idle animations that break this
 2013-01-17 17:54:09 -08:00
Chris Robinson
8fa1b56efc Loop the current animation if there's nothing more queued 2013-01-17 16:34:26 -08:00
Chris Robinson
7cce44290e Handle the animation queue in mwmechanics 2013-01-17 13:18:40 -08:00
Chris Robinson
47c157303a Filter events that do not belong to the current group 2013-01-17 11:03:58 -08:00
Chris Robinson
da4f17859e Recognize soundgen animation markers 2013-01-17 10:16:36 -08:00
Chris Robinson
7ee389f3b2 Handle animation skipping in the character controller 2013-01-16 21:25:50 -08:00
Chris Robinson
852aa214cc Store the available animation names in the character controller 2013-01-16 21:16:22 -08:00
Chris Robinson
afbc9f3e41 Keep track of the animation group currently playing 2013-01-16 20:44:37 -08:00
Chris Robinson
685f219560 Return a movement vector from the character controller update 2013-01-16 18:56:13 -08:00
Chris Robinson
daad8d9859 Don't update the character controller while paused 2013-01-16 18:03:39 -08:00
Chris Robinson
d2f5a886c7 Handle playgroup and skipanim through mwmechanics 2013-01-16 17:53:18 -08:00
Chris Robinson
46fc61a4c1 Run animations from the character controller 2013-01-16 16:31:09 -08:00
Chris Robinson
46728ab27f Handle "sound:" animation events 2013-01-16 15:52:03 -08:00
Chris Robinson
3c32385e17 Avoid trying to animate things that don't have animations 2013-01-16 15:00:06 -08:00
Chris Robinson
94b93227d3 Treat activators as actors for rendering and mechanics 
Kinda hacky, but it's the only way to get animated activators (flags, silt
striders, etc) to work properly.
 2013-01-16 14:37:32 -08:00
Chris Robinson
d2fc3c7b33 Add a method to tell the character controller of new text keys 2013-01-16 13:09:21 -08:00
Chris Robinson
f46587c383 Store an character controller in the animation 2013-01-16 11:01:08 -08:00
Chris Robinson
3c487e6019 Play an animation when changing states 2013-01-16 10:45:18 -08:00
Chris Robinson
b378bc92a0 Store an animation object in the character controller 2013-01-16 10:16:37 -08:00
Chris Robinson
c1b32d6006 Remove outdated comments 2013-01-16 08:24:20 -08:00
Chris Robinson
3c02e1ccc9 Run physics right after updating the actors 2013-01-16 08:22:38 -08:00
Chris Robinson
94e30199d1 Merge remote-tracking branch 'zini/master' into animation2 
Conflicts:
	components/nifogre/ogre_nif_loader.cpp
 2013-01-15 14:59:30 -08:00
Marc Zinnschlag
654cd3ab9b Issue #479: Use magnitude specified when adding disease 2013-01-13 14:52:55 +01:00
Chris Robinson
94b24f07e1 Keep track of the state in the character controller, and don't remove dead actors from the map 2013-01-12 10:10:27 -08:00
Chris Robinson
4890d901a2 Store an MWWorld::Ptr in the character controller 2013-01-12 08:49:08 -08:00
Chris Robinson
35d17fdaf6 Associate a character controller with each MWWorld::Ptr 2013-01-12 07:12:12 -08:00
Marc Zinnschlag
f4ee8e2642 Issue #479: Added additional magnitude parameter to known spells 2013-01-12 13:10:20 +01:00
Chris Robinson
771a5f7316 Add the beginnings of a character controller 2013-01-10 08:35:24 -08:00
eduard
2dc0064cc2 more string lowercase 2013-01-09 20:51:52 +01:00
scrawl
a5ef669eb6 Merge branch 'master' of git://github.com/zinnschlag/openmw into HEAD 
Conflicts:
	apps/openmw/mwscript/aiextensions.cpp
	apps/openmw/mwscript/docs/vmformat.txt
 2013-01-03 02:34:31 +01:00
Marc Zinnschlag
de4a03081c fixed skill level type in skill level up message 2012-12-10 11:04:21 +01:00
Marc Zinnschlag
5f5addf052 fixed an enum 2012-12-09 00:12:24 +01:00
Marc Zinnschlag
0e7ba008ad another skill gain fix 2012-12-08 14:28:56 +01:00
Marc Zinnschlag
a70a5282f4 fixed an overzealous skill gain error check 2012-12-08 13:37:43 +01:00
greye
682fd23aea fix wrong increment 2012-12-02 21:18:59 +04:00
rpopovici
7079b9062f add AI script functions 2012-11-30 02:16:16 +02:00
scrawl
1def60dbe1 PcExpell, PcExpelled, PcClearExpelled, RaiseRank, LowerRank 2012-11-28 02:15:34 +01:00
scrawl
0db48b29c7 GetSpellEffects, GetRace 2012-11-25 01:26:29 +01:00
Marc Zinnschlag
a092deaee8 various fixes 2012-11-16 20:28:20 +01:00
Marc Zinnschlag
3dc013ceae Merge remote-tracking branch 'gohan/Gohan' 2012-11-16 20:15:58 +01:00
marcin
51027c541e Feature #391 Dummy AI package classes 2012-11-16 18:38:15 +01:00
marcin
bed0280ba1 Feature #391 Dummy AI package classes 2012-11-15 22:33:50 +01:00
marcin
99ddc63e2c Feature #391 Dummy AI package classes 2012-11-15 22:32:15 +01:00
marcin
515419ae0b Feature #391 Dummy AI package classes 2012-11-15 22:22:44 +01:00
marcin
4b939c7521 Feature #391 Dummy AI package classes 2012-11-15 22:15:20 +01:00
Marc Zinnschlag
9669eed083 Issue #219: added last missing function filters 2012-11-15 20:00:27 +01:00
marcin
e6c8e1f0d7 Feature #391 Dummy AI package classes 2012-11-14 18:42:04 +01:00
Marc Zinnschlag
77ba8c5117 Issue #219: implemented rank requirement filter 2012-11-12 13:23:25 +01:00
Marc Zinnschlag
75f64aa38b Merge branch 'master' into dialogue 
Conflicts:
	apps/openmw/mwdialogue/dialoguemanagerimp.hpp
	apps/openmw/mwmechanics/npcstats.cpp
	apps/openmw/mwmechanics/npcstats.hpp
 2012-11-10 15:44:44 +01:00
Marc Zinnschlag
0ab4068fbd Merge remote-tracking branch 'scrawl/persuasion' into next 2012-11-10 14:59:52 +01:00
Marc Zinnschlag
7e8d4bb3c9 Issue #219: added various creature and NPC stats; implemented respective filters 2012-11-10 13:21:38 +01:00
Marc Zinnschlag
d15eb6cd17 Merge remote-tracking branch 'greye/player-model' into next 2012-11-10 12:36:01 +01:00
Marc Zinnschlag
e97f3003ab Issue #219: added expelled status tracking; implemented expelled filter 2012-11-10 12:28:40 +01:00
Marc Zinnschlag
ceaf1677ce Issue #219: rewrote AI settings and implemented AI settings filters 2012-11-10 11:38:37 +01:00
Marc Zinnschlag
a752536cea Issue #219: added function decoding and moved same faction function from DialogueManager to Filter 2012-11-10 09:35:50 +01:00
greye
b1ef0026a9 race selection/inventory preview character model update 2012-11-10 11:41:12 +04:00
scrawl
553ea08eae consider temporary disposition change when trading 2012-11-10 00:42:31 +01:00
scrawl
33b4b29fbc persuasion mechanics, added reputation 2012-11-10 00:29:36 +01:00
scrawl
ace9ee9c83 persuasion dialog 2012-11-09 20:18:38 +01:00
scrawl
f6a9029c4b bounty & disease disposition effect 2012-11-09 18:33:11 +01:00
Marc Zinnschlag
be1334b202 disease tests 2012-11-09 18:16:29 +01:00
Marc Zinnschlag
0727d943b1 Merge branch 'next' into bountydisease 
Conflicts:
	apps/openmw/mwmechanics/npcstats.cpp
 2012-11-09 18:04:44 +01:00
scrawl
d53a7ade1e method names, disposition uint->int 2012-11-09 14:42:09 +01:00
Marc Zinnschlag
39ff2f06ce added bounty to NpcStats 2012-11-09 14:31:38 +01:00
scrawl
b2afb1fd5c Merge branch 'next' of git://github.com/zinnschlag/openmw into MercantilImprovement 
Conflicts:
	apps/openmw/mwbase/mechanicsmanager.hpp
	apps/openmw/mwclass/npc.cpp
	apps/openmw/mwdialogue/dialoguemanagerimp.cpp
	apps/openmw/mwgui/spellbuyingwindow.cpp
	apps/openmw/mwgui/trainingwindow.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
 2012-11-08 23:16:40 +01:00
scrawl
322faf13e4 cleanup 2012-11-08 22:37:59 +01:00
scrawl
bf4e855260 fixed creatures 2012-11-08 22:31:08 +01:00
greye
2a86432887 store birthsign in MWWorld::Player 2012-11-08 18:50:23 +04:00
gugus
0a883f4492 The player can now barter with merchants 2012-11-08 13:38:20 +01:00
greye
83e758ee50 clean up interfaces 2012-11-08 16:37:57 +04:00
greye
9dc9098fa7 update MWBase::World interface since records contains own id 2012-11-08 01:52:34 +04:00
greye
5b9621bca5 store player record data in ESMStore 2012-11-08 01:36:43 +04:00
gugus
bf98b95955 bugfix 2012-11-06 13:10:54 +01:00
greye
620184a009 fix typos 2012-11-06 14:44:56 +04:00
greye
b3ad872845 new interface in manualref, fix various typos 2012-11-06 13:43:48 +04:00
gugus
2841d831a6 Disposition is now updated everyframe 2012-11-05 23:16:37 +01:00
gugus
9ebe9cb40c Disposition is now calculated according to the Wiki. But: bouty and deacease are not implemented (for disposition at least), and there is still no temporary/permanent dispositons changes 2012-11-05 19:55:06 +01:00
greye
86ad7a96f4 applying new interface vol.2, inconsistent 2012-11-05 21:19:22 +04:00
greye
bd1bb2e55d applying new interface vol.1, inconsistent 2012-11-05 18:39:42 +04:00
greye
d205723a17 resolving m prefix/ESMStore movement 2012-11-05 18:02:47 +04:00
greye
8691eac557 resolve Script::mData.mName -> mId, resolve moving ESMStore 2012-11-05 17:41:36 +04:00
greye
2057f5619e move ESMStore to MWWorld 2012-11-05 17:18:01 +04:00
greye
3c2ce25f5f m prefix for mwworld/cellstore.hpp 2012-11-05 16:07:59 +04:00
gugus
f72f898bd9 implement barterOffer. It's used for travel only. 
I've started to implement disposition, but it's very basic for now.
 2012-11-05 11:07:43 +01:00
Marc Zinnschlag
d7add0b9e6 Issue #61: fixed alchemy skill 2012-10-28 14:07:36 +01:00
Marc Zinnschlag
c635447cea Merge branch 'death' 2012-10-27 13:34:20 +02:00
Marc Zinnschlag
ed3641b214 Issue #68: check for essential actors 2012-10-27 13:33:54 +02:00
Marc Zinnschlag
2e63ca5e0a Merge branch 'death' 2012-10-27 11:33:26 +02:00
Marc Zinnschlag
453f347ee8 Issue #68: added getdeadcount script function 2012-10-27 11:33:18 +02:00
Marc Zinnschlag
f72c35fc17 Issue #68: tally deaths 2012-10-27 11:15:52 +02:00
Marc Zinnschlag
6b09b3ad61 Issue #68: Play death animations 2012-10-27 10:36:42 +02:00
Marc Zinnschlag
21c24dedb6 Issue #68: Stop player from dying (temporary workaround) 2012-10-25 12:28:45 +02:00
Marc Zinnschlag
0ab432b074 Issue #68: fixed death detection 2012-10-25 12:22:48 +02:00
Marc Zinnschlag
9172c3ec4d Issue #68: stop NPCs from instantly dropping dead 2012-10-23 13:54:36 +02:00
scrawl
234716daa6 finished spell creation 2012-10-23 11:42:38 +02:00
Marc Zinnschlag
0547f11564 Issue #68: Remove dead actors from actor list 2012-10-20 10:54:51 +02:00
Marc Zinnschlag
f2e25b8a47 Issue #68: Keep dead actors out of the actor list for the current scene 2012-10-20 10:49:48 +02:00
Marc Zinnschlag
3f6afb13f1 Merge remote-tracking branch 'scrawl/alchemy' 2012-10-19 20:09:45 +02:00
scrawl
8d7514e341 corrected chance 2012-10-19 19:48:54 +02:00
Marc Zinnschlag
7884a927c9 Issue #68: added dead flag to CreatureStats 2012-10-19 18:56:22 +02:00
Marc Zinnschlag
bdca5aff87 Issue #68: simplified the dynamic stats interface 2012-10-19 13:10:06 +02:00
Marc Zinnschlag
3f833af46a Issue #407: Fortyfy attribute effects were ignored for the last 3 attributes 2012-10-19 10:07:27 +02:00
scrawl
28cc480ce1 fix some alchemy issues and make the gui use the new implementation 2012-10-18 22:21:39 +02:00
Marc Zinnschlag
1864dbe031 Issue #61: potion creation 2012-10-18 15:33:27 +02:00
Marc Zinnschlag
f5caf227b2 Issue #61: remove ingredients on potion creation 2012-10-18 14:47:23 +02:00
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