Commit Graph

2385 Commits (d4d46fc60256177968c96e9653ced2f83652338e)

Author SHA1 Message Date
Chris Robinson 685f219560 Return a movement vector from the character controller update 12 years ago
Chris Robinson daad8d9859 Don't update the character controller while paused 12 years ago
Chris Robinson d2f5a886c7 Handle playgroup and skipanim through mwmechanics 12 years ago
Chris Robinson 46fc61a4c1 Run animations from the character controller 12 years ago
Chris Robinson 46728ab27f Handle "sound:" animation events 12 years ago
Chris Robinson 3c32385e17 Avoid trying to animate things that don't have animations 12 years ago
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.
12 years ago
Chris Robinson d2fc3c7b33 Add a method to tell the character controller of new text keys 12 years ago
Chris Robinson f46587c383 Store an character controller in the animation 12 years ago
Chris Robinson 3c487e6019 Play an animation when changing states 12 years ago
Chris Robinson b378bc92a0 Store an animation object in the character controller 12 years ago
Chris Robinson c1b32d6006 Remove outdated comments 12 years ago
Chris Robinson 3c02e1ccc9 Run physics right after updating the actors 12 years ago
Chris Robinson 94e30199d1 Merge remote-tracking branch 'zini/master' into animation2
Conflicts:
	components/nifogre/ogre_nif_loader.cpp
12 years ago
Marc Zinnschlag 654cd3ab9b Issue #479: Use magnitude specified when adding disease 12 years ago
Chris Robinson 94b24f07e1 Keep track of the state in the character controller, and don't remove dead actors from the map 12 years ago
Chris Robinson 4890d901a2 Store an MWWorld::Ptr in the character controller 12 years ago
Chris Robinson 35d17fdaf6 Associate a character controller with each MWWorld::Ptr 12 years ago
Marc Zinnschlag f4ee8e2642 Issue #479: Added additional magnitude parameter to known spells 12 years ago
Chris Robinson 771a5f7316 Add the beginnings of a character controller 12 years ago
eduard 2dc0064cc2 more string lowercase 12 years ago
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
12 years ago
Marc Zinnschlag de4a03081c fixed skill level type in skill level up message 12 years ago
Marc Zinnschlag 5f5addf052 fixed an enum 12 years ago
Marc Zinnschlag 0e7ba008ad another skill gain fix 12 years ago
Marc Zinnschlag a70a5282f4 fixed an overzealous skill gain error check 12 years ago
greye 682fd23aea fix wrong increment 12 years ago
rpopovici 7079b9062f add AI script functions 12 years ago
scrawl 1def60dbe1 PcExpell, PcExpelled, PcClearExpelled, RaiseRank, LowerRank 12 years ago
scrawl 0db48b29c7 GetSpellEffects, GetRace 12 years ago
Marc Zinnschlag a092deaee8 various fixes 12 years ago
Marc Zinnschlag 3dc013ceae Merge remote-tracking branch 'gohan/Gohan' 12 years ago
marcin 51027c541e Feature #391 Dummy AI package classes 12 years ago
marcin bed0280ba1 Feature #391 Dummy AI package classes 12 years ago
marcin 99ddc63e2c Feature #391 Dummy AI package classes 12 years ago
marcin 515419ae0b Feature #391 Dummy AI package classes 12 years ago
marcin 4b939c7521 Feature #391 Dummy AI package classes 12 years ago
Marc Zinnschlag 9669eed083 Issue #219: added last missing function filters 12 years ago
marcin e6c8e1f0d7 Feature #391 Dummy AI package classes 12 years ago
Marc Zinnschlag 77ba8c5117 Issue #219: implemented rank requirement filter 12 years ago
Marc Zinnschlag 75f64aa38b Merge branch 'master' into dialogue
Conflicts:
	apps/openmw/mwdialogue/dialoguemanagerimp.hpp
	apps/openmw/mwmechanics/npcstats.cpp
	apps/openmw/mwmechanics/npcstats.hpp
