Howard Stearns
303491817b
assert to get hard error in dev, warning and no-op in release.
2015-10-29 16:35:59 -07:00
Howard Stearns
6b4b4440e8
Merge branch 'master' of https://github.com/highfidelity/hifi into expose-anim-vars
2015-10-29 16:06:24 -07:00
Clément Brisset
e818028043
Merge branch 'master' of https://github.com/highfidelity/hifi
2015-10-29 15:53:44 -07:00
Clément Brisset
0ea2ca589b
Merge branch 'physics-ccd' of https://github.com/huffman/hifi
...
Conflicts:
examples/libraries/walkApi.js
examples/toybox/flashlight/flashlight.js
examples/walk.js
2015-10-29 15:47:14 -07:00
Brad Hefta-Gaub
c962697b18
Merge pull request #6230 from samcake/controllers
...
Controllers : Comfort mode is working through the stanadrd mapping
2015-10-29 14:59:42 -07:00
samcake
c1e00ca08c
FIxing the mac build again ?
2015-10-29 14:30:51 -07:00
Stephen Birarda
d03a837263
resolve conflicts on merge with upstream master
2015-10-29 14:28:50 -07:00
Brad Hefta-Gaub
ffa805affb
Merge pull request #6223 from AlessandroSigna/controllers
...
Vive Controller
2015-10-29 14:16:34 -07:00
samcake
9c860346df
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-10-29 14:05:34 -07:00
Brad Davis
036ae62dd3
Merge remote-tracking branch 'upstream/master' into HEAD
2015-10-29 14:00:52 -07:00
samcake
d73eafddd1
COmfort mode working with the COntroller system observing the menu state
2015-10-29 13:48:16 -07:00
Brad Hefta-Gaub
3c11cf2926
Merge pull request #6226 from kencooke/master
...
Workaround for audio having channels swapped under Qt 5.5.1
2015-10-29 13:25:41 -07:00
AlessandroSigna
ffd2b39874
Fix vive controller - update to new input plugin register
2015-10-29 13:18:37 -07:00
samcake
b09a159090
Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers
2015-10-29 13:06:52 -07:00
samcake
77759fa8af
t reset --:wq
...
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-10-29 13:06:16 -07:00
samcake
e902e5e97a
Introduce the concept of loading the default Mapping
2015-10-29 13:05:29 -07:00
Ken Cooke
1eabb924f1
Fixed the logic to be correct
2015-10-29 12:53:47 -07:00
Stephen Birarda
fb55f0becb
guard timeElapsed for simulateKinematicMotion to max 1s
2015-10-29 12:50:34 -07:00
Andrew Meadows
0c5b4115ed
Merge pull request #6221 from huffman/physics-substep-fix
...
Physics substep fix
2015-10-29 12:39:15 -07:00
Brad Hefta-Gaub
1f53e425eb
Merge branch 'master' of https://github.com/highfidelity/hifi into controllers
2015-10-29 12:28:28 -07:00
Brad Davis
f21633e368
Merge pull request #6222 from ZappoMan/hardwareChanged
...
Handle input plugin register/remove when activated/deactivated by menus
2015-10-29 12:24:17 -07:00
Ken Cooke
4d576d7aaf
Fix typo
2015-10-29 12:23:36 -07:00
Ken Cooke
143b9c663f
Quick fix for audio having channels swapped under Qt 5.5.1.
2015-10-29 12:21:28 -07:00
Anthony J. Thibault
f7b6fab0c3
Merge branch 'master' into tony/anim-sync-blend
2015-10-29 11:35:48 -07:00
Brad Hefta-Gaub
851460b2bd
fix build buster for SDL2 missing builds
2015-10-29 11:26:11 -07:00
Howard Stearns
308fd0cf7e
Merge branch 'master' of https://github.com/highfidelity/hifi into dont-use-other-avatar-sounds
2015-10-29 11:14:31 -07:00
Brad Hefta-Gaub
3d37a1d249
fix Controller.Hardware when input plugins are deactived
2015-10-29 11:06:20 -07:00
Brad Hefta-Gaub
ed87ae3d5a
remove some debugging
2015-10-29 10:57:30 -07:00
Brad Hefta-Gaub
bab2a7d80f
Merge branch 'controllers' of https://github.com/highfidelity/hifi into hardwareChanged
...
Conflicts:
libraries/input-plugins/src/input-plugins/SixenseManager.cpp
libraries/input-plugins/src/input-plugins/ViveControllerManager.cpp
2015-10-29 10:56:01 -07:00
Brad Hefta-Gaub
3bbba99e2b
Merge pull request #6178 from samcake/color
...
Refactor the KeyLIght properties in their own group
2015-10-29 10:44:44 -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
Howard Stearns
4083c5c71b
Handle wrapping of very long-lived sessions.
2015-10-29 10:31:36 -07:00
Brad Davis
ccbae81dad
Merge branch 'master' into HEAD
...
Conflicts:
interface/src/avatar/SkeletonModel.cpp
2015-10-29 10:24:38 -07:00
Ryan Huffman
49877c2dff
Move _hasOutgoingChanges in onSubStep to previous location
2015-10-29 10:19:18 -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
Brad Hefta-Gaub
a3cd032a41
register/remove devices when the input plugins are activated/deactivated
2015-10-29 10:06:21 -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
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
d324771f6b
Merge pull request #6219 from howard-stearns/fix-avatar-draw-mesh-toggle
...
Fix Developer->Avatar->Draw Mesh
2015-10-28 23:16:51 -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
Howard Stearns
5b6a8eddf9
Merge pull request #6216 from hyperlogic/tony/bug-eyed-mery-fix
...
FBXReader: More deterministic loading behavior
2015-10-28 21:31:57 -07:00
Howard Stearns
8c395209e8
Fix Developer->Avatar->Draw Mesh
...
MyAvatar::setEnableMeshVisible -> Model::setVisibleInScene sets a flag that no one was looking at any more.
2015-10-28 21:23:35 -07:00
Anthony J. Thibault
5e73af9272
Rig: Removed dt from updateFromEyeParameters()
2015-10-28 18:10:41 -07:00
samcake
fd7582ad31
Merge branch 'master' of https://github.com/highfidelity/hifi into color
2015-10-28 17:58:04 -07:00
Anthony J. Thibault
7367f2a28c
FBXReader: remove debugging logs
2015-10-28 17:55:06 -07:00
Atlante45
136747929e
Fix typo
2015-10-28 17:11:46 -07:00
Anthony J. Thibault
5acb088c46
FBXReader: More deterministic loading behavior
...
This makes iteration over meshes and connections between them deterministic.
[QHash](http://doc.qt.io/qt-5/qhash.html#details ) and QMultiHash do not guarantee consistent iteration order.
This is problematic for the FBXReader because it could result in different behavior each time a model was loaded.
Specifically, This was causing a bug with some avatars that contained multiple-bind poses.
The bind pose returned to the application from the FBXReader would be different on different runs.
This PR doesn't add support for multiple-bind poses, but it does make the choice of which
bind pose is chosen deterministic.
This non-determinism was the cause of the Mery avatar having "bug-eyes" 1/12 times.
2015-10-28 16:57:27 -07:00
Atlante45
7695afec0a
Fix ScriptEngine crash
2015-10-28 16:43:41 -07:00
Howard Stearns
8e83943efd
Don't play other avatar's collision sounds.
...
https://app.asana.com/0/32622044445063/61104546898252
2015-10-28 15:43:36 -07:00
samcake
e4aab4bd97
Merge branch 'master' of https://github.com/highfidelity/hifi into color
2015-10-28 15:32:13 -07:00
Stephen Birarda
cee029f752
resolve conflicts on merge with upstream/master
2015-10-28 15:19:10 -07:00
Brad Hefta-Gaub
61e35d7ada
Merge pull request #6203 from sethalves/fix-action-crash
...
adjust locking in EntityItem::getActionDataInternal
2015-10-28 14:02:28 -07:00
Seth Alves
22d6b6df34
make withWriteLock and withTryWriteLock const
2015-10-28 13:49:52 -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
b90af1a1ce
Fixing typo and review comments
2015-10-28 13:21:45 -07:00
samcake
07c13f4d66
Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers
2015-10-28 12:54:46 -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
Brad Hefta-Gaub
457ec76d3d
CR feedback
2015-10-28 11:21:53 -07:00
Seth Alves
a1096510e8
put some useless consts back
2015-10-28 10:52:01 -07:00
Anthony J. Thibault
b3734b5ddb
Rig: removed redundant method updateEyeJoints()
...
Instead we call updateEyeJoint() twice, once for each eye.
2015-10-28 10:46:09 -07:00
Seth Alves
f6a0004f26
get rid of some useless consts
2015-10-28 10:45:24 -07:00
Seth Alves
08a0bf33a4
avoid unneeded read-lock if action-data was dirty
2015-10-28 09:55:55 -07:00
Seth Alves
d504f449e4
undo last commit -- avoid unneeded read-lock if action-data was dirty
2015-10-28 09:55:11 -07:00
Seth Alves
2b5b4f1118
avoid unneeded read-lock if action-data was dirty
2015-10-28 09:54:16 -07:00
Andrew Meadows
afec2a9771
fix whitespace
2015-10-28 09:42:55 -07:00
Brad Hefta-Gaub
30f7c44f61
emit hardwareChanged signal to scripts
2015-10-28 09:34:18 -07:00
samcake
57aa89d14f
Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers
2015-10-28 09:24:24 -07:00
samcake
37f967bc33
And adding the StateCOntroller class
2015-10-28 09:23:57 -07:00
samcake
92ca658aae
Trying to get a state controller to work
2015-10-28 09:23:20 -07:00
Seth Alves
f91dc93620
adjust locking in EntityItem::getActionDataInternal
2015-10-28 08:40:38 -07:00
Stephen Birarda
06897aa474
don't force parenting of AssetRequest/AssetUpload
2015-10-27 19:29:54 -07:00
Anthony J. Thibault
f9dc05c989
Rig::computeMotionAnimationState better filtering of small dt velocities.
...
Only update _lastVelocity when dt is sufficiently large.
2015-10-27 18:59:02 -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
b2a5452f87
Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers
2015-10-27 16:57:22 -07:00
samcake
6ec87086bc
Adding the state controller
2015-10-27 16:57:06 -07:00
Brad Hefta-Gaub
7f313e7f86
Merge branch 'controllers' of https://github.com/highfidelity/hifi into myAvatarPalmTweaks
2015-10-27 16:47:36 -07:00
Brad Hefta-Gaub
d86f1b50a7
more cleanup
2015-10-27 16:37:43 -07:00
Brad Davis
b8f189dea7
Fixing hydras
2015-10-27 16:37:16 -07:00
Brad Hefta-Gaub
19743c1f39
gak, build busters and more CR feedback
2015-10-27 16:16:03 -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
Ryan Huffman
779cadd5bd
Merge branch 'baseball' of github.com:Atlante45/hifi into baseball
2015-10-27 15:14:30 -07:00
Ryan Huffman
e5e6362729
Merge branch 'master' of https://github.com/highfidelity/hifi into baseball
2015-10-27 15:05:43 -07:00
Andrew Meadows
c9cd336400
fix for bad contacts after changing avatar models
2015-10-27 15:01:48 -07:00
Brad Hefta-Gaub
7000350317
Merge branch 'controllers' of https://github.com/highfidelity/hifi into myAvatarPalmTweaks
2015-10-27 14:57:35 -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
43aac813da
more prep for shifting avatar during HMD motion
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
Howard Stearns
9e223a9502
Merge branch 'master' of https://github.com/highfidelity/hifi into safe-avatar-list-access
2015-10-27 12:57:41 -07:00
Atlante45
c0138bd189
Rename check functions and make them static
2015-10-27 12:39:40 -07:00
Atlante45
7986b618bc
Merge branch 'physics-substep-fix' of github.com:huffman/hifi into baseball
2015-10-27 12:32:19 -07:00
Atlante45
ffe73348fb
Move check functions to cpp only
2015-10-27 12:11:27 -07:00
Atlante45
a53a576aa3
checkExceptions after testing entity scripts in the sandbox
2015-10-27 12:11:27 -07:00
Atlante45
ea56f965a4
Lambda conversion fix for windows
2015-10-27 12:11:27 -07:00
Atlante45
3e43a3c345
Some more script checks
2015-10-27 12:11:27 -07:00
Atlante45
13b7fa6b5d
Typo
2015-10-27 12:11:27 -07:00
Atlante45
c8c9118d4d
Improve script engine error logging + some cleanup
2015-10-27 12:11:27 -07:00
Atlante45
3742c169b5
Make handler generators more readable
2015-10-27 12:11:27 -07:00
Atlante45
e04d9de4a4
Merge branch 'baseball' of github.com:birarda/hifi into baseball
2015-10-27 10:28:10 -07:00
Atlante45
5f8c3a6b4b
Fix AssetResourceRequest crash
2015-10-27 10:27:37 -07:00
Seth Alves
4c64da9ce5
try to avoid negative roll-over when moving to or from server time
2015-10-27 10:27:32 -07:00
Ryan Huffman
b75ad7f254
Merge branch 'physics-substep-fix' into baseball
2015-10-27 10:25:40 -07:00
Ryan Huffman
e24ba3da96
Merge branch 'physics-ccd' into baseball
2015-10-27 10:25:34 -07:00
samcake
a0104884f5
Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers
2015-10-27 09:59:48 -07:00
samcake
87cf3b237b
Supporting a InHMD action and using it to enable COmfort mode
2015-10-27 09:59:22 -07:00
Brad Davis
ef2d71e576
Merge remote-tracking branch 'upstream/master' into HEAD
...
Conflicts:
libraries/input-plugins/src/input-plugins/SixenseManager.cpp
2015-10-27 09:41:58 -07:00
black plastick
d34fc35544
added AvatarList.avatarSessionChanged(sessionUUID, oldUUID) for AC scripts.
2015-10-27 08:11:20 -04:00
howard-stearns
cbade6a095
Do not shut down hydra when it says there are no devices. Count to
...
allowedHydraFailures in settings.
2015-10-26 19:27:22 -07:00
Anthony J. Thibault
485e36d824
Bug fix for hand IK when using the Owen avatar.
...
The IK was assiming that the "Hips" bone index was always 0.
This was not the case for Owen. Now we lookup the Hips index
and cache it for use during the hipsOffset computation.
2015-10-26 17:17:46 -07:00
Brad Hefta-Gaub
55d0b8a99e
Merge pull request #6181 from jherico/capi
...
Remove new/old value division from endpoint::apply
2015-10-26 14:58:11 -07:00
black plastick
f5d12ee2c6
Added AvatarList script events for assigment client scripts:
...
AvatarList.avatarAddedEvent(sessionUUID);
AvatarList.avatarRemovedEvent(sessionUUID);
2015-10-26 17:46:08 -04:00
Atlante45
2f50652544
Merge branch 'script-engine' into baseball
2015-10-26 14:17:40 -07:00
Seth Alves
0dff037f56
fuck you, const!
2015-10-26 13:55:07 -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
Brad Davis
b2c3311947
Merge pull request #6174 from samcake/controllers
...
Controllers : Adding a moving average for the velocity field returned by the Hydra controller
2015-10-26 13:46:32 -07:00
samcake
990764d855
Really fixing the MovingAverage class...
2015-10-26 13:29:13 -07:00
Atlante45
c5c74fcc37
Merge branch 'physics-ccd' of github.com:huffman/hifi into baseball
2015-10-26 13:08:53 -07:00
Ryan Huffman
913026280c
Fix EntityTreeRenderer dropping contact end events
2015-10-26 13:02:39 -07:00
Ryan Huffman
837430329b
Fix collision start/end in single physics simulation to be lost
2015-10-26 13:02:17 -07:00
Atlante45
380139364c
checkExceptions after testing entity scripts in the sandbox
2015-10-26 12:41:49 -07:00
Atlante45
1c048880ee
Lambda conversion fix for windows
2015-10-26 12:27:48 -07:00
samcake
8e2c269cc0
doing the correct conversion for byte to normalize float...
2015-10-26 12:24:20 -07:00
Stephen Birarda
a4ddb7a1e4
change downloaded to ready to avoid collision
2015-10-26 12:14:12 -07:00
Stephen Birarda
61ad91aba6
hook Sound downloaded to start playback
2015-10-26 12:09:48 -07:00
Atlante45
8d72fcada5
Some more script checks
2015-10-26 11:33:13 -07:00
samcake
a8872d065b
MOve the movingAverage class to shared next to SimpleMovingAverage
2015-10-26 11:23:13 -07:00
Brad Davis
691e5f3be0
Remove new/old value division from endpoint::apply
2015-10-26 11:22:25 -07:00
samcake
ff57b73bd6
Creating the COlorUTils in shared to deal with all the standard color conversions
2015-10-26 10:53:21 -07:00
Brad Hefta-Gaub
88ba6cda24
Merge pull request #6177 from jherico/guns
...
Controller Branch - Fix gun.js
2015-10-26 10:51:08 -07:00
Atlante45
9771361840
Typo
2015-10-26 10:49:41 -07:00
Brad Davis
f38303a9a5
Adding vive default mapping
2015-10-26 10:36:31 -07:00
samcake
ca30ce1ff0
Move the keyLIght properties in their own group and add the ambientURL in
2015-10-26 10:08:16 -07:00
Howard Stearns
4b4907c9ef
Allow multiple scripts to register, and allow them to specify the specific anim vars they are interested in.
2015-10-26 10:04:55 -07:00
samcake
bc7ad9d3f7
Move the keyLIght properties in their own group and add the ambientURL in
2015-10-26 09:27:06 -07:00
Brad Davis
75b2ee94b2
PR feedback
2015-10-25 19:37:41 -07:00
Brad Davis
a7547ef11e
Adding hysteresis filter, moving filters to individual files
2015-10-25 16:44:43 -07:00
Brad Davis
5bc736952a
Function based endpoints should inhibit spamming with repeats of the same value
2015-10-24 16:26:29 -07:00
Howard Stearns
e11b0add9a
Update safety trampoline with correct arguments.
2015-10-24 15:29:49 -07:00
Anthony J. Thibault
06de087802
Filter out velocities computed from position delta if dt is small
...
While in the HMD, updates can occur with very small deltaTime values.
These this makes the position delta method of computing a velocity very
susceptible to noise and precision errors.
2015-10-23 18:27:20 -07:00
samcake
eae316100a
Merge branch 'controllers' of https://github.com/highfidelity/hifi into controllers
2015-10-23 18:18:27 -07:00
samcake
42ac8c5769
Stariting to reorganize the keyLight porperties of the Zone Entity
2015-10-23 18:15:19 -07:00
samcake
d400c694f6
Cleaning up for release
2015-10-23 18:09:54 -07:00
samcake
be843a0035
adding a rnning average on the velocity values returned by the hydra and adding a simple js to test
2015-10-23 17:32:54 -07:00
Brad Davis
4e6f64833f
Conditional support from JS
2015-10-23 17:24:04 -07:00
