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
Chris Robinson
5ac82a50b7
Remove unused function
2013-08-08 04:40:30 -07:00
Lars Söderberg
97345ee7f0
Updated Alchemy Window
2013-08-08 04:40:30 -07:00
Lars Söderberg
5798dff2cb
Standardize align values
...
Updates all align attributes, so all layout files uses the same (new)
system plus fixes a couple of misspellings.
2013-08-08 04:40:29 -07:00
Marc Zinnschlag
e9521dc8f1
Merge remote-tracking branch 'potatoesmaster/pinning'
2013-08-08 13:06:58 +02:00
Marc Zinnschlag
bf839d19cf
Merge branch 'columns'
2013-08-08 12:50:57 +02:00
Marc Zinnschlag
0944338c27
avoid the use of hardcoded column numbers
2013-08-08 12:49:30 +02:00
Emanuel Guevel
1cbfcc3910
Fix HUD weapon icon when turning from werewolf to normal
...
The werewolf hand icon remained until the inventory menu was opened.
2013-08-08 10:56:44 +02:00
Emanuel Guével
8bde8d7c11
Merge pull request #1 from kcat/werewolf
...
Update to latest master
2013-08-08 01:38:15 -07:00
Marc Zinnschlag
6cf9691591
Merge remote-tracking branch 'kcat/cleanups'
2013-08-08 09:16:01 +02:00
Marc Zinnschlag
acac8b44ff
Merge remote-tracking branch 'lazaroth/layout_updates'
2013-08-08 09:14:18 +02:00
Chris Robinson
2bac4566c0
Merge remote-tracking branch 'PotatoesMaster/werewolf' into werewolf
...
Conflicts:
apps/openmw/mwmechanics/actors.cpp
apps/openmw/mwscript/statsextensions.cpp
2013-08-08 00:09:29 -07:00
Chris Robinson
4985e17865
Fix werewolf claw damage multiplier
2013-08-07 19:15:36 -07:00
Chris Robinson
4641737fc4
Update part skeletons immediately when added
2013-08-07 19:15:36 -07:00
Chris Robinson
dc0360b1f6
Remove unnecessary mBodyPrefix field
2013-08-07 19:15:36 -07:00
Chris Robinson
0f52ed9a9b
Remove some duplicate code
2013-08-07 19:15:36 -07:00
Chris Robinson
deee14ccfd
Handle NPCs being a werewolf in NpcAnimation
...
Note that the body mesh comes from having a WerewolfRobe force-equipped.
2013-08-07 19:15:36 -07:00
Chris Robinson
ab44cd63a1
Remove unused function
2013-08-07 19:15:35 -07:00
Lars Söderberg
0fabf1fe2e
Updated Alchemy Window
2013-08-08 01:47:19 +02:00
Emanuel Guevel
b2e5e8dd0d
Saner inventory window pinning/hiding
...
Hide inventory window pin button in container, companion and barter mode.
Restore the pinned inventory window position when exiting these modes.
Allow toggling windows visibility in inventory mode only.
2013-08-07 23:30:08 +02:00
Lars Söderberg
f7ed2ef55f
Standardize align values
...
Updates all align attributes, so all layout files uses the same (new)
system plus fixes a couple of misspellings.
2013-08-07 21:43:19 +02:00
Alex
b9579e085f
cleanup
2013-08-07 15:40:57 -04:00
Alex
a0931b01fe
Merge branch 'master' of https://github.com/zinnschlag/openmw into compiler-reorg
2013-08-07 13:19:23 -04:00