12 years ago
Marc Zinnschlag 0ab4068fbd Merge remote-tracking branch 'scrawl/persuasion' into next 12 years ago
Marc Zinnschlag 7e8d4bb3c9 Issue #219: added various creature and NPC stats; implemented respective filters 12 years ago
Marc Zinnschlag d15eb6cd17 Merge remote-tracking branch 'greye/player-model' into next 12 years ago
Marc Zinnschlag e97f3003ab Issue #219: added expelled status tracking; implemented expelled filter 12 years ago
Marc Zinnschlag ceaf1677ce Issue #219: rewrote AI settings and implemented AI settings filters 12 years ago
Marc Zinnschlag a752536cea Issue #219: added function decoding and moved same faction function from DialogueManager to Filter 12 years ago
greye b1ef0026a9 race selection/inventory preview character model update 12 years ago
scrawl 553ea08eae consider temporary disposition change when trading 12 years ago
scrawl 33b4b29fbc persuasion mechanics, added reputation 12 years ago
scrawl ace9ee9c83 persuasion dialog 12 years ago
scrawl f6a9029c4b bounty & disease disposition effect 12 years ago
Marc Zinnschlag be1334b202 disease tests 12 years ago
Marc Zinnschlag 0727d943b1 Merge branch 'next' into bountydisease
Conflicts:
	apps/openmw/mwmechanics/npcstats.cpp
12 years ago
scrawl d53a7ade1e method names, disposition uint->int 12 years ago
Marc Zinnschlag 39ff2f06ce added bounty to NpcStats 12 years ago
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
12 years ago
scrawl 322faf13e4 cleanup 12 years ago
scrawl bf4e855260 fixed creatures 12 years ago
greye 2a86432887 store birthsign in MWWorld::Player 12 years ago
gugus 0a883f4492 The player can now barter with merchants 12 years ago
greye 83e758ee50 clean up interfaces 12 years ago
greye 9dc9098fa7 update MWBase::World interface since records contains own id 12 years ago
greye 5b9621bca5 store player record data in ESMStore 12 years ago
gugus bf98b95955 bugfix 12 years ago
greye 620184a009 fix typos 12 years ago
greye b3ad872845 new interface in manualref, fix various typos 12 years ago
gugus 2841d831a6 Disposition is now updated everyframe 12 years ago
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 12 years ago
greye 86ad7a96f4 applying new interface vol.2, inconsistent 12 years ago
greye bd1bb2e55d applying new interface vol.1, inconsistent 12 years ago
greye d205723a17 resolving m prefix/ESMStore movement 12 years ago
greye 8691eac557 resolve Script::mData.mName -> mId, resolve moving ESMStore 12 years ago
greye 2057f5619e move ESMStore to MWWorld 12 years ago
greye 3c2ce25f5f m prefix for mwworld/cellstore.hpp 12 years ago
gugus f72f898bd9 implement barterOffer. It's used for travel only.
I've started to implement disposition, but it's very basic for now.
12 years ago
Marc Zinnschlag d7add0b9e6 Issue #61: fixed alchemy skill 12 years ago
Marc Zinnschlag c635447cea Merge branch 'death' 12 years ago
Marc Zinnschlag ed3641b214 Issue #68: check for essential actors 12 years ago
Marc Zinnschlag 2e63ca5e0a Merge branch 'death' 12 years ago
Marc Zinnschlag 453f347ee8 Issue #68: added getdeadcount script function 12 years ago
Marc Zinnschlag f72c35fc17 Issue #68: tally deaths 12 years ago
Marc Zinnschlag 6b09b3ad61 Issue #68: Play death animations 12 years ago
Marc Zinnschlag 21c24dedb6 Issue #68: Stop player from dying (temporary workaround) 12 years ago
Marc Zinnschlag 0ab432b074 Issue #68: fixed death detection 12 years ago
Marc Zinnschlag 9172c3ec4d Issue #68: stop NPCs from instantly dropping dead 12 years ago
scrawl 234716daa6 finished spell creation 12 years ago
Marc Zinnschlag 0547f11564 Issue #68: Remove dead actors from actor list 12 years ago
Marc Zinnschlag f2e25b8a47 Issue #68: Keep dead actors out of the actor list for the current scene 12 years ago
Marc Zinnschlag 3f6afb13f1 Merge remote-tracking branch 'scrawl/alchemy' 12 years ago
scrawl 8d7514e341 corrected chance 12 years ago
Marc Zinnschlag 7884a927c9 Issue #68: added dead flag to CreatureStats 12 years ago
Marc Zinnschlag bdca5aff87 Issue #68: simplified the dynamic stats interface 12 years ago
Marc Zinnschlag 3f833af46a Issue #407: Fortyfy attribute effects were ignored for the last 3 attributes 12 years ago
scrawl 28cc480ce1 fix some alchemy issues and make the gui use the new implementation 12 years ago
Marc Zinnschlag 1864dbe031 Issue #61: potion creation 12 years ago
Marc Zinnschlag f5caf227b2 Issue #61: remove ingredients on potion creation 12 years ago
Marc Zinnschlag 3c71378fad Issue 61: improved ingredients handling in alchemy and documenation 12 years ago
Marc Zinnschlag 3fe0a73cf2 Issue #61: increase alchemy skill on successful potion creation 12 years ago
Marc Zinnschlag 510674aa5e Merge branch 'master' into alchemy
Conflicts:
	components/esm/loadmgef.hpp
