Commit graph

301 commits

Author SHA1 Message Date
Seth Alves
a259d00b63 Merge pull request #10332 from sethalves/bullet-constraints-5
Bullet constraints
2017-05-03 16:30:34 -07:00
Seth Alves
cc586b7c6d make ragdoll test honor lifetime from UI 2017-05-02 14:12:55 -07:00
Anshuman Dewangan
a22be93d69 Move old recorder.js script to script-archive 2017-05-02 12:15:06 -07:00
Seth Alves
45a50f9a46 Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-5 2017-05-01 15:32:29 -07:00
Seth Alves
1b67a8b251 cleanups 2017-04-30 12:23:34 -07:00
Seth Alves
41663c58b8 test app for bullet dynamics 2017-04-30 12:09:37 -07:00
Anthony J. Thibault
f3cc1c2d86 Added hipsContorllerTest.js for QA Testing 2017-04-28 11:30:06 -07:00
Anthony J. Thibault
b80270400f Merge branch 'master' into feature/hips-ik-target 2017-04-27 18:15:12 -07:00
Anthony J. Thibault
2120e63e3a Merge branch 'master' into feature/head-standard-action 2017-04-27 17:51:13 -07:00
Anthony J. Thibault
764f6c69ea Head input action will override the HMD for IK. 2017-04-27 17:39:25 -07:00
Dante Ruiz
79d827c6be added requested features 2017-04-26 16:52:51 +01:00
Anthony J. Thibault
1b9e609447 viveMotionCapture.js: updated to route pucks through input system
Removed use of animationStateHandler() to set IK targets.
2017-04-25 17:23:15 -07:00
Anthony J. Thibault
1931a8d1f6 viveMotionCapture.js: can now disable puck control, with a second controller squeeze 2017-04-25 15:13:23 -07:00
Anthony J. Thibault
ce8b71ff94 viveMotionCapture.js: can now disable puck control, with a second controller squeeze 2017-04-25 15:07:16 -07:00
Dante Ruiz
8c020a0ec2 saving work 2017-04-25 18:01:19 +01:00
Anthony J. Thibault
8b16a7c7e1 Added hipsIkTest.js test script 2017-04-24 16:40:24 -07:00
Dante Ruiz
b023356fb7 added javascript file 2017-04-24 22:29:13 +01:00
Anthony J. Thibault
d3b4a2c08d better "auto" configuration 2017-04-14 17:00:47 -07:00
Anthony J. Thibault
0ebaba7cf8 Now supports sensorConfig with hips and chest sensors 2017-04-14 17:00:46 -07:00
Anthony J. Thibault
adaf7dda7c Check in viveMotionCapture test script. 2017-04-14 17:00:45 -07:00
Sam Gateau
3519a72f8a Merge pull request #10190 from samcake/ambient-bis
Introducing a tool to debug the current Zone Stack
2017-04-14 13:28:59 -07:00
Thijs Wenker
6f58e91d76 Merge pull request #10121 from birarda/bug/recording-cache
cleanup Agent RSI handling, make loadRecording async
2017-04-14 21:35:51 +02:00
Stephen Birarda
7b48feca66 address code review comments 2017-04-14 11:53:53 -07:00
samcake
4a47737d0b REfining the Config behavior, trying to pr next 2017-04-10 19:01:49 -07:00
Sam Cake
b65448bcbe Trying to improve the Job/Task classes and testing it with the ZoneRenderer 2017-04-09 11:08:35 -07:00
samcake
f82310545c Revert "Revert "Fixing the rendering bug triggered with Nvidia driver 381.65"" 2017-04-07 02:03:58 -07:00
samcake
ab3d39951e Revert "Fixing the rendering bug triggered with Nvidia driver 381.65" 2017-04-07 02:03:31 -07:00
Sam Cake
b1a4bc329b Introducing a fix to the graphics bug 2017-04-07 01:10:18 -07:00
Sam Cake
da1355dc32 Introducing a fix to the graphics bug 2017-04-07 01:03:07 -07:00
Seth Alves
3c6429cdf3 Merge pull request #10103 from vladest/master-qml-bugfixes
Master qml bugfixes
2017-04-06 14:22:06 -07:00
Anthony Thibault
be2fdd9388 Merge pull request #10063 from hyperlogic/feature/vive-tracked-objects
Vive: Expose all 16 tracked poses to the controller system
2017-04-05 16:53:47 -07:00
Stephen Birarda
1b24538756 modify scripts to use new recording API 2017-04-05 11:18:52 -07:00
Seth Alves
b0b214012c Merge pull request #10118 from hyperlogic/bug-fix/tablet-restart-scripts
Fix broken eventBridge on tablet after Reload All Scripts.
2017-04-04 10:45:08 -07:00
Vladyslav Stelmakhovskyi
aa487faad1 Fixed No such signal QmlWindow_QMLTYPE_490::resized(QSizeF) and No such signal QmlWindow_QMLTYPE_490::moved(QVector2D) warnings 2017-04-04 16:59:09 +02:00
Seth Alves
d1827cf12c Merge pull request #10002 from fayeli/tablet-photobooth
Photobooth Improvements: Using Tablet & Ability to Rotate Model
2017-04-03 16:05:13 -07:00
Anthony J. Thibault
8ff457a1b6 Fix broken eventBridge on tablet after Reload All Scripts.
The main issue here was the "webEventReceived" connection between the OffscreenQMLSurface and the TabletProxy object.
For whatever reason, if this is not a direct Signal to Slot connection, the webEventReceived event does not propagate.
2017-04-03 16:03:55 -07:00
Faye Li
2ca4203d85 fix for submerge in floor issue 2017-04-03 12:57:51 -07:00
Faye Li
d726bd352d fix for locked camera state issue 2017-04-03 12:14:29 -07:00
Anthony J. Thibault
0e63f97f77 Test script that displays tracking data from Vive.TrackedObjects 2017-03-29 18:17:32 -07:00
samcake
a03d3a1ca8 Clean up the utilities scrips of the render folder 2017-03-28 16:00:18 -07:00
Seth Alves
9e675d4c93 Merge pull request #9990 from hyperlogic/bug-fix/sliders
Added inputMode property to Web3DOverlay
2017-03-28 10:07:37 -07:00
Seth Alves
f1470e34f9 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-03-24 15:17:52 -07:00
Faye Li
8cb771d9a8 fix conflict 2017-03-24 14:46:24 -07:00
Faye Li
405be471c3 button state change 2017-03-24 13:47:19 -07:00
Brad Hefta-Gaub
9b26e8ee95 Merge pull request #9871 from Triplelexx/21208
21208 - Muted microphone indicator
2017-03-24 13:07:43 -07:00
Faye Li
ccd4fdb540 naming 2017-03-24 10:46:52 -07:00
Faye Li
067faad9cd Fix careless math mistake 2017-03-24 10:22:08 -07:00
Seth Alves
902e3d41d6 merge from upstream 2017-03-24 08:20:35 -07:00
Brad Hefta-Gaub
9a38b36f59 Merge pull request #9970 from Triplelexx/21223
21223 - Quat functions have naming inconsistencies
2017-03-24 08:12:11 -07:00
Anthony J. Thibault
bab9890fea Added inputMode property to Web3DOverlay.
This allows user to switch between Touch messages and Mouse messages.
Added a sliderTestMain.js script which demonstrates this behavior.
2017-03-23 13:54:18 -07:00