Seth Alves
ac99005602
reverting a change to try to see sticking problem again
2015-10-19 12:13:08 -07:00
Seth Alves
f96e9eb1e8
fuck you, const!
2015-10-19 12:04:55 -07:00
Seth Alves
46e5bf0435
take entity-server clock-skew into account when handling action expiration times
2015-10-19 11:59:03 -07:00
Seth Alves
5c031a38c7
try another way of fixing held object snagging at slow velocity
2015-10-19 10:29:30 -07:00
Seth Alves
c5a5f26e6a
try another way of fixing held object snagging at slow velocity
2015-10-19 10:27:35 -07:00
Seth Alves
2bdcb256d8
try another way of fixing held object snagging at slow velocity
2015-10-19 10:26:37 -07:00
Seth Alves
26dcaeb056
try another way of fixing held object snagging at slow velocity
2015-10-19 10:10:43 -07:00
Seth Alves
fbe3cb9511
try another way of fixing held object snagging at slow velocity
2015-10-19 09:56:51 -07:00
Seth Alves
742e48b0c8
try another way of fixing held object snagging at slow velocity
2015-10-19 09:48:34 -07:00
Seth Alves
1f3b92577d
update _model's location anytime it doesn't match the entity's location
2015-10-17 20:08:25 -07:00
Seth Alves
353f92f1ba
Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes
2015-10-17 13:09:52 -07:00
Atlante45
1da68e0214
Fix particle bug by having lifetimes increase
2015-10-16 18:11:22 -07:00
David Rowe
8c22db17cc
Fix reading of QVector<float> from models files - polyline strokeWidths
2015-10-16 15:43:23 -07:00
Seth Alves
937959c1c1
cleanups
2015-10-16 09:57:27 -07:00
Seth Alves
d2b7e5c4eb
Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes
2015-10-16 09:54:26 -07:00
Seth Alves
8338491c3b
Merge pull request #6095 from Atlante45/master
...
Fix export bug
2015-10-16 07:32:56 -07:00
Seth Alves
b18bb1e076
Merge pull request #6084 from AndrewMeadows/physics-cleanup
...
move DIRTY_FLAGS out of EntityItem namespace
2015-10-16 07:22:40 -07:00
Seth Alves
359a318568
fold kinematic hold into normal hold (disabled by default, an argument enables)
2015-10-15 20:23:06 -07:00
Atlante45
a84fdecec9
Fix export bug
2015-10-15 18:43:32 -07:00
Brad Hefta-Gaub
26f82e899e
Merge pull request #6079 from ericrius1/whiteboard
...
Entity whitelist for raypicking and whiteboard painting example
2015-10-15 17:50:35 -07:00
Stephen Birarda
e5825daa57
Merge pull request #6090 from ZappoMan/fixStat
...
Add some additional stats for debugging edit lags
2015-10-15 16:00:29 -07:00
Seth Alves
462918ffcf
cleanups
2015-10-15 14:55:17 -07:00
Seth Alves
36a523478f
Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes
2015-10-15 14:21:30 -07:00
Seth Alves
4903db45b1
give other avatars an anim-skeleton
2015-10-15 14:21:06 -07:00
Andrew Meadows
3d17c57910
Merge pull request #6083 from sethalves/groundwork-for-hold-action-changes
...
Groundwork for hold action changes
2015-10-15 13:30:02 -07:00
Brad Hefta-Gaub
93113af2d2
improve server error message for failed edit
2015-10-15 11:55:20 -07:00
Seth Alves
a70ba4cd5a
add some accessors
2015-10-15 11:42:53 -07:00
Brad Hefta-Gaub
b7c40c2df1
fix Queue OUT stat
2015-10-15 11:41:04 -07:00
ericrius1
3b59bffb79
Deleting only strokes from the whiteboard where the erase button was clicked on
2015-10-15 11:38:18 -07:00
Seth Alves
64c5cde2d2
further unmangle branch split
2015-10-15 10:33:58 -07:00
Seth Alves
e571cb7ca4
more lock adjustments
2015-10-15 10:22:25 -07:00
ericrius1
55c68e0509
Merge branch 'master' into whiteboard
2015-10-15 10:08:32 -07:00
Andrew Meadows
fa17b77d70
move DIRTY_FLAGS out of EntityItem namespace
2015-10-15 09:34:09 -07:00
Seth Alves
c96f7562f2
Merge branch 'master' of github.com:highfidelity/hifi into groundwork-for-hold-action-changes
2015-10-15 09:28:57 -07:00
Thijs Wenker
c99573ea64
Fixed support for calling setJointMumblers with joint name. Walk.js runs smooth now!
2015-10-15 15:35:35 +02:00
Clément Brisset
efd106e68c
Merge pull request #6075 from birarda/default-asset-server
...
add a migrator to move assets to ATP
2015-10-14 17:02:10 -07:00
ericrius1
cfca0fe8c0
Adding a color indicator to whiteboard
2015-10-14 15:58:18 -07:00
Andrew Meadows
982476d02b
Merge pull request #6076 from hyperlogic/tony/turn-hips-while-moving
...
Rotate the avatar to align with the HMD while moving
2015-10-14 15:09:39 -07:00
Seth Alves
9937b6a3ef
quiet some debugging
2015-10-14 13:12:11 -07:00
Seth Alves
d72152da87
more locking
2015-10-14 13:01:56 -07:00
Seth Alves
07a4dc3a7f
more lock fixing
2015-10-14 12:49:06 -07:00
Seth Alves
fa2bf2b2d9
tighten up locking in actions
2015-10-14 11:43:03 -07:00
Seth Alves
9a9e5b962e
make edit logging terse vs not a domain-server setting
2015-10-14 09:45:35 -07:00
Seth Alves
77bb11675d
terse entity-edit logging
2015-10-14 09:31:44 -07:00
Seth Alves
698a4001a8
Merge branch 'master' of github.com:highfidelity/hifi into hold-action-changes
2015-10-14 06:18:02 -07:00
Seth Alves
742cc0f511
rename a function
2015-10-14 06:17:55 -07:00
Anthony J. Thibault
1c1221597d
Merge branch 'master' into tony/turn-hips-while-moving
2015-10-13 18:38:27 -07:00
Seth Alves
f61a005ebc
cleanups
2015-10-13 17:47:41 -07:00
Brad Hefta-Gaub
c4af4c7b10
basic mono preview for the oculus display plugin
2015-10-13 17:45:29 -07:00
Anthony J. Thibault
e484a904a2
Rotate the avatar to align with the HMD while moving
...
MyAvatar: refactored updateFromHMDSensorMatrix() a bit by splitting it into several methods, because
it was getting quite large and becoming hard to follow.
* beginStraighteningLean() - can be called when we would like to trigger a re-centering action.
* shouldBeginStraighteningLean() - contains some of the logic to decide if we should begin a re-centering action.
for now it encapulates the capsule check.
* processStraighteningLean() - performs the actual re-centering calculation.
New code was added to MyAvatar::updateFromHMDSensorMatrix() to trigger re-centering when the avatar speed rises
over a threshold.
Secondly the Rig::computeMotionAnimationState() state machine for animGraph added a state change hysteresis
of 100ms. This hysteresis should help smooth over two issues.
1) When the delta position is 0, because the physics timestep was not evaluated.
2) During re-centering due to desired motion, the avatar velocity can fluctuate causing undesired animation state fluctuation.
2015-10-13 17:36:00 -07:00