12 years ago
Marc Zinnschlag 5fbca239dd Issue #61: potion creation (1st part; still missing some implementations) 12 years ago
Marc Zinnschlag 35d099a638 disabling gcc extensions 12 years ago
Marc Zinnschlag 1cc2c2055f Issue #61: Implemented basic ingredient handling in Alchemy class 12 years ago
Marc Zinnschlag 6469933ce8 Merge branch 'master' into alchemy
Conflicts:
	apps/openmw/mwgui/alchemywindow.cpp
12 years ago
greye 2fa4ac177a initial resolving 12 years ago
Marc Zinnschlag 42f02f3ccd Issue #61: Re-implemented tool selection in Alchemy class 12 years ago
Marc Zinnschlag c6fd864a76 Issue #61: Forgot to add some files 12 years ago
Marc Zinnschlag a34bdb9623 per NPC ID interaction tracking 12 years ago
scrawl 9f2668b45b Task #400 Review GMST access 12 years ago
scrawl b91d74d394 fix normalized encumbrance 12 years ago
scrawl 872fcf3e3d sleeping restoration of health, magicka, and fatigue 12 years ago
greye 18cc435aa1 resolving conflicts 12 years ago
greye 7606ebafd6 resolving conflicts, minor update 12 years ago
scrawl cf358fa79d >= instead of == 12 years ago
scrawl 0dc242c603 don't increase skill beyond 100 12 years ago
scrawl f5237ff1a6 skill gain from books 12 years ago
scrawl 234f8fa5d5 added the missing sound & notification for skill increase 12 years ago
scrawl b34b894d6a removed some debug stuff 12 years ago
scrawl 76b494100e finished? 12 years ago
Marc Zinnschlag 2ccd7a480d Issue #356: added a missing return 12 years ago
Marc Zinnschlag 9de7b3bf90 Issue #356: Properly support ingredients effect in ActiveSpells (hopefully) 12 years ago
Marc Zinnschlag 0af0dc0d5d Issue #356: More CreatureStats cleanup 12 years ago
Marc Zinnschlag 2934987f78 Issue #356: Some CreatureStats cleanup 12 years ago
Marc Zinnschlag 9dcf8939e9 Issue #356: added function for fatigue term calculation 12 years ago
Marc Zinnschlag fca3b67507 Issue #356: basic support for ingredients in ActiveSpells (still using the wrong formula) 12 years ago
Marc Zinnschlag ead04e1cc3 Issue #389: added AI sequence to CreatureStats; execute AI packages during the regular actor update 13 years ago
Marc Zinnschlag 345eec1135 Issue #389: added AI package base class and AI packages management class 13 years ago
scrawl 6161f81c24 last bits of the quick key menu. 13 years ago
Marc Zinnschlag e97d23e626 Issue #361: reset skill level in race selection stage 13 years ago
Marc Zinnschlag 6534c2a55a Issue #107: WindowManager is accessed only through the interface class from now on 13 years ago
Marc Zinnschlag b68f9d6a28 Issue #107: MechanicsManager is accessed only through the interface class from now on 13 years ago
greye 32b1350b63 CreatureStats class 13 years ago
Marc Zinnschlag 483b125aad avoid locking up in case actor updates repeatedly throw exceptions 13 years ago
Marc Zinnschlag beb18282bb Issue #342: various fixes 13 years ago
Marc Zinnschlag 76de2f7360 Issue #342: handle magic effects 79-82 and 17-20 13 years ago
Marc Zinnschlag a3652f16ce Issue #342: factored out dynamic stats calculation into a separate function 13 years ago
Marc Zinnschlag ec9ebe6b58 Merge branch 'skillgain' into potions
Conflicts:
	apps/openmw/mwmechanics/activespells.cpp
