Commit graph

7619 commits

Author SHA1 Message Date
Chris Robinson
11166a1a17 Don't store the type name string in the Ptr
This should get rid of all heap allocations caused by constructing or copying
Ptr objects.
2013-08-14 00:45:28 -07:00
Chris Robinson
b6d2888c48 Avoid using boost::any in MWWorld::Ptr
Reduces dependency on Boost, and should improve performance a bit when
copying or constructing Ptr objects.
2013-08-14 00:45:27 -07:00
Marc Zinnschlag
aee0336780 Merge remote-tracking branch 'kcat/script-functions' 2013-08-14 09:05:40 +02:00
Chris Robinson
73437dfdca GetEffect can accept an effect ID string as well 2013-08-13 19:18:21 -07:00
Chris Robinson
c1dfa980bf Combine ShowVarsImplicit and ShowVarsExplicit
Also removes an unnecessary else statement
2013-08-13 17:31:15 -07:00
Marc Zinnschlag
e2e76147c8 Merge remote-tracking branch 'potatoesmaster/magic' 2013-08-13 15:36:43 +02:00
Chris Robinson
30973352e8 Implement ShowVars (SV) console function 2013-08-13 04:54:41 -07:00
Chris Robinson
2353ac1739 Properly implement SetWerewolfAcrobatics 2013-08-13 04:54:41 -07:00
Emanuel Guevel
ad3646cb15 Fix spell icons displayed when effect ended 2013-08-13 04:57:45 +02:00
Emanuel Guevel
a47c76001c Apply trap magic effects 2013-08-13 04:56:15 +02:00
Emanuel Guevel
37ea0f3fb9 Display refusal message when weapon/magic icons are clicked as werewolf 2013-08-12 15:36:16 +02:00
Emanuel Guevel
997f37700d Display HUD icons for hidden windows 2013-08-12 15:06:09 +02:00
Emanuel Guevel
c27c33f542 Fix pinned windows hiding
They were always displayed in console mode and in game (even if they
were force hidden).
2013-08-12 15:04:41 +02:00
Chris Robinson
1ad02d68a7 Merge remote-tracking branch 'zini/master' into werewolf 2013-08-11 00:56:38 -07:00
Chris Robinson
6fd4cdb5fb Play randomized werewolf sounds 2013-08-11 00:53:17 -07:00
Chris Robinson
00d6690b4d Ignore encumbrance in werewolf form
According to UESP, inventory weight is ignored. Not sure if this
includes feather and burden effects.
2013-08-10 20:25:18 -07:00
Marc Zinnschlag
1884c6054e Merge remote-tracking branch 'lazaroth/layout_updates_2' 2013-08-10 10:12:43 +02:00
Lars Söderberg
317d565133 Larger area for window corner diagonal arrows 2013-08-10 08:15:58 +02:00
Chris Robinson
180f0d0fe9 Restart from the loop point if replaying the same animation 2013-08-09 21:25:28 -07:00
Lars Söderberg
5b060ffe8d Varios standardizations, fixes and optimizations 2013-08-09 23:21:25 +02:00
Lars Söderberg
73fb682718 Made the alchemy window resizable 2013-08-09 23:20:51 +02:00
scrawl
6dc216af3d Fix a typo, caused occasional white spots on local map render 2013-08-09 21:29:43 +02: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
a28c36de17 Don't count as running if not actually moving along (local) X/Y 2013-08-09 06:53:07 -07:00
Chris Robinson
c2d8eb377f Play some appropriate sounds in werewolf form 2013-08-09 06:40:16 -07:00
Chris Robinson
db1036e5e5 Handle SetWerewolfAcrobatics 2013-08-09 05:37:56 -07:00
Chris Robinson
ae183cb3e4 Handle werewolf stats 2013-08-09 05:14:58 -07:00
Chris Robinson
72a399054f Don't assume only players activate doors 2013-08-09 01:35:29 -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
Marc Zinnschlag
fb0b57efaa Merge remote-tracking branch 'vorenon/bug876' 2013-08-09 09:38:10 +02:00
Chris Robinson
75b6515915 Inherit NpcStats from CreatureStats 2013-08-08 23:28:02 -07:00
Chris Robinson
89c7f5bc70 Handle object activation as a werewolf 2013-08-08 22:34:53 -07:00
Chris Robinson
6110a0ee3b Don't allow resting as a werewolf 2013-08-08 18:30:47 -07:00
Chris Robinson
75131e6a48 Rebuild the actor after switching between werewolf forms 2013-08-08 17:16:24 -07:00
Chris Robinson
5fbfce6d1e Don't show WerewolfRobe objects in the inventory
Pretty ugly hard-coding, but this is likely what vanilla does since it
has no option to mark clothes or armor as unplayable like Oblivion does.
2013-08-08 16:05:26 -07:00
Chris Robinson
d77d60cbc2 Remove an unneeded forceUpdate method 2013-08-08 15:37:08 -07:00
vorenon
a718a62ef5 Fix for bug 876 2013-08-09 00:06:34 +02:00
PLkolek
86020ad94d Added underwater and drowning sounds. 2013-08-08 20:57:15 +02:00
Chris Robinson
e3d5a1b38d Dialog function 72 is not player-specific
It's used to force any NPC in werewolf form to play the appropriate
growls for combat.
2013-08-08 06:02:16 -07:00
Chris Robinson
0de4a34d75 Merge remote-tracking branch 'zini/master' into werewolf 2013-08-08 04:41:42 -07:00
Chris Robinson
960ea3d96c Add/remove a WerewolfRobe when werewolf form is toggled 2013-08-08 04:40:31 -07:00
Chris Robinson
3cff7b1e42 Don't assume icons have a period in their filename 2013-08-08 04:40:31 -07:00
Chris Robinson
1f6055d54b Don't try to apply body skins for werewolves
They instead use a hidden WerewolfRobe object for their body
2013-08-08 04:40:31 -07:00
Chris Robinson
946ca7f931 Return the appropriate name for werewolf NPCs 2013-08-08 04:40:31 -07:00
Chris Robinson
dfdd2dc308 Handle swimleft and swimright soundgen keys 2013-08-08 04:40:31 -07:00
Chris Robinson
109df46590 Fix werewolf claw damage multiplier 2013-08-08 04:40:31 -07:00
Chris Robinson
9694b18d1b Update part skeletons immediately when added 2013-08-08 04:40:30 -07:00
Chris Robinson
f73578a832 Remove unnecessary mBodyPrefix field 2013-08-08 04:40:30 -07:00
Chris Robinson
5051544144 Remove some duplicate code 2013-08-08 04:40:30 -07:00
Chris Robinson
ceed2e30b8 Handle NPCs being a werewolf in NpcAnimation
Note that the body mesh comes from having a WerewolfRobe force-equipped.
2013-08-08 04:40:30 -07:00