Chris Robinson
7770203dff
Some physics cleanup
...
Gets rid of some unneeded/unused variables, and halves the 'on ground'
offset.
2013-08-18 08:24:39 -07:00
Chris Robinson
8c3564326e
Improve movement inertia
...
Handles all 3 axis. Incoming velocity is only added to inertia when
leaving the ground, and does not continually add to it.
2013-08-18 05:38:50 -07:00
Chris Robinson
9d56e2d86d
Apply movement by queueing it to do later
2013-08-17 22:34:38 -07:00
Chris Robinson
96bab88da6
Add physics methods to queue and apply movements
2013-08-17 07:48:45 -07:00
Chris Robinson
0481e64b02
Fix tracing down
2013-08-17 05:09:34 -07:00
Chris Robinson
8bcce0fb55
Clean up the trace struct
2013-08-17 05:09:33 -07:00
Chris Robinson
62c7b3698d
Get rid of the old newtrace method
2013-08-17 05:09:33 -07:00
Chris Robinson
65ce3c6ba5
Use a better method to do actor physics traces
2013-08-17 05:09:32 -07:00
Chris Robinson
d82f54c771
Improve actor movement collision handling
2013-08-17 05:09:30 -07:00
Chris Robinson
21121d5ba5
Store the object class in the LiveCellRef
2013-08-16 04:18:48 -07:00
Chris Robinson
08d1d486a4
Merge remote-tracking branch 'zini/master' into ptr-improvements
2013-08-15 17:42:16 -07:00
Marc Zinnschlag
d122699b2f
and another fix for the same issue :(
2013-08-15 18:29:09 +02:00
Chris Robinson
58481ec7c3
Merge remote-tracking branch 'zini/master' into ptr-improvements
2013-08-15 07:11:38 -07:00
Marc Zinnschlag
7b4d8afde7
fix to previous commit
2013-08-15 15:53:50 +02:00
Chris Robinson
fdbf09ed40
Merge remote-tracking branch 'zini/master' into ptr-improvements
...
Conflicts:
apps/openmw/mwworld/containerstore.cpp
2013-08-15 05:56:24 -07:00
Marc Zinnschlag
e94fcce622
accessing references via their ID now also works for references in containers in active cells
2013-08-15 14:45:13 +02:00
Chris Robinson
2853b56ed5
Throw an exception when trying to get an empty Ptr's type
2013-08-15 04:52:01 -07:00
Chris Robinson
0f2b2ff1ce
Small header cleanup
2013-08-15 01:21:43 -07:00
Chris Robinson
86f2cd5848
Use dynamic_cast to get the LiveCellRef
2013-08-14 20:26:50 -07:00
Chris Robinson
48c07fbd98
Remove some unnecessary fields from Ptr
2013-08-14 17:05:42 -07:00
Chris Robinson
74f855e948
Move common LiveCellRef fields to the base class
2013-08-14 01:55:51 -07:00
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
Chris Robinson
2353ac1739
Properly implement SetWerewolfAcrobatics
2013-08-13 04:54:41 -07:00
Chris Robinson
6fd4cdb5fb
Play randomized werewolf sounds
2013-08-11 00:53:17 -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
960ea3d96c
Add/remove a WerewolfRobe when werewolf form is toggled
2013-08-08 04:40:31 -07: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
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
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
47b8a31317
Fixes suggested by KittyCat
2013-08-07 12:05:53 +02:00
Chris Robinson
a9cc3a2844
Ensure a valid CellStore for Ptr::isInCell
2013-08-06 19:49:01 -07:00
Chris Robinson
eab4e09566
Handle the pick/probe in the character controller
2013-08-06 19:48:59 -07:00
Emanuel Guevel
20d40c4368
Implement MWWorld::World::setWerewolf()
2013-08-06 12:34:35 +02:00
Emanuel Guevel
aa563e947e
Implement MWWorld::InventoryStore::unequipAll()
2013-08-06 12:34:35 +02:00
Marc Zinnschlag
41b2fa985b
silenced some warnings
2013-08-03 15:26:53 +02:00
Marc Zinnschlag
9123afa863
Merge remote-tracking branch 'gus/MeleeCombat2'
2013-08-03 15:23:36 +02:00
gus
a23e7fac93
clean up
2013-08-03 13:58:16 +02:00
gus
c8bb32c40d
small maths correction
2013-08-03 12:29:18 +02:00
gus
a25ee360dc
use angles and GMST. not sure this work as it should
2013-08-03 12:16:51 +02:00
gus
830762722d
first attempt: hit detection with a sphere (not finished)
2013-08-03 11:26:36 +02:00
Emanuel Guevel
a9483dbdf1
Show sneak indicator when sneaking
...
Temporary solution, as the indicator should be shown only when the
player is not detected by any other actor.
2013-08-03 03:03:29 +02:00
Chris Robinson
b70975a74d
Move getEvasion to CreatureStats
2013-08-02 00:21:01 -07:00
Chris Robinson
9e7d670745
Inline Class::get(const Ptr& ptr)
2013-08-02 00:20:59 -07:00
scrawl
fe51a00112
Fix the initial player inventory being added twice when starting a new game
2013-07-31 21:00:58 +02:00
Marc Zinnschlag
5cafe65cd7
Merge remote-tracking branch 'scrawl/cppcheck'
2013-07-31 20:00:35 +02:00
scrawl
7dc30a01cd
Some changes suggested by cppcheck
2013-07-31 18:46:32 +02:00