13 years ago
Marc Zinnschlag 0d8150f4bd Issue #324: added useSkill function to NpcStats (adjust skill level according to use) 13 years ago
Marc Zinnschlag 25a5657d80 Issue #324: Modified the interface for modified stats 13 years ago
Marc Zinnschlag fe86ce5a2c DrawState workaround 13 years ago
Marc Zinnschlag 0f41cc499d Issue #324: Added skill gain calculation function 13 years ago
Marc Zinnschlag d30ba14a17 Issue #324: Finished turning NpcStats into a proper class 13 years ago
Marc Zinnschlag 771863e73b Issue #324: Started turning NpcStats into a proper class; fixed a cmake script bug; fixed a namespace issue 13 years ago
Marc Zinnschlag c85aaafac2 more include cleanup (most removing Ogre.h) 13 years ago
Marc Zinnschlag 87667ab57e Issue #107: Ptr related include cleanup 13 years ago
Marc Zinnschlag 4c39fefd1e Issue #107: World is accessed only through the interface class from now on; some include cleanup 13 years ago
Marc Zinnschlag 83c3972a89 Issue #314: added return value to addSpell function 13 years ago
Marc Zinnschlag aa827442e8 Issue #314: Generalised ActiveSpells class so that it can handle lasting effects from potions too 13 years ago
Marc Zinnschlag ea29b74bb4 added per NPC/creature basic AI-settings (hello, fight, flee, alarm) 13 years ago
scrawl 298ae4f7f8 HUD icons for selected weapon / selected spell / selected enchanted item 13 years ago
scrawl 48ba293e88 added the success formula, and spell deleting (shift+click) 13 years ago
scrawl 5412d6ed9e fixed a typo that prevented spells from getting added 13 years ago
scrawl a54623bcd2 reset attributes when building player 13 years ago
Marc Zinnschlag c0ee382c72 Issue #176: made actor deregistration more robust 13 years ago
Marc Zinnschlag 3e85151c9d Merge remote branch 'scrawl/inventoryGUI'
Conflicts:
	apps/openmw/CMakeLists.txt
