Andrew Meadows
49a6f63663
remove whitespace and fix warning (unused var)
2015-11-30 10:00:05 -08:00
Seth Alves
ded8a624ad
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-11-30 09:41:28 -08:00
Philip Rosedale
2377875623
Tabs to spaces v2
2015-11-30 08:05:25 -08:00
Philip Rosedale
ba379e8830
Tabs to spaces
2015-11-30 08:00:12 -08:00
David Rowe
ce100dbbc5
Fix crash in WebWindowClass in debug build setTitle on open WebWindow
2015-11-30 15:10:51 +13:00
Seth Alves
cf39cac7fc
attempt to make SpatiallyNestable data access thread-safe
2015-11-29 12:50:33 -08:00
David Rowe
866037ec7c
Fix menu shortcut keys set by JavaScript not working
2015-11-30 08:33:38 +13:00
Seth Alves
ca75802b9c
unmangle merge
2015-11-26 06:43:28 -08:00
Seth Alves
7df984e7b2
fix deadlock when setting parentID to null
2015-11-26 05:30:01 -08:00
Philip Rosedale
eccca218f0
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-11-25 20:47:01 -08:00
Philip Rosedale
a40ead077f
Mouth animation improvements
2015-11-25 20:37:51 -08:00
Anthony J. Thibault
549a8f7130
Fix for avatars with no eyes
...
For example:
https://hifi-public.s3.amazonaws.com/ozan/avatars/hifi_team/howard/howard.fst
https://hifi-public.s3.amazonaws.com/ozan/avatars/hifi_team/tony/tony.fst
2015-11-25 17:24:55 -08:00
Anthony J. Thibault
7c9cb97783
Merge branch 'master' into tony/remove-joint-states
2015-11-25 15:48:51 -08:00
Howard Stearns
6c7099a5f7
Coordinate with other uses of setVisibleInScene.
2015-11-25 15:18:32 -08:00
Anthony J. Thibault
23def8d173
Merge branch 'master' into tony/remove-joint-states
2015-11-25 13:55:23 -08:00
Anthony J. Thibault
c0d108e6f6
Better avatar bounding shape debug rendering.
2015-11-25 13:51:08 -08:00
howard-stearns
546f09c0b1
Restore rendering of one's own avatar.
2015-11-25 13:30:54 -08:00
Anthony J. Thibault
868cf83b48
Fix for attachments and MyAvatar::getDefaultEyePosition()
2015-11-25 10:07:29 -08:00
Andrew Meadows
bc20b72645
Merge pull request #6453 from howard-stearns/avatar-render-controller2
...
Survive Flash Mobs Without Making Everyone Sick
2015-11-25 09:52:28 -08:00
Anthony Thibault
527199bc69
Merge pull request #1 from AndrewMeadows/fix-avatar-capsule
...
compute bounding capsule of avatars
2015-11-25 09:39:18 -08:00
Andrew Meadows
3ae082f09c
compute bounding capsule of avatars
2015-11-24 20:28:39 -08:00
Anthony J. Thibault
76034d62d5
Eye tracking fixes
2015-11-24 16:57:26 -08:00
Anthony J. Thibault
f120e10ff4
Merge branch 'master' into tony/remove-joint-states
2015-11-24 15:00:05 -08:00
David Rowe
5ecbaa5b93
Fix InputController (Leap Motion) not being updated
2015-11-25 09:43:55 +13:00
David Rowe
e25d4c17e8
Fix InputController (Leap Motion) not able to be created
2015-11-25 09:29:40 +13:00
Andrew Meadows
5135c9dded
whitespace cleanup
2015-11-24 10:20:19 -08:00
Brad Hefta-Gaub
d32e500464
Merge pull request #6462 from jherico/rec5
...
Blendshapes and attachments in recordings, plus other minor fixes.
2015-11-24 10:01:17 -08:00
Ryan Huffman
dac491ef41
Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message
2015-11-24 09:59:22 -08:00
Stephen Birarda
ab7cbc0b76
Merge branch 'master' of https://github.com/highfidelity/hifi into injector-hybrid
2015-11-24 10:45:00 -06:00
Brad Davis
5c2b980a45
Fixing avatar facial blendshapes and attachments in recordings
2015-11-23 22:36:07 -08:00
Anthony J. Thibault
14189ac909
Move Y_180 flip rotation out of Rig
...
This Y_180 flip is defined in skeletonModel not in the rig.
This is important if we wish to use the Rig for both Avatars (180 flip) and Entity models (no 180 flip).
We can hide this 180 flip from script, if we wish, by including it in all the accessors to and from
MyAvatar -> skeletalModel -> Rig.
Added Quaternions::Y_180 to GLMHelpers.
2015-11-23 19:31:27 -08:00
James B. Pollack
5ffc1f150d
Merge pull request #6467 from ctrlaltdavid/20742
...
Fix avatar rotation with keyboard depending on frame rate
2015-11-23 18:19:46 -08:00
Stephen Birarda
905e11faa3
use MIN_AVATAR_SCALE to ensure avatar fades complete
2015-11-23 16:54:17 -06:00
Stephen Birarda
0997d3dcae
resolve conflicts on merge with upstream/master
2015-11-23 16:15:15 -06:00
Seth Alves
ba30e01664
include global position in avatar-mixer protocol so server knows where avatars are in world-space
2015-11-23 14:12:49 -08:00
David Rowe
d73e3a5490
Fix avatar pitch rate depending on FPS
2015-11-24 09:48:37 +13:00
David Rowe
f5d66bbf2e
Fix avatar rotation rate depending on FPS
2015-11-24 09:42:12 +13:00
Seth Alves
d4937071e1
rather than activating rigid body and forcing non-static on deserialize, just force non-static
2015-11-23 12:17:15 -08:00
Seth Alves
c3821d7202
avoid deadlock
2015-11-23 11:24:56 -08:00
Seth Alves
5612174894
call activateBody when a hold action is deserialized
2015-11-23 11:02:41 -08:00
Howard Stearns
5912808077
getShouldSkipRendering() => !getShouldRender().
2015-11-23 10:27:49 -08:00
Howard Stearns
f1e0742aeb
Add getTargetFrameRate().
2015-11-23 10:20:59 -08:00
Brad Davis
64ba5b4f14
Cleaning up old recording files
2015-11-23 09:42:34 -08:00
Anthony J. Thibault
821264a031
Merge branch 'master' of github.com:highfidelity/hifi into tony/remove-joint-states
2015-11-22 16:15:03 -08:00
Anthony J. Thibault
fe683edb66
Avatar Debug Draw Default Pose now works
2015-11-21 10:53:24 -08:00
Anthony J. Thibault
6cfd831a5a
Menu: Added Developer > Avatar > Debug Draw Position
...
Also renamed "Debug Draw Bind Pose" to "Debug Draw Default Pose"
2015-11-21 09:50:56 -08:00
Seth Alves
f013f95e9b
merge from upstream
2015-11-21 08:43:00 -08:00
Anthony J. Thibault
007a3c5134
Fix one frame lag in AnimDebugDraw
2015-11-20 19:00:51 -08:00
Anthony J. Thibault
54408a9c87
AnimVars are now in avatar/rig space
...
This makes it much simpler for code out side of the rig to manipulate AnimVars
* Removed mat4 type from AnimVars
* AnimVariantMap now has a _rigToGeometryTransform matrix
used to transform positions and rotations into the correct coordinate frame.
* Moved AnimPose code to extract a quat from a scaled matrix into GLMHelpers
2015-11-20 18:29:17 -08:00
Stephen Birarda
9ddebc8d13
resolve conflicts on merge with upstream/master
2015-11-20 15:29:44 -08:00
Anthony J. Thibault
30087ef0bd
Removed dead code
2015-11-20 14:37:53 -08:00
Anthony J. Thibault
cb89f09635
Removed EntityRig and AvatarRig. One Rig to rule them all.
2015-11-20 14:27:01 -08:00
Howard Stearns
9673133bf4
whitespace (reduce diffs)
2015-11-20 14:26:37 -08:00
Anthony J. Thibault
a77ea8da43
Removed JointStates! You won't be missed.
2015-11-20 14:15:37 -08:00
howard-stearns
1ddcc62db9
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-render-controller2
2015-11-20 14:05:40 -08:00
howard-stearns
6c784256cb
final(?) cleanup
2015-11-20 13:51:12 -08:00
howard-stearns
a366598598
snapshot. It works.
2015-11-20 11:48:44 -08:00
Clément Brisset
f4b0492b33
Merge pull request #6436 from birarda/ghost-avatar
...
fix for ghosted avatars thanks to check/add race
2015-11-20 11:41:20 -08:00
Anthony J. Thibault
a4116e633a
Removed last consumer of JointState class
...
Removed option to render IK constraints used by old animation system
2015-11-20 11:26:54 -08:00
Stephen Birarda
9b5bfd45bc
change lock back to locker to remove change
2015-11-20 11:04:46 -08:00
Stephen Birarda
19d3d80ff9
fixes for some incorrect assumptions
2015-11-20 11:03:52 -08:00
Anthony J. Thibault
ad4b8e0001
Avatar transmission fixes, moved JointData into shared
...
* Moved JointData into shared library
* added methods to the rig to copy into and out of JointData
* JointData translations must be in meters this is so the
fixed point compression wont overflow, also, it's a
consistent wire format.
2015-11-20 10:24:24 -08:00
Howard Stearns
b5e5adc41e
Update for changed target frame period.
2015-11-20 09:51:57 -08:00
Howard Stearns
0f6a37f0f7
remainder->fmod!
2015-11-20 09:49:14 -08:00
Anthony J. Thibault
46d23a9f38
head IK and controller IK work again!
2015-11-19 17:30:56 -08:00
Howard Stearns
431a8c9584
cleanup
2015-11-19 17:12:50 -08:00
Stephen Birarda
22f5d4df6d
change signature of copy return
2015-11-19 16:25:33 -08:00
Stephen Birarda
430cb7876d
remove a couple of read lockers for AvatarHashMap
2015-11-19 16:22:56 -08:00
Stephen Birarda
40397add43
fix for extra adds in AvatarManager
2015-11-19 16:15:21 -08:00
Stephen Birarda
6398a922c6
leverage COW for AvatarHash
2015-11-19 15:43:29 -08:00
Stephen Birarda
5140a480a1
fix for recursive write then read lock
2015-11-19 15:35:41 -08:00
Stephen Birarda
2a05ec650b
fix locking in AvatarHashMap/AvatarManager
2015-11-19 14:17:48 -08:00
Anthony J. Thibault
982e2c06a9
Rig: Switched over to use AnimPoses instead of JointStates
...
* fixed debug rendering
* improved jointState/animPose diff detection code.
2015-11-19 12:14:04 -08:00
Howard Stearns
f6286201f4
cleanup
2015-11-19 11:55:22 -08:00
Ryan Huffman
07d21514c5
Merge branch 'master' of https://github.com/highfidelity/hifi into proto-received-message
2015-11-19 10:47:37 -08:00
U-GAPOS\andrew
b7f501c0b3
use glm::quat_cast instead of extractRotation()
2015-11-19 10:42:53 -08:00
Howard Stearns
7d30cd0159
checkpoint: it works!
2015-11-19 09:18:40 -08:00
Anthony J. Thibault
721da29432
WIP checkpoint
...
* No longer normalizing scale in AnimSkeleton and AnimClip
This means graph is animating in 'geometry' coordinates
before unit scale is even applied. This is necessary to
properly work with both Avatar based models and ModelEntity
based models
Many things are broken.
* debug rendering (translations are x100)
* IK hand targets
* follow cam
* I did not even dare to try HMD mode
2015-11-18 18:47:33 -08:00
samcake
90ee205a66
Merge pull request #6429 from ZappoMan/samConditionalLove
...
make preferences dialog resizable
2015-11-18 18:07:07 -08:00
Brad Hefta-Gaub
dc093159a1
make preferences dialog resizable
2015-11-18 17:54:51 -08:00
samcake
74beeefe06
Merge pull request #6420 from jherico/dargo
...
Make recording and playback work in interface, playback in agent
2015-11-18 17:52:09 -08:00
Ryan Huffman
2a416ebc61
Merge branch 'master' of https://github.com/highfidelity/hifi into received-message
2015-11-18 16:52:23 -08:00
Stephen Birarda
cb708859fb
resolve conflicts on merge with upstream master
2015-11-18 15:34:56 -08:00
howard-stearns
42a1ee353e
checkpoint
2015-11-18 14:09:33 -08:00
Brad Davis
5b8047ded4
Make recording and playback work in interface, playback in agent
2015-11-18 14:04:45 -08:00
Anthony Thibault
d3d3ddfaf1
Merge pull request #6417 from AndrewMeadows/avatar-capsule
...
fix bounding capusule calculations for new avatars
2015-11-18 13:02:48 -08:00
Brad Hefta-Gaub
35677d3a48
Merge pull request #6418 from birarda/test-ds-settings-fail
...
move keepalive pings transparently to NL
2015-11-18 11:12:16 -08:00
Stephen Birarda
c54dffac12
fix entity-server avg ping, remove debug
2015-11-18 10:32:35 -08:00
Andrew Meadows
ae88057ad9
remove dangling whitespace
2015-11-18 10:24:10 -08:00
Stephen Birarda
0e3d3451d7
make keep alive pings the responsibility of NL
2015-11-18 10:24:10 -08:00
Brad Davis
2636e43fab
Merge pull request #6413 from samcake/controllers
...
Recording: Moving the Recording js interface to the Script engine
2015-11-18 10:22:55 -08:00
Anthony J. Thibault
b481d7c73d
Merge branch 'master' into tony/remove-joint-states
2015-11-18 09:38:21 -08:00
Andrew Meadows
ee751ed1b9
use kDop volume of avatar mesh parts for capsule
2015-11-18 09:22:40 -08:00
Howard Stearns
fee13d4375
Rebuild on a new branch after original stopped building.
2015-11-17 20:06:25 -08:00
Brad Hefta-Gaub
a1e10a9f04
Merge pull request #6309 from thoys/20724
...
CR for Job #20724 - Camera entity mode
2015-11-17 20:05:22 -08:00
Philip Rosedale
450608bf5b
Merge pull request #6390 from sethalves/average-near-holds
...
Average near holds
2015-11-17 20:01:46 -08:00
samcake
368f19b4e2
Merging with todays upstream and checking
2015-11-17 18:58:10 -08:00
samcake
d2f3b48637
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-11-17 17:36:38 -08:00
Stephen Birarda
5dc48dc9dc
resolve conflicts on merge with upstream/master
2015-11-17 17:04:12 -08:00
Stephen Birarda
935c0cc137
handle AudioInjectorManager cleanup in Application
2015-11-17 16:39:23 -08:00
Brad Davis
48b0465e56
Fixing race condition on seek, correcting some issues with frame timing
2015-11-17 15:18:32 -08:00
Brad Davis
900f425f35
Recording fixes
2015-11-17 15:18:31 -08:00
Andrew Meadows
2b07daa976
Merge pull request #6404 from hyperlogic/tony/bugfixes-for-avatars-with-no-eyes
...
Bug fixes for avatars with no eyes
2015-11-17 14:29:20 -08:00
Brad Davis
6664d8d919
Merge pull request #6398 from ZappoMan/messaging
...
messages-mixer
2015-11-17 14:03:03 -08:00
Anthony J. Thibault
e93b5c5838
Bug fixes for avatars with no eyes
...
Changed default eye position to 1.9 meters because
the hifi_team avatars are 2.0 meters tall.
Also, prevent array access with negative indices when eye bones are missing.
ಠ_ಠ
2015-11-17 14:02:27 -08:00
Brad Hefta-Gaub
32bf81ef0d
move MessagesClient to agent
2015-11-17 12:59:12 -08:00
Brad Hefta-Gaub
e7a8df306c
fix warnings
2015-11-17 11:18:36 -08:00
Sam Gateau
5b92929833
Moving the REcordingScriptingInterface into the script-engine and wiiring up in the assignment-client
2015-11-17 09:32:22 -08:00
samcake
8553033d59
Refactoring the mess for the Agent
2015-11-16 19:27:28 -08:00
Brad Hefta-Gaub
1e0b66a68f
more work
2015-11-16 19:23:39 -08:00
Anthony J. Thibault
80eb247b9c
WIP checkin
...
* AnimManipulator: added absolute and relative position and translation support
* Rig: added _overrideFlags and _overridePoses for script overrides.
2015-11-16 18:49:47 -08:00
samcake
71cc36fdd8
removing ms to seconds conversion in MyAvatar
2015-11-16 18:31:24 -08:00
Brad Hefta-Gaub
12f206e2f0
more work on messages
2015-11-16 17:00:03 -08:00
Brad Davis
8a27a2fba5
Fixing recording interface times
2015-11-16 16:29:10 -08:00
Stephen Birarda
aa77c4894c
add an AudioInjectorManager for more efficient threading
2015-11-16 16:04:10 -08:00
Brad Davis
d099f61170
Updating audio record/playback mechanism to more closely match actual audio input
2015-11-16 14:57:24 -08:00
Brad Davis
cb26fc67fc
Move recording interface back to float/seconds
2015-11-16 14:44:22 -08:00
Howard Stearns
35f7a1cf10
Merge pull request #6391 from AndrewMeadows/sisyphus7
...
simplify MyAvatar::deriveBodyFromHMDSensor() take 2
2015-11-16 13:55:22 -08:00
U-GAPOS\andrew
df05a9c8aa
fix bug: bodySensorMatrix constantly reset when walking
2015-11-16 12:02:16 -08:00
Seth Alves
36af315e5d
Merge pull request #6383 from birarda/goodbye-packet
...
send a hopeful disconnect packet from ACs and Interface
2015-11-16 11:28:48 -08:00
Anthony J. Thibault
55adedcec8
Merge branch 'master' into tony/remove-joint-states
2015-11-16 11:22:44 -08:00
Seth Alves
b567a4846d
Merge branch 'master' of github.com:highfidelity/hifi into average-near-holds
2015-11-16 10:08:01 -08:00
Seth Alves
89ed3751ae
Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug
2015-11-14 14:00:20 -08:00
U-GAPOS\andrew
049fe4abee
minor cleanup
2015-11-13 17:42:12 -08:00
samcake
8c21ac144e
Fixing review comments
2015-11-13 16:45:19 -08:00
U-GAPOS\andrew
6733767d8b
use animation state to compute bodyInSensorFrame
2015-11-13 16:39:40 -08:00
Seth Alves
b0d24be58f
add a way to get a list of all actions of a certain type from an entity. hold actions average their positional targets.
2015-11-13 16:02:39 -08:00
Seth Alves
ac635336b7
split AvatarActionHold's finding of its location target into a new function
2015-11-13 14:58:17 -08:00
Stephen Birarda
e263453acb
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-13 14:48:26 -08:00
Stephen Birarda
666c76073a
Merge branch 'baseball' of https://github.com/Atlante45/hifi into baseball
2015-11-13 14:48:15 -08:00
U-GAPOS\andrew
91bc7ca062
cleanup start/stop logic for HMD follow
2015-11-13 14:04:36 -08:00
Stephen Birarda
ea38c4cc49
don't allow domain check-ins while shutting down
2015-11-12 18:04:15 -08:00
Stephen Birarda
d932ba74fd
remove the avatar kill packet from Interface
2015-11-12 17:58:12 -08:00
samcake
1fd37b51a2
trying to get somewhere....
2015-11-12 17:54:35 -08:00
Stephen Birarda
6b2987eef8
handle domain server node removal in NodeList
2015-11-12 17:47:51 -08:00
Seth Alves
d7be1699a7
adjust how the decision to send action changes over the wire is made
2015-11-12 15:27:10 -08:00
Seth Alves
a78b1619be
Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug
2015-11-12 14:20:23 -08:00
Seth Alves
a8cd891e48
adjust how the decision to send action changes over the wire is made
2015-11-12 14:19:23 -08:00
Brad Davis
ee1545f649
Cleaning up clip and transform
2015-11-12 11:48:47 -08:00
Stephen Birarda
ef778c554c
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-12 10:40:51 -08:00
Seth Alves
3519dd248b
Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug
2015-11-12 09:53:11 -08:00
Brad Davis
f521be10fe
Avatar recording work in progress
2015-11-12 00:33:38 -08:00
Anthony J. Thibault
e698d3c1e8
Isolate JointStates within the Rig class
...
Except for SkeletalModel::computeBounds() JointStates are now completly
encapsulated by the Rig. Now we can start using AnimPoses instead and
in parallel with the JointState implementation. Then we can assert that
they are identical, before removing JointStates.
This check in has many comments with the AJT tag.
Each one of these cases will need to be revisitied and fixed.
In particular // AJT: LEGACY will be used to enclose all code
in the Rig which manipulates the _jointState QVector.
2015-11-11 18:23:58 -08:00
Thijs Wenker
4c2c37acce
Merge branch 'master' of https://github.com/worklist/hifi into 20724
2015-11-12 02:19:35 +01:00
Anthony J. Thibault
11440f92f4
Removed rig animations
...
* Deleted AnimationHandle class
* Removed enableAnimGraph and anableRigAnimations from Menu.
* Removed *some* references to old IK system.
But it is still used when computing collision bounding volumes
2015-11-11 15:32:57 -08:00
Anthony J. Thibault
533773d1cd
Removed animationHandles section from Avatar prefs
2015-11-11 13:21:37 -08:00
Anthony J. Thibault
cce967df94
Removed AnimationsDialog
2015-11-11 12:14:56 -08:00
Anthony J. Thibault
56e96ed24c
Merge branch 'master' into tony/script-start-stop-anim
2015-11-11 11:33:24 -08:00
Atlante45
735fd70a8e
Tweak perHandRotation/Position in action
2015-11-10 17:04:53 -08:00
Anthony J. Thibault
936c55a94e
New MyAvatar animation JS interface
...
JavaScript changes:
* removed MyAvatar.playAnimation
* removed MyAvatar.stopAnimation
* removed MyAVatar.getGetAnimationDetails
* removed MyAvatar.startAnimationByRole
* removed MyAvatar.stopAnimationByRole
* removed MyAVatar.getGetAnimationDetailsByRole
* removed MyAVatar.clearJointPriorities
* added MyAvatar.overrideAnimation(url, fps, loop, firstFrame, lastFrame)
* added MyAvatar.restoreAnimation()
* added MyAvatar.getAnimationRoles()
* added MyAvatar.overrideRoleAnimation(role, url, fps, loop, firstFrame, lastFrame)
* added MyAvatar.restoreRoleAnimation(role)
* added MyAvatar.prefetchAnimation(url)
* update kneel.js with new api.
* added theBird.js to test role override api.
C++ changes:
* Added getParent() and replaceChild() to AnimNode
* Added findByName() and traverse() to AnimNode
* Changed AnimStateMachine to hold nodes by childIndex instead of smart pointer.
This allows script to replace nodes dynamically via overrideRoleAnimation
2015-11-10 16:34:38 -08:00
Seth Alves
4df65e4c11
Merge branch 'master' of github.com:highfidelity/hifi into rework-visual-physics-debug
2015-11-10 15:02:07 -08:00
Atlante45
3cbe1bc4da
Mirror on x instead of z
2015-11-10 14:50:22 -08:00
Atlante45
ddf82c35e1
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-10 14:18:49 -08:00
Atlante45
d79221edd2
AvatarActionHold can ignore IK
2015-11-10 14:06:59 -08:00
Atlante45
8da8b4db8c
Add option to ignore IK for my avatar's entity actions
2015-11-10 13:42:25 -08:00
Atlante45
7050139a56
Bit of code cleanup
2015-11-10 13:41:19 -08:00
samcake
d3d5d3a19e
Removing useless code
2015-11-10 12:02:20 -08:00
Thijs Wenker
27495b99f2
Merge branch 'master' of https://github.com/worklist/hifi into 20724
2015-11-10 19:17:33 +01:00
Seth Alves
b9ca509f07
Merge branch 'master' of github.com:highfidelity/hifi into render-debug-fixup
2015-11-10 09:50:12 -08:00
samcake
d1df6854ac
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-11-10 09:16:28 -08:00
Anthony J. Thibault
eacc2cae0c
WIP checkpoint
2015-11-09 18:36:23 -08:00
Atlante45
765bca9a7b
Work on hold action
2015-11-09 18:05:45 -08:00
Anthony J. Thibault
af2b3bb9d5
MyAvatar: removed priority, hold and maskedJoints from playAnimation js call
2015-11-09 16:56:49 -08:00
Atlante45
b3cdee278a
Different approach for bat positionning
2015-11-09 16:14:18 -08:00
Atlante45
9fa6216dc0
Merge branch 'baseball' of github.com:huffman/hifi into baseball
2015-11-09 15:18:12 -08:00
Ryan Huffman
4ab6536109
Fix Vive dynamic pointer cast compile error on Windows
2015-11-09 15:06:43 -08:00
Stephen Birarda
b42dea4555
Merge branch 'master' of https://github.com/Atlante45/hifi into baseball
2015-11-09 14:38:24 -08:00
Atlante45
767a7a7f1e
Fix warnings on OS X
2015-11-09 14:26:23 -08:00
Thijs Wenker
a58bd4ff05
Merge branch 'master' of https://github.com/worklist/hifi into 20724
2015-11-09 22:37:44 +01:00
Atlante45
6a53021818
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-09 13:23:31 -08:00
Atlante45
a5c7269096
Use make_shared
2015-11-09 11:30:53 -08:00
samcake
2078c753ae
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-11-09 09:23:59 -08:00
Seth Alves
f3d26e163d
turn _drawItemStatus into a bitfield, split out bounding boxes and network/physics-sim-ownership. hook Display-Simulation-Ownership menu item to this system
2015-11-07 07:19:27 -08:00
Clément Brisset
2c27d18922
Merge pull request #6282 from jherico/externals
...
Runtime plugins fixes
2015-11-06 19:30:40 -08:00
Brad Davis
6122fa145d
More PR feedback
2015-11-06 17:17:26 -08:00
Brad Davis
37a9538f10
PR feedback, ensure destruction of shared objects
2015-11-06 16:57:31 -08:00
Brad Davis
11733c039f
Allow shared libraries to access core global objects
2015-11-06 16:57:31 -08:00
Atlante45
0a65bb145b
Some more code cleanup
2015-11-06 16:44:28 -08:00
samcake
5fb2c3ccd1
resolve merge conflict
2015-11-06 16:27:47 -08:00
Brad Davis
7c433f47c0
Breaking up input devices and input plugins classes.
2015-11-06 15:20:00 -08:00
James B. Pollack
8eea7ff67c
Merge pull request #6329 from sethalves/fix-grab-release
...
send to server upon grab release
2015-11-06 14:33:08 -08:00
Atlante45
55c6706f76
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-06 13:31:39 -08:00
AlessandroSigna
fdd4a55057
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-11-06 12:47:04 -08:00
AlessandroSigna
6d3a79af83
changed the behaviour of Standard.LY input
2015-11-06 12:46:08 -08:00
samcake
703a6bdb95
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-11-06 12:38:07 -08:00
Clément Brisset
5d80dc0c90
Merge pull request #6324 from sethalves/smooth-hold-action-velocity
...
smooth hold action velocity over 2 frames
2015-11-06 12:25:52 -08:00
Seth Alves
46b7b92b2f
prefix private member variables with _
2015-11-06 11:54:51 -08:00
samcake
a82c2d66ed
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-11-06 11:53:49 -08:00
Brad Davis
1dc392bb36
Merge pull request #6330 from Atlante45/master
...
// FIXME incredibly evil....
2015-11-06 11:43:33 -08:00
Atlante45
c53c0ec53f
Fix double delete on shutdown
2015-11-06 11:13:10 -08:00
samcake
2f9c33dbfb
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-11-06 09:35:48 -08:00
samcake
46d9a14951
Work in progress, fixing the animation playback
2015-11-06 09:35:20 -08:00
Seth Alves
4ed8a1e5d1
changes to send an update to entity-server when AvatarActionHold releases an entity
2015-11-06 09:25:53 -08:00
Thijs Wenker
de98a17ada
- rename CameraEntityItem to AnchorEntityItem
2015-11-06 01:58:08 +01:00
Atlante45
ffafd3194e
Recording audio fixes
2015-11-05 16:46:59 -08:00
Atlante45
c1029450d9
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-05 15:14:15 -08:00
Seth Alves
28d4d29bb6
smooth hold action velocity over 2 frames
2015-11-05 15:07:00 -08:00
Anthony J. Thibault
50370479e4
Application.h: coding standard fixes
2015-11-05 11:03:32 -08:00
Anthony J. Thibault
d9f4b0218e
Merge branch 'master' into tony/mac-fixes
2015-11-05 08:26:44 -08:00
samcake
00797b4dea
Merge pull request #6314 from jherico/homer
...
Fixing step yaw to move by consistent amounts, be 'tappable'
2015-11-04 23:33:45 -08:00
Brad Davis
86b852231e
Merge pull request #6286 from EdgarPironti/master
...
Spacemouse migration
2015-11-04 19:15:35 -08:00
Brad Davis
20d1035821
Fixing step yaw to move by consistent amounts, be 'tappable'
2015-11-04 15:54:50 -08:00
Anthony J. Thibault
d46d521d81
Added #else branch to #if 0
2015-11-04 15:10:23 -08:00
Seth Alves
4ab727c47c
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-11-04 13:57:59 -08:00
Thijs Wenker
42cbccc725
fix stretchy HMD view on entity camera
2015-11-04 21:39:22 +01:00
Thijs Wenker
ee218faf5e
Merge branch '20724' of github.com:thoys/hifi into 20724
2015-11-04 21:21:57 +01:00
Anthony J. Thibault
69f1cfbcb9
Fixes for Mac build and crash on startup
...
For some reason the qt code gen is getting confused by the #if 0
in 3DConnextionClient.h, so I added a stub implementation.
In Application.cpp the change of moving idle into paintGL had a sideeffect
of calling OffscreenGlCanvas before it was initialized. To work around this
I added a guard to prevent calling idle before all the gl windows/widgets have
been initialized.
2015-11-04 12:04:34 -08:00
Atlante45
d9cd986db2
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-04 11:26:16 -08:00
Anthony Thibault
275b248547
Merge pull request #6302 from AndrewMeadows/fix-avatar-drift
...
fix slow drift of avatar when wearing HMD
2015-11-04 11:19:45 -08:00
samcake
ce5e89ce66
removing the pulsing mechanism in MyAvatar and making a new stadnard.json mapping file
2015-11-04 10:53:53 -08:00
U-GAPOS\andrew
9de5721a48
set _hmdFollowVelocity to zero when done following
2015-11-04 10:23:55 -08:00
Seth Alves
f2be71d1a5
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-11-04 09:32:21 -08:00
Seth Alves
270b4b97fc
remove a left-over kludge that was causing the appearence of frame-lag in held objects
2015-11-04 02:26:02 -08:00
EdgarPironti
7adf38f781
Spacemouse migration
2015-11-03 18:22:55 -08:00
EdgarPironti
2a84cadd5d
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-11-03 18:22:29 -08:00
Atlante45
3a545399e3
Remove our idle() from paintGL now that it's in master
2015-11-03 17:56:40 -08:00
Thijs Wenker
d7279e4c88
Support for Camera Entities.
...
- New entity type: camera, with just the basic properties of an entity (position, rotation, name etc.).
- New CameraMode: CameraEntity
- Example script using the new cameraEntity
- Updated edit.js to use the CameraEntities (with button to preview the camera)
2015-11-04 02:51:23 +01:00
Atlante45
55894f2eee
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-03 17:46:24 -08:00
Atlante45
eb990c9c1c
More basebal test code
2015-11-03 17:45:01 -08:00
Seth Alves
ffb0317a50
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-11-03 16:53:00 -08:00
Seth Alves
fbaa86426c
re-remove the _nextPosition stuff
2015-11-03 16:52:46 -08:00
Brad Hefta-Gaub
71e4092276
Merge pull request #6283 from hyperlogic/tony/one-update-for-every-render
...
Remove idleTimer and call idle directly from paintGL.
2015-11-03 16:38:43 -08:00
Seth Alves
60824a1fb0
back out some off-brand changes. add parentChanged call
2015-11-03 16:07:28 -08:00
Anthony J. Thibault
31f361d49c
Moved fps timing to beginning of paintGL
...
This should improve accuracy.
However the fps displayed can still sometimes be slightly greater then the
vsync, this is either due to timer accuracy problems or QTimer delay within
OpenGLDisplayPlugin.
2015-11-03 15:51:18 -08:00
U-GAPOS\andrew
d544b7a645
fix bug: avatar can't walking when HMD at rest
2015-11-03 13:59:15 -08:00
Andrew Meadows
4215ce5d25
Merge pull request #6212 from howard-stearns/dont-use-other-avatar-sounds
...
Don't play other avatar's collision sounds.
2015-11-03 13:40:27 -08:00
Andrew Meadows
498cec3abd
Merge pull request #6294 from AndrewMeadows/fix-hydra-sans-hmd
...
fix hydra sensor matrix when no HMD is attached
2015-11-03 13:37:03 -08:00
Seth Alves
dba9eb7046
merge from upstream
2015-11-03 13:35:17 -08:00
EdgarPironti
d99838de9c
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-11-03 12:25:19 -08:00
Atlante45
0508091130
Rebase fixes
2015-11-03 11:37:57 -08:00
Andrew Meadows
e160e2a7ae
the minimal fix
2015-11-03 11:37:30 -08:00
Brad Davis
4c076d8b12
Disabling billboard rendering, source of the evil black rectangles
2015-11-03 11:34:05 -08:00
Andrew Meadows
12ff9734e0
init _bodySensorMatrix in ctor
2015-11-03 11:26:49 -08:00
Anthony J. Thibault
c139b62217
fps calculation now based on moving average
...
fps stat is now calcualted the same way as simRate and avatarRate are calculated,
based on a moving average that is sampled once a second.
Also, Removed unused constants and renamed Application::checkFPS to Application::ping
2015-11-03 11:19:49 -08:00
Clément Brisset
c63fc8557c
More baseball test code
2015-11-03 11:14:59 -08:00
Clément Brisset
40ce2416e8
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-03 11:13:57 -08:00
Ryan Huffman
03a338dfe6
Merge branch 'baseball' of github.com:birarda/hifi into baseball
2015-11-03 11:13:56 -08:00
Stephen Birarda
8cd41b9383
resolve conflicts on merge with huffman/baseball
2015-11-03 11:13:15 -08:00
Ryan Huffman
55789fed99
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-03 11:11:26 -08:00
Ryan Huffman
ccb25f4b63
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-11-03 11:10:45 -08:00
Ryan Huffman
afffe7f5c6
Merge branch 'master' of github.com:Atlante45/hifi into baseball
2015-11-03 11:10:14 -08:00
Atlante45
f2ff0b40f7
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-11-03 11:06:19 -08:00
Clément Brisset
31d92fd90a
Baseball test code
2015-11-03 11:00:35 -08:00
EdgarPironti
603405ad61
Do not merge - Spacemouse
2015-11-02 23:29:15 -08:00
Brad Davis
764ecba2a8
Adding diagnostics to track down the 'black rectangles of death'
2015-11-02 21:55:35 -08:00
Anthony J. Thibault
0c12bb5a4e
Remove idleTimer and call idle directly from paintGL.
2015-11-02 18:47:18 -08:00
Seth Alves
310a5c9bfb
don't initialize SMI sdk unless we need it
2015-11-02 13:42:12 -08:00
Stephen Birarda
017cee6961
make shouldRenderLocally do the right thing
2015-11-02 11:59:09 -08:00
U-GAPOS\andrew
a77f888f15
more correct HMD offset correction velocity
2015-11-02 11:29:17 -08:00
U-GAPOS\andrew
a545d770d8
fix bug preventing avatar motion in 2D mode
2015-11-02 11:07:43 -08:00
Andrew Meadows
9799693135
remove extra whitespace
2015-11-02 11:07:41 -08:00
Andrew Meadows
fd557c4e52
route HMD-following through the physics simulation
2015-11-02 11:07:40 -08:00
Howard Stearns
fc63fa6f7b
Update comments, and don't continue through collisions after finding one for our avatar.
2015-11-01 18:55:43 -08:00
Howard Stearns
ea2971a24f
Merge branch 'master' of https://github.com/highfidelity/hifi into dont-use-other-avatar-sounds
2015-11-01 17:02:59 -08:00
Seth Alves
3ac0fef1ea
merge from upstream
2015-11-01 15:22:57 -08:00
Brad Hefta-Gaub
9c23f2551d
Merge pull request #6207 from jherico/pluginSupport
...
Support for runtime plugins (DLLs)
2015-11-01 14:57:13 -08:00
Brad Davis
cfb2fd1523
Support for runtime plugins (DLLs)
2015-11-01 11:12:12 -08:00
Brad Hefta-Gaub
e899229cde
tweaks to how VrMenu is shown
2015-11-01 09:55:30 -08:00
Brad Hefta-Gaub
05dea847be
add Actions.CycleCamera and wire up secondary thumb buttons to Actions.CycleCamera and Actions.ContextMenu
2015-10-31 15:47:40 -07:00
Howard Stearns
79f05c63e5
Merge branch 'master' of https://github.com/highfidelity/hifi into dont-use-other-avatar-sounds
2015-10-31 11:23:18 -07:00
Seth Alves
896ed3927c
merge from upstream
2015-10-30 19:17:43 -07:00
Anthony J. Thibault
085282db4f
Crash fix for AvatarManager when iterating over _avatarHash
...
The main problem is that a null shared pointer was inserted into the _avatarHash
via the AvatarManager::getAvatarBySessionID(). When the sessionID is not present
in the _avatarHash, [QHash](http://doc.qt.io/qt-5/qhash.html#operator-5b-5d ) will *insert*
an empty smart_ptr into the hash.
2015-10-30 16:13:04 -07:00
Andrew Meadows
f652e983a9
flag kinematic objs when changed in stepSimulation()
2015-10-30 14:53:29 -07:00
Howard Stearns
28246c1951
Merge branch 'master' of https://github.com/highfidelity/hifi into dont-use-other-avatar-sounds
2015-10-30 13:21:56 -07:00
Brad Hefta-Gaub
8839458d54
Merge pull request #6242 from highfidelity/controllers
...
New Controller interfaces/api
2015-10-30 12:47:51 -07:00
Seth Alves
93503d0a21
make kinematic grab set entities kinematic in bullet and update entity position
2015-10-30 11:03:13 -07:00
Howard Stearns
792fed0090
We weren't setting type for avatar motion states.
2015-10-29 22:15:26 -07:00
samcake
f72146c35d
FIxing the mac build
2015-10-29 14:17:52 -07:00
samcake
d73eafddd1
COmfort mode working with the COntroller system observing the menu state
2015-10-29 13:48:16 -07:00
samcake
e902e5e97a
Introduce the concept of loading the default Mapping
2015-10-29 13:05:29 -07:00
Howard Stearns
3c6d4f9c22
Thread safety per #6154 .
2015-10-29 11:02:24 -07:00
Howard Stearns
6e4d0043c9
Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars
2015-10-29 10:32:12 -07:00
Brad Davis
ccbae81dad
Merge branch 'master' into HEAD
...
Conflicts:
interface/src/avatar/SkeletonModel.cpp
2015-10-29 10:24:38 -07:00
Seth Alves
ac1055c3e0
Merge pull request #6214 from howard-stearns/goToPosition
...
Don't go to wrong position on startup/teleport.
2015-10-29 10:15:26 -07:00
Seth Alves
10717dc364
Merge pull request #6154 from howard-stearns/safe-avatar-list-access
...
Safe avatar list access
2015-10-29 10:12:34 -07:00
Andrew Meadows
d33530f5d0
Merge pull request #6209 from howard-stearns/guard-rendering-of-avatar-collision-hull
...
Don't render avatar's renderBoundingCollisionShapes before data is there
2015-10-29 09:34:26 -07:00
Brad Davis
c4e82a85d9
Remove DeviceProxy in favor of InputDevice
2015-10-29 09:32:56 -07:00
Andrew Meadows
f9012d5051
Merge pull request #6187 from sethalves/fix-actions-ttl
...
fix actions bug
2015-10-29 09:30:21 -07:00
Howard Stearns
c47d246987
Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars
2015-10-29 08:27:12 -07:00
Howard Stearns
d79d0bc5c5
Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars
2015-10-29 08:25:41 -07:00
Brad Hefta-Gaub
21decaaf8e
Merge pull request #6218 from ctrlaltdavid/20719
...
20719 Fix audio stats dialog box not being sized properly
2015-10-29 08:16:56 -07:00
Howard Stearns
697b9fb60b
Merge pull request #6205 from hyperlogic/tony/eye-lookat-fix
...
Fixes locally rendered eye gaze
2015-10-28 21:39:54 -07:00
Anthony J. Thibault
5e73af9272
Rig: Removed dt from updateFromEyeParameters()
2015-10-28 18:10:41 -07:00
David Rowe
568e5536b8
Control bandwidth stats dialog sizing similarly
2015-10-29 13:18:43 +13:00
David Rowe
4cb5ccab90
Fix audio stats dialog not being sized properly
2015-10-29 13:18:27 +13:00
howard-stearns
62e56d3f13
Don't go to wrong position on startup/teleport.
...
This fixes one cause of being in the wrong place.
https://app.asana.com/0/32622044445063/61787931469907
2015-10-28 16:44:53 -07:00
Howard Stearns
bc0e14cb71
Don't render avatar's renderBoundingCollisionShapes before the data is there.
...
(Found while trying to repro "Deadlock in AvatarData::nextAttitude() on main thread" https://app.asana.com/0/32622044445063/61023569045356 )
2015-10-28 13:58:44 -07:00
Brad Davis
570b4a32da
Merge pull request #6206 from samcake/controllers
...
Controllers : Add a new kind onf controller to expose ReadOnly state from the application
2015-10-28 13:42:15 -07:00
Brad Davis
3c1a0930da
Merge remote-tracking branch 'upstream/master' into HEAD
...
Conflicts:
interface/src/avatar/MyAvatar.h
libraries/script-engine/src/ScriptEngine.cpp
libraries/script-engine/src/ScriptEngine.h
2015-10-28 13:38:22 -07:00
samcake
bbc6d9f5e7
Fixing typo and review comments
2015-10-28 12:52:21 -07:00
samcake
b37a6f689a
Fixing typo and review comments
2015-10-28 12:51:22 -07:00
samcake
fc15c7cd98
Adding the ApplicationStateDevice to the APplication class and add one entry ythere
2015-10-28 12:15:14 -07:00
Brad Hefta-Gaub
731fab6ffc
Merge pull request #6196 from jherico/gl
...
Move GL utilities to their own library
2015-10-28 12:10:52 -07:00
Brad Hefta-Gaub
c5e22a62e8
Merge pull request #6182 from Atlante45/script-engine
...
Improved ScriptEngine debug messages
2015-10-28 11:27:30 -07:00
Anthony J. Thibault
6ae5c540fd
SkeletonModel: coding standard fix
...
Replaced glm::vec3(0) with glm::vec3().
2015-10-28 11:09:24 -07:00
Howard Stearns
367175b8a6
Reduce lock time.
2015-10-28 10:49:19 -07:00
Andrew Meadows
afec2a9771
fix whitespace
2015-10-28 09:42:55 -07:00
samcake
57aa89d14f
Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers
2015-10-28 09:24:24 -07:00
samcake
92ca658aae
Trying to get a state controller to work
2015-10-28 09:23:20 -07:00
Anthony J. Thibault
ae8938cadc
Fix for local eye tracking in AnimGraph
...
Also moved Rig::updateAnimations() now occurs after
Rig::updateFromHeadParameters() and Rig::updateFromHandParameters().
This should remove a frame of lag for head and hand IK targets.
Rig::updateFromEyeParameters() occurs after Rig::updateAnimations().
But now the eye JointStates are re-computed, this is the actual
fix for the local eye tracking issue.
2015-10-27 18:30:35 -07:00
Brad Hefta-Gaub
65eae35433
a little more cleanup
2015-10-27 17:09:43 -07:00
samcake
6ec87086bc
Adding the state controller
2015-10-27 16:57:06 -07:00
Brad Hefta-Gaub
d86f1b50a7
more cleanup
2015-10-27 16:37:43 -07:00
Brad Hefta-Gaub
19743c1f39
gak, build busters and more CR feedback
2015-10-27 16:16:03 -07:00
Brad Hefta-Gaub
eb19364129
CR feedback
2015-10-27 15:56:27 -07:00
Brad Hefta-Gaub
133d48ebee
CR feedback
2015-10-27 15:53:48 -07:00
Brad Davis
5cbb2562cd
Move GL utilities out to their own library
2015-10-27 15:53:42 -07:00
Andrew Meadows
e35596428c
cleanup comment
2015-10-27 14:43:18 -07:00
Atlante45
32f88f3fb6
Fix for JSConcole
2015-10-27 14:37:39 -07:00
Brad Hefta-Gaub
5a42991e0c
first pass at cleaning up MyAvatars use of PalmData
2015-10-27 13:51:42 -07:00
Andrew Meadows
8b285fd228
recover follow HMD behavior
2015-10-27 13:51:40 -07:00
Andrew Meadows
43aac813da
more prep for shifting avatar during HMD motion
2015-10-27 13:15:38 -07:00
Andrew Meadows
24c2f538a4
keep MyAvatar RigidBody on shape changes
2015-10-27 13:15:38 -07:00
Andrew Meadows
355ebe923d
cleanup and comments
2015-10-27 13:15:38 -07:00
Andrew Meadows
5e59e9595b
fix typo in comments
2015-10-27 13:15:38 -07:00
Andrew Meadows
5f278f9024
name change
2015-10-27 13:15:38 -07:00
Andrew Meadows
a1f1e50431
split CharacterController btw phys and interface
2015-10-27 13:15:38 -07:00
samcake
87cf3b237b
Supporting a InHMD action and using it to enable COmfort mode
2015-10-27 09:59:22 -07:00
Seth Alves
8d0aaed41a
fix bug that was deleting actions with 0 ttl. in js interface, action parameter 'lifetime' is now called 'ttl'
2015-10-26 13:50:21 -07:00
Howard Stearns
900b07fdee
dead code
2015-10-26 10:00:07 -07:00
Howard Stearns
7b0b77f4d1
getAvatarHash => withAvatarHash
2015-10-23 16:57:27 -07:00
Brad Davis
e8be92cab8
Adding input action event
2015-10-23 13:36:06 -07:00
Brad Hefta-Gaub
f90844449d
fix angular velocity
2015-10-23 13:16:05 -07:00
Brad Hefta-Gaub
4a58eeb810
expose deltaRotation as part of MyAvatar.xxxHandPose
2015-10-23 12:14:33 -07:00
Brad Hefta-Gaub
71dfff7c35
first cut at adding MyAvatar.xxxHandPose
2015-10-23 12:00:40 -07:00
Seth Alves
d86d69aeba
keep track of children. use local position and orientation on the wire.
2015-10-22 15:36:03 -07:00
Howard Stearns
f0a4e25e89
Name change per comments.
2015-10-22 15:25:14 -07:00
Howard Stearns
ecc920199d
Return id suitable for use with remover, per comments.
2015-10-22 15:24:24 -07:00
Howard Stearns
1d0464ede5
Name change and thread checks per comments.
2015-10-22 15:15:10 -07:00
Seth Alves
f6fe503c51
pass avatar parent information through avatar-mixer
2015-10-22 13:44:04 -07:00
Howard Stearns
0d514ad645
Thread-safe avatar list access
2015-10-22 13:02:08 -07:00
Brad Davis
5227c40298
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-22 12:15:41 -07:00
Seth Alves
264b658132
hook up entities and avatars to SpatialParentFinder
2015-10-22 11:05:48 -07:00
Howard Stearns
a58539be82
Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars
2015-10-22 10:39:54 -07:00
Brad Davis
afcec347ff
Wiring yaw action to avatar
2015-10-21 21:35:19 -07:00
Howard Stearns
9fd61907f5
Call back to Javascript asynchronously, so that we don't block and the script's engine doesn't have thread conflicts.
2015-10-21 20:50:07 -07:00
Brad Davis
044a28212d
Wiring step yaw to the avatar
2015-10-21 20:44:38 -07:00
Brad Hefta-Gaub
68a2985b7a
add tip position as well
2015-10-21 17:14:48 -07:00
Brad Hefta-Gaub
a3900a954b
expose MyAvatar.leftHandePosition and MyAvatar.rightHandPosition to JS
2015-10-21 17:03:54 -07:00
Brad Davis
4a1df286fd
Cleanup of enums and JS names
2015-10-21 15:57:37 -07:00
Seth Alves
3944d7be0f
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-10-21 13:50:17 -07:00
Seth Alves
c0eccca6d3
relay 'kinematic' mode of a hold to other interfaces
2015-10-21 12:29:26 -07:00
Brad Davis
a124d3b433
Moving to InputEndpoint, fixing build problem
2015-10-20 22:00:16 -07:00
Howard Stearns
574a51e831
Use cleaner interface.
2015-10-20 17:02:16 -07:00
samcake
da55011c2a
Trying to merge
2015-10-20 16:38:41 -07:00
Seth Alves
6cb195b335
Merge branch 'master' of github.com:highfidelity/hifi into parents
2015-10-20 15:53:56 -07:00
Howard Stearns
4c6867bb9c
Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars
2015-10-20 12:17:00 -07:00
Seth Alves
bc99ef778c
change how render engine is told about model position changes
2015-10-20 12:04:29 -07:00
Brad Davis
bea6fdd890
Working on JSON parsing and cleanup
...
Conflicts:
libraries/controllers/src/controllers/Route.cpp
libraries/controllers/src/controllers/ScriptingInterface.cpp
libraries/controllers/src/controllers/StandardController.cpp
libraries/controllers/src/controllers/impl/RouteBuilderProxy.h
2015-10-20 10:20:28 -07:00
Brad Davis
8d0148a1ca
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-20 10:13:31 -07:00
Andrew Meadows
341bc3666f
Merge pull request #6093 from sethalves/hold-action-changes
...
Hold action changes
2015-10-20 09:19:48 -07:00
Seth Alves
83f69bcb6e
merge from upstream
2015-10-19 19:21:33 -07:00
Brad Hefta-Gaub
9f17f10d6a
fix warning in master
2015-10-19 17:56:38 -07:00
Seth Alves
4feb9dc8c6
prepare for possible future coding standard
2015-10-19 17:46:34 -07:00
Brad Hefta-Gaub
7669f9ed2c
fix several warnings
2015-10-19 17:26:57 -07:00
Seth Alves
41f7ef1e2e
cleanups
2015-10-19 16:53:27 -07:00
Brad Hefta-Gaub
56f625d376
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-19 16:53:25 -07:00
Brad Hefta-Gaub
0b2bf8bda8
remove some dead code
2015-10-19 15:23:45 -07:00
Brad Hefta-Gaub
110adc5c22
fix model LOD behavior
2015-10-19 15:21:25 -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
Brad Davis
a8e707ced2
Correcting update order to fix mouse
2015-10-18 22:46:14 -07:00
Brad Davis
734a39f962
Breaking up UserInputMapper, restoring some mappings
2015-10-18 18:58:03 -07:00
Seth Alves
a78f2a9577
have avatar make use of SpatiallyNestable
2015-10-18 09:48:46 -07:00
Seth Alves
275e77d29e
remove old-style avatar referentials
2015-10-18 07:51:00 -07:00
Brad Davis
57be59935d
Move controller test to app
2015-10-17 19:13:38 -07:00
Brad Davis
5bac1aae2d
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-16 17:23:30 -07:00
Howard Stearns
91c2d31118
Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars
2015-10-16 15:51:09 -07:00
Howard Stearns
770282ad88
Javascript methods to getAvatars listing and getAvatar from id.
2015-10-16 15:22:43 -07:00
samcake
f0034844e7
Actions working from the Controller layer
2015-10-16 12:24:12 -07:00
Seth Alves
fe709a9397
keep object active in kinematic mode, also
2015-10-16 10:53:33 -07:00
Howard Stearns
f25cc93936
Initial prototype of exposing anim vars to javascript.
2015-10-16 10:48:36 -07:00
Seth Alves
966499b9e5
continually activate (in the bullet sense) a held object
2015-10-16 10:17:17 -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
Ryan Huffman
9ddcfdf94d
Cleanup PacketReceier and ReceivedMessage
2015-10-16 09:21:10 -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
Seth Alves
0964180f2c
code review
2015-10-15 17:10:47 -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
Ryan Huffman
421e2a6c21
Merge pull request #6078 from imgntn/top_tool_tabs
...
Move Edit.js Tool Window Tabs to the Top
2015-10-15 15:40:42 -07:00
James B. Pollack
aee11d4c06
cleanup merge
2015-10-15 15:05:34 -07:00
James B. Pollack
112007e5a9
cleanup
2015-10-15 14:58:05 -07:00
Seth Alves
462918ffcf
cleanups
2015-10-15 14:55:17 -07:00
Seth Alves
487131dde1
cleanups
2015-10-15 14:52:38 -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
James B. Pollack
8b57b3c0ff
fix memory leak
2015-10-15 14:13:07 -07:00
Ryan Huffman
7682ab00e3
Add ReceivedMessage and receive progress
2015-10-15 14:09:53 -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
James B. Pollack
e63ed5cf84
Merge pull request #6087 from thoys/20708
...
CR for Job #20708 - Script Editor Improvements
2015-10-15 12:28:32 -07:00
Brad Davis
80c962a4cc
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-15 12:27:53 -07:00
Brad Hefta-Gaub
923e1ed208
add more processing stats
2015-10-15 12:21:36 -07:00
Seth Alves
a70ba4cd5a
add some accessors
2015-10-15 11:42:53 -07:00
Seth Alves
1d8db13f41
switch to low-entity-server traffic hold
2015-10-15 10:56:47 -07:00
Seth Alves
64c5cde2d2
further unmangle branch split
2015-10-15 10:33:58 -07:00
Seth Alves
a78728c96b
further unmangle branch split
2015-10-15 10:29:25 -07:00
Seth Alves
8195145dc7
further unmangle branch split
2015-10-15 10:13:00 -07:00
Seth Alves
d833fb08d7
further unmangle branch split
2015-10-15 10:03:32 -07:00
Andrew Meadows
2ae62de84e
Merge pull request #6026 from birarda/qt-polling-env
...
set bearer poll timeout env for wlan scan in Qt 5.5
2015-10-15 09:58: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
Seth Alves
7ef5fc9613
remove line that leaked over from other branch
2015-10-15 09:19:47 -07:00
Seth Alves
9f40c7bf8c
fix up AvatarActionHold
2015-10-15 09:13:06 -07:00
Seth Alves
5ebefadda1
remove some debugging
2015-10-15 09:07:35 -07:00
Thijs Wenker
8111432088
Merge branch 'master' of https://github.com/worklist/hifi into JS_Rotation_FIX
2015-10-15 14:50:20 +02:00
James B. Pollack
c8b6fed0e0
Update ToolWindow.cpp
2015-10-14 21:18:17 -07:00
James B. Pollack
84973c590d
Update ToolWindow.h
2015-10-14 21:17:19 -07:00
James B. Pollack
c18aeef6b3
remove redundant call
2015-10-14 17:29:38 -07:00
James B. Pollack
a1e2292e62
remove title bar from docked tool widgets
2015-10-14 17:27:45 -07: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
Brad Davis
e39219c2b5
Fixes and PR comments
2015-10-14 16:51:52 -07:00
Brad Davis
0063f9ae1d
Merging old and new controller interfaces
2015-10-14 15:16:54 -07:00
James B. Pollack
536351e9d5
move set tab position to constructor
2015-10-14 15:10:04 -07:00
Anthony J. Thibault
3e7a6fd490
Change to boom offset for 3rd person HMD camera.
...
Previously the boom offset was computed in HMD sensor space instead of
world space, so it did not play well with the vive, or the oculus
if you weren't facing the camera directly.
Now it is computed in world space, and is always behind the character's
position/orientation. This can cause the boom to swing if the character
rotation changes but now the avatar rotation in HMD uses comfort mode.
It's not that disorienting.
2015-10-14 14:43:59 -07:00
Seth Alves
21519c6418
debugging
2015-10-14 14:13:08 -07:00
Seth Alves
5ce39b74fd
debugging
2015-10-14 13:58:19 -07:00
James B. Pollack
d45f48c8cd
fixbug
2015-10-14 13:55:04 -07:00
James B. Pollack
815b263954
convert tabs to spaces
2015-10-14 13:26:19 -07:00
Thijs Wenker
7df5ba01e6
JSConsole:
...
executeCommand works async now
2015-10-14 22:21:51 +02: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
Thijs Wenker
96b6067d88
ScriptEditor Improvements:
...
- Script restart works proper again
- Fixed on and off icon switch
- Replaced regular script output box with fully functional JSConsole!
2015-10-14 20:37:47 +02:00
James Pollack
7a8db803eb
move toolwindow tabs to the top
2015-10-14 19:35:37 +01:00
Thijs Wenker
880d34d483
JSConsole improvements
...
- ability to set Script Engine
- clear function for clearing the output
- only show evaluation output for executeCommand, print() and error output is still being printed
2015-10-14 20:35:15 +02:00
Brad Davis
f051a84dc6
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-14 10:54:32 -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
Thijs Wenker
660bf6b3ea
ScriptEditor: single quotes support and spelling fix
2015-10-14 14:47:29 +02:00
Brad Davis
0c31fb1b1b
Merge pull request #6069 from ZappoMan/controllers
...
Hack in NewControllers into the JS layer of interface to allow testing
2015-10-13 19:08:26 -07:00
Anthony J. Thibault
1c1221597d
Merge branch 'master' into tony/turn-hips-while-moving
2015-10-13 18:38:27 -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
Andrew Meadows
073b019458
Merge pull request #6072 from howard-stearns/skip-some-reload-recenter-on-startup
...
Don't reload/recenter some avatar data on startup
2015-10-13 17:08:00 -07:00
Stephen Birarda
d84994d8e0
fix casing for ubuntu include failure
2015-10-13 17:04:45 -07:00
Stephen Birarda
2caa7f6d64
change getUrl to getATPUrl, use in ATPAssetMigrator
2015-10-13 16:56:20 -07:00
Stephen Birarda
574089530a
make sure request is not nullptr before using it
2015-10-13 16:49:12 -07:00
Stephen Birarda
d22c602041
use categorized logging in ATPAssetMigrator
2015-10-13 16:44:13 -07:00
Stephen Birarda
cc93767077
remove some extra spaces
2015-10-13 16:38:00 -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
Brad Hefta-Gaub
8a2e23cae4
CR feedback
2015-10-13 16:20:52 -07:00
Seth Alves
2ecb7e8d29
fix bug that was making action deletes fail
2015-10-13 16:19:12 -07:00
Stephen Birarda
1450305390
fix ATP url scheme constant
2015-10-13 16:13:47 -07:00
Stephen Birarda
fc82ea8541
resolve conflicts on merge with upstream/master
2015-10-13 16:12:54 -07:00
Stephen Birarda
549043f255
add an option to bulk upload assets in ATPAssetMigrator
2015-10-13 15:20:37 -07:00
Seth Alves
4fa85441b8
tweak
2015-10-13 15:14:34 -07:00
Brad Hefta-Gaub
ad96d76921
implement comfort mode hack
2015-10-13 15:06:11 -07:00
Seth Alves
257e3845de
get action type correct
2015-10-13 14:45:20 -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
Howard Stearns
93e908a592
Don't reload/recenter some avatar data on startup, when we don't necessarilly have all the required data initialized.
2015-10-13 12:15:13 -07:00
