1
0
Fork 1
mirror of https://github.com/TES3MP/openmw-tes3mp.git synced 2025-01-16 08:19:56 +00:00
Commit graph

76 commits

Author SHA1 Message Date
scrawl
4b4025ed0f Keep the player's CharacterController when changing cells. Fixes several glitches. 2013-11-30 11:01:45 +01:00
scrawl
320ba98097 Correct getDerivedDisposition according to wiki (check if player expelled) 2013-11-21 17:19:41 +01:00
Marc Zinnschlag
8190fdb16c Merge remote-tracking branch 'scrawl/master' 2013-11-19 16:56:18 +01:00
scrawl
e8dcd74741 Recharge enchanted items in player's inventory over time 2013-11-19 16:42:24 +01:00
Marc Zinnschlag
11e254aac8 Merge remote-tracking branch 'gus/AICombat'
Conflicts:
	apps/openmw/CMakeLists.txt
	apps/openmw/mwbase/mechanicsmanager.hpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.cpp
	apps/openmw/mwmechanics/mechanicsmanagerimp.hpp
2013-11-19 09:10:48 +01:00
gus
dff3cf162d ToggleAI script instruction 2013-11-18 23:03:44 +01:00
scrawl
0dc2e829dd Lots of cleanup. Implemented Absorb and Resist. Implemented several instant effects. Added hand VFX. 2013-11-17 23:31:08 +01:00
scrawl
2a11618ee7 Make sure the equipped weapon HUD icon is updated properly 2013-11-17 23:31:07 +01:00
scrawl
992a8e9c36 Refactor NpcAnimation: get rid of delayed update (no longer required), make sure that the Animation is set up *before* the inventory store is accessed anywhere (which now triggers auto equip and animation update). Allows better tracking of magic VFX for permanent enchantments in InventoryStore. 2013-11-14 14:41:10 +01:00
Emanuel Guevel
2786530430 Edit InventoryStore::equip() to call the new unequipSlot function…
…to unequip previously equipped item.
2013-11-10 02:45:16 +01:00
Chris Robinson
84d259ab8e Avoid reconstructing strings for updating the dynamic stats
Attributes still do this, but they change infrequently enough that it doesn't
matter.
2013-08-28 10:50:29 -07:00
Chris Robinson
281fdbd81b Cleanup some redundancy 2013-08-27 17:56:47 -07:00
Chris Robinson
33c173a23a Update the watched Ptr when changing it 2013-08-27 17:22:07 -07:00
Chris Robinson
189541aa72 Apply drowning damage based on the update duration
1 damage every 0.33 seconds is 3 damage a second. Applying it this way avoid
having to track another stat.
2013-08-27 17:08:23 -07:00
Chris Robinson
5968165de0 Merge remote-tracking branch 'zini/master' into werewolf
Conflicts:
	apps/openmw/mwgui/windowmanagerimp.cpp
2013-08-09 07:00:00 -07:00
Chris Robinson
46bc7bd9c8 Some cleanup since NpcStats is now also CreatureStats
This isn't a thorough cleaning, so keep an eye out for more
2013-08-09 01:14:08 -07:00
PLkolek
86020ad94d Added underwater and drowning sounds. 2013-08-08 20:57:15 +02:00
PLkolek
8f4506f5b6 Implemented drowning.
Currently no visual effects on losing health, the breathing sound doesn't change (we don't have one),
the breath bar doesn't turn red when no breath left and it doesn't pulse from black to red.
2013-08-07 16:46:46 +02:00
scrawl
7dc30a01cd Some changes suggested by cppcheck 2013-07-31 18:46:32 +02:00
Torben Carrington
c8c1ddd927 Adds functionality for checking if the animation group passed is currently playing on the actor passed. This is needed for AIWander. 2013-05-24 20:10:07 -07:00
scrawl
c41f119ba6 Added new game button 2013-05-15 17:54:18 +02:00
Chris Robinson
274f3c7b77 Force character state to update after switching view modes 2013-04-25 07:08:11 -07:00
Glorf
f9deb593d1 Bugfix #578 2013-04-18 21:37:58 +02:00
scrawl
2693b78536 Add initial player inventory when new game is started 2013-04-15 02:56:23 +02:00
scrawl
8bbfba3f43 Fix fatigue not being set to its maximum value when player is rebuilt 2013-04-07 16:18:40 +02:00
Marc Zinnschlag
18e046e628 cleaned up race record struct 2013-04-04 13:50:36 +02:00
Chris Robinson
04aeb3dd07 Rename Mechanics' Activators to Objects 2013-03-31 17:32:38 -07:00
Chris Robinson
10d04c928c Use the object's class to check if it's an actor 2013-03-31 17:32:38 -07:00
scrawl
95e1cdc07d Move getArmorRating to MWWorld::Class. 2013-03-17 22:29:12 +01:00
scrawl
dd57eabc3e Better use an enum for magic effect IDs 2013-03-16 23:28:26 +01:00
scrawl
1666bc7740 Armor rating 2013-03-16 22:53:33 +01:00
Chris Robinson
000128d084 Merge remote-tracking branch 'zini/master' into misc-cleanup 2013-02-25 10:38:08 -08:00
Chris Robinson
48271e49ec Properly update the Ptr object in the mechanics manager when moving across cells 2013-02-25 09:57:34 -08:00
Marc Zinnschlag
88e8659a49 minor cleanup 2013-02-25 16:52:31 +01:00
scrawl
73d48a95f6 Add message box when the player tries to move when being overencumbered. 2013-02-25 16:31:48 +01:00
Chris Robinson
2f8affc955 Make sure the player's controller is properly updated when they change 2013-02-04 12:58:06 -08:00
Chris Robinson
ee9b19d2ed Make sure to remove a Ptr from the activators when requested 2013-02-04 12:04:06 -08:00
Chris Robinson
fdabef65a1 Use a method to update an object's cell in the mechanics manager
This prevents destroying and recreating the object's character controller (and
messing up the current animation) when moving between cells.
2013-01-29 00:19:24 -08:00
Chris Robinson
8d98f3649c Use a separate class to handle activator mechanics 2013-01-28 23:39:11 -08:00
Chris Robinson
d2f5a886c7 Handle playgroup and skipanim through mwmechanics 2013-01-16 17:53:18 -08:00
Chris Robinson
3c02e1ccc9 Run physics right after updating the actors 2013-01-16 08:22:38 -08:00
eduard
2dc0064cc2 more string lowercase 2013-01-09 20:51:52 +01:00
Marc Zinnschlag
5f5addf052 fixed an enum 2012-12-09 00:12:24 +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
d15eb6cd17 Merge remote-tracking branch 'greye/player-model' into next 2012-11-10 12:36:01 +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