13 years ago
scrawl 76d71f86bc fixed a faction case folding issue 13 years ago
Marc Zinnschlag 9f1919a230 Issue #256: added active spell management (completely untested) 13 years ago
Marc Zinnschlag 635a89c35c Issue #256: RNG fix 13 years ago
Marc Zinnschlag 124ea77612 Issue #256: consider equipped items when calculating magic effects 13 years ago
Marc Zinnschlag 372efaafd7 Issue #256: changed implementation of MagicEffects::operator+= 13 years ago
Marc Zinnschlag 40c58c1bb7 Issue #256: fixed a capitalisation mistake 13 years ago
Marc Zinnschlag 5236bcb557 Issue #256: added operator+= for MagicEffects 13 years ago
Marc Zinnschlag 79055e281d Issue #256: Force update after building the player character 13 years ago
Marc Zinnschlag e1997b7f04 Issue #256: added MagicEffects::add overload for EffectLists 13 years ago
Marc Zinnschlag e56ff9283d Issue #256: moved magic effects update from MechanicsManager to Actors 13 years ago
Marc Zinnschlag 1fddbf9a40 Issue #256: moved dynamic stats update from MechanicsManager to Actors 13 years ago
scrawl 4655ec94f0 Merge branch 'master' into physicsaedra2 & fix warnings
Conflicts:
	apps/openmw/mwworld/scene.cpp
