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
Alex
c3ca5b7c32
mild cleanup
2013-08-07 13:16:20 -04: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
Emanuel Guevel
48d2554ac3
Auto-equip when items are added to the inventory
...
We limit that to armor pieces and clothing items.
No auto-equiping for the player nor werewolves.
2013-08-07 15:17:55 +02:00
Emanuel Guevel
e0d0cdd18a
Do not auto-equip items continuously
...
This was called every couple of frames.
2013-08-07 14:30:13 +02:00
Chris Robinson
076e7d8e16
Make insertBegin internal
2013-08-07 03:56:07 -07:00
Chris Robinson
2b2101958d
Destroy the scene node we create
2013-08-07 03:56:07 -07:00
Chris Robinson
0458fd5531
Remove unused/unneeded parameters
2013-08-07 03:56:06 -07:00
Emanuel Guevel
fd0a159a64
MWScript: update first unused opcode number
2013-08-07 12:05:53 +02:00
Emanuel Guevel
47b8a31317
Fixes suggested by KittyCat
2013-08-07 12:05:53 +02:00
Marc Zinnschlag
932fffd1a7
Merge remote-tracking branch 'kcat/light-objects'
2013-08-07 11:21:01 +02:00
Chris Robinson
b4b095ca72
Don't try to get the center of a null bounding box
2013-08-07 01:32:36 -07:00
Chris Robinson
80d271aeb1
Remove unused stuff
2013-08-07 01:31:01 -07:00
Marc Zinnschlag
76b9d3dbc1
columns are now identified via an enum instead the name string
2013-08-07 09:36:05 +02:00
Chris Robinson
3555476dfd
Use Animation-derived objects for generic objects
2013-08-06 19:49:07 -07:00
Chris Robinson
a9dca21d05
Create the Animation SceneNode in the constructor
2013-08-06 19:49:05 -07:00
Chris Robinson
48784c7e2f
Use for_each and functors to avoid some for loops
2013-08-06 19:49:05 -07:00
Chris Robinson
de95926e9f
Use controllers to animate lights in ObjectLists
2013-08-06 19:49:04 -07:00
Chris Robinson
8984d8f8ee
Use a map to simplify NPC part referencing
2013-08-06 19:49:02 -07:00
Chris Robinson
e976bb16c5
Add a light for torches
2013-08-06 19:49:02 -07:00
Chris Robinson
57fb065a86
Add Ogre::Light objects to the object list
...
Note that NIFs actually have NiLight-based light records which could be
used to create Ogre::Light objects. However, no Morrowind NIF uses them,
as far as I can tell.
2013-08-06 19:49:01 -07:00
Chris Robinson
a9cc3a2844
Ensure a valid CellStore for Ptr::isInCell
2013-08-06 19:49:01 -07:00
Chris Robinson
1f436f9886
Render torches
2013-08-06 19:49:01 -07:00
Chris Robinson
643e7651e0
Use a null material for non-SubEntities in the selection buffer
2013-08-06 19:49:00 -07:00
Chris Robinson
8f69c51b24
Avoid some unnecessary references
2013-08-06 19:49:00 -07:00
Chris Robinson
2c03fec4bb
Use the fatigue term for jumping
2013-08-06 19:49:00 -07:00
Chris Robinson
eab4e09566
Handle the pick/probe in the character controller
2013-08-06 19:48:59 -07:00
scrawl
3f7daa4884
Forgot to change initTerrainTextures
2013-08-07 02:58:03 +02:00
Alex
de1f423bd7
initial move of script opcodes and registerExtensions functions to components/compiler
2013-08-06 20:38:41 -04:00
scrawl
76e538c22a
Unused variable fix
2013-08-07 02:03:23 +02:00
scrawl
726c93c365
Terrain fixes to match vanilla better - vertices need to be mapped directly to texels for colormap and blendmap (this also caused seams at cell borders), layer uv scale appears to be 8 not 10
2013-08-07 01:34:17 +02:00
Marc Zinnschlag
2cfe6db389
Merge remote-tracking branch 'corristo/patch-1'
2013-08-06 23:12:29 +02:00
Marc Zinnschlag
03af7175dd
Merge remote-tracking branch 'potatoesmaster/bug-839'
2013-08-06 17:39:29 +02:00
Emanuel Guevel
c59ad62c57
Fix UndoWerewolf script instruction
2013-08-06 14:30:01 +02:00
Emanuel Guevel
5188a1c2cd
Implement script instructions Become/UndoWerewolf
2013-08-06 12:34:35 +02:00
