Anthony J. Thibault
9b9bd7fe26
AnimNodeLoader: Fix for crash condition
...
When a node with children had an error loading, it would
lead to a nullptr dereference.
2015-10-19 15:49:50 -07:00
Anthony J. Thibault
2b4788929f
AnimBlendLinear: Untested implementation of sync flag.
...
Move accumulateTime into AnimUtil.
2015-10-19 15:49:49 -07:00
Anthony J. Thibault
3716800b98
Moved AnimPose class into it's own set of files
2015-10-19 15:49:48 -07:00
Brad Davis
282cdadf63
Fixing line endings
2015-10-18 22:55:14 -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
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
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
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
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
Seth Alves
74ced250c1
don't compress joint rotations
2015-10-13 17:18:28 -07:00
Stephen Birarda
2caa7f6d64
change getUrl to getATPUrl, use in ATPAssetMigrator
2015-10-13 16:56:20 -07:00
Seth Alves
644076214e
fix hang
2015-10-13 16:55:04 -07:00
Stephen Birarda
76bfc6218a
add back block removed in merge
2015-10-13 16:36:10 -07:00
Seth Alves
4402242c3c
allow an action to suppress sending of physics related edits to the entity-server
2015-10-13 16:27:40 -07:00
Seth Alves
2ecb7e8d29
fix bug that was making action deletes fail
2015-10-13 16:19:12 -07:00
Stephen Birarda
fc82ea8541
resolve conflicts on merge with upstream/master
2015-10-13 16:12:54 -07:00
Stephen Birarda
c328941b9d
Merge pull request #6074 from huffman/fix-empty-hash
...
Fix crash when atp url is empty
2015-10-13 16:02:28 -07:00
Ryan Huffman
c468cabe7e
Fix crash when atp url is empty
2015-10-13 15:12:01 -07:00
Seth Alves
fcbb107bc0
tweak
2015-10-13 14:13:53 -07:00
Seth Alves
8b72f6e7c6
tweak
2015-10-13 13:50:43 -07:00
Seth Alves
54eac099b9
tweak
2015-10-13 12:52:53 -07:00
Seth Alves
83780296de
don't send physical property updates if there's an action on the object
2015-10-13 12:12:57 -07:00
Stephen Birarda
cf74cfb50e
add an ATPAssetMigrator for bulk ATP migration
2015-10-13 10:38:52 -07:00