13 years ago
Marc Zinnschlag 35f478071e Issue #255: deleted the old environment class and using the new one instead 13 years ago
Jason Hooks 1ce759af06 Merging in master 13 years ago
Alexander "Ace" Olofsson 0c6862e3e6 Undefining some windows defines 13 years ago
Marc Zinnschlag 37f478b69a Merge branch 'spells'
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwmechanics/npcstats.hpp
13 years ago
Marc Zinnschlag 52c7ee3b6a moved selected spell from NpcStats to Spells 13 years ago
Marc Zinnschlag 26a529111c removed old known spell list from NpcStats 13 years ago
Marc Zinnschlag 77065390d7 simplifying Spells class 13 years ago
Marc Zinnschlag e04ccfced0 replaced old abilities container in CreatureStats with a Spells object 13 years ago
Marc Zinnschlag 750d79eaf0 added spell container class 13 years ago
Marc Zinnschlag 5e9d209b21 Merge remote branch 'minty3/testbranch' 13 years ago
Aleksandar Jovanov 23cc1d17ca missing ; added 13 years ago
Aleksandar Jovanov c589cbd4ff enum bug fix 13 years ago
Marc Zinnschlag ab2a1297b0 exclude player from auto equip 13 years ago
Marc Zinnschlag dcab6737e5 consider skills when auto equipping 13 years ago
Aleksandar Jovanov b1259ca15c added a 'backend' for NPC/Player draw state 13 years ago
Marc Zinnschlag 12f7bae526 added known spells and selected spell to NpcStats 13 years ago
Marc Zinnschlag 751e7d2199 basic auto-equipping (picks the first matching item 13 years ago
Marc Zinnschlag 0892df0ad3 framework for gamemechanics-realted actor updated 13 years ago
Marc Zinnschlag d717b7b9dd factored out actor related game mechanics code into a separate class 13 years ago
Jason Hooks 18a139cd66 adding up and down move buttons 13 years ago
Jason Hooks ee98a2af1a Empty npcs 13 years ago
Jason Hooks 7bd911b401 Problems with handles 13 years ago
gugus 0fb2107265 Merge branch 'master' of git://github.com/zinnschlag/openmw.git into collisions
Conflicts:
	apps/openmw/mwclass/npc.cpp
14 years ago
Jan-Peter Nilsson 53b85eaaa9 Stat setValue, use the enum values all the way through instead of converting enum->string->same enum 14 years ago
gugus 84dce2eb36 add physic and solve a problem with window.h macro min/max 14 years ago
Marc Zinnschlag 151560b882 added missing run flag for NPCs 14 years ago
Marc Zinnschlag 9a3158675a reworked cell changing mechanism 14 years ago
Marc Zinnschlag 8a3445beec collect movement vectors from all actors 14 years ago
Marc Zinnschlag 4468a2b6a8 added movement data to MW references; added movement interface to MWWorld::Class 14 years ago
Marc Zinnschlag ca44b3640a pasing movement data from mwmechanics to mwscene and fixed a very stupid interface bug 14 years ago
Marc Zinnschlag b48a5084be added NPC stances 14 years ago
Marc Zinnschlag 4a12be11bf moved PlayerPos class from MWRender to MWWorld and renamed it to Player 14 years ago
Jan Borsodi 51f26e059a Make sure player is updated after birthsign is set. 14 years ago
Marc Zinnschlag 6fe6f3d282 adjust initial magicka based on Fortify Maximum Magicka effect 14 years ago
Marc Zinnschlag 98405a5716 implemented magic effects from abilities (effects are not applied yet) 14 years ago
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 14 years ago
Marc Zinnschlag 49f68e08bf Redemption compatibility fix 14 years ago
Marc Zinnschlag 12a15e3fb7 implemented class effects on player skills 14 years ago
Marc Zinnschlag 19fdd48f75 fixed a bug in class-part of setting initial skills 14 years ago
Marc Zinnschlag 283e0df3a0 send skill updates to GUI sub-system 14 years ago
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. 14 years ago
Marc Zinnschlag be8f852663 implemented skill value handling during character creation (untested) 15 years ago
Marc Zinnschlag 2527fe92a7 implemented creature/NPC level 15 years ago
Marc Zinnschlag d910baebe6 adjust player's attributes according to class boni 15 years ago
Marc Zinnschlag 243c9712a6 set player attributes according to race and gender 15 years ago
Marc Zinnschlag 53df82e293 fixed race name (was using internal ID as display name) 15 years ago
Marc Zinnschlag fff4bc29f4 store results of character creation and update GUI 15 years ago
Marc Zinnschlag 5b0cb097cf calculate dynamic stats during character creation 15 years ago
Marc Zinnschlag c0b9424bcf added framework for character creation 15 years ago
Marc Zinnschlag 9dffa75a15 handle name change during character creation 15 years ago
Marc Zinnschlag a077e2cb2c changed character creation interface to enforce a Redemption-compatible implementation 15 years ago
Marc Zinnschlag e411c6e833 added callback-interface for character creation 15 years ago
Marc Zinnschlag 3b49d6c826 added NPC stats 15 years ago
Nicolay Korslund 38ad2d98f9 Fixed windows issues + one minor optimization on to_utf8 15 years ago
Marc Zinnschlag 8e6a765603 fixed a stats bug (reducing modified stats via setModified didn't work correctly 15 years ago
Marc Zinnschlag ca842d1b4d reimplemented access to creature stats via new class interface 15 years ago
Marc Zinnschlag b584215680 moved stats label <-> GMST text mapping from mwmechanics to mwgui; added missing stats window labels 15 years ago
Marc Zinnschlag 9fafac1ef8 removed encoding workaround for attribute names 15 years ago
Marc Zinnschlag 3b6b343c9b added GUI update for health, magicka and fatigue 15 years ago
Marc Zinnschlag 455bcf3b01 added get, set and mod instructions for health, magicka and fatigue 15 years ago
Marc Zinnschlag 63f686ffab update attribute values in stats window 15 years ago
Marc Zinnschlag 335425bb12 added MechanicsManager::update function (doesn't update anything yet) 15 years ago
Marc Zinnschlag 1d9df6cf40 implemented handling of disabled actors 15 years ago
Marc Zinnschlag 3d987f1b7a register actors in active cells with MechanicsManager 15 years ago
Marc Zinnschlag 77a0215d53 added get-, set- and mod-instructions for attributes 15 years ago
Marc Zinnschlag 04b86f7e1e added first set of character and creature stats (attributes) 15 years ago
Marc Zinnschlag ecd05fd15e fixed an include guard 15 years ago
Marc Zinnschlag 61d09c4768 read attribute names from GMST instead of using hard-coded names (doesn't fully work yet, because of encoding issues) 15 years ago