Sam Cake
189ad9c706
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-06-20 22:42:40 -07:00
samcake
d853a76376
Fixing the scripts and investigating the scripting
2017-06-20 17:23:44 -07:00
Anthony J. Thibault
b78e278102
adjusted print statements
2017-06-20 17:19:57 -07:00
Anthony J. Thibault
e84d0358cc
updated images
2017-06-20 17:18:35 -07:00
Anthony J. Thibault
287dc3e1b8
updated license and button name
2017-06-20 17:10:53 -07:00
Anthony J. Thibault
cd1beceb75
Added script that will attach an entity to a vive sensor.
2017-06-20 17:02:50 -07:00
Brad Hefta-Gaub
cbded766b1
Merge pull request #10676 from NeetBhagat/21369
...
WL 21369 - Implement parts of the JS "console" object
2017-06-20 11:06:34 -07:00
Sam Cake
5b6f6ab84f
Trying to fix the getCOnfig from QML...
2017-06-20 00:25:51 -07:00
samcake
ba9dbbb4d4
Fix the local lights issue, and correct the script relying on the Render.getConfig(), this one is on me...
2017-06-19 17:34:50 -07:00
Olivier Prat
21276a85ad
Merge branch 'master' of git://github.com/highfidelity/hifi into 21378
2017-06-19 18:20:03 +02:00
NeetBhagat
2909aa9ac8
Resolve comments of @zappoman.
...
-- Rename "asserts" to "assert"
-- Log printing methods will accept lists of objects or strings.
2017-06-17 01:00:32 +05:30
NeetBhagat
a6b1b17d45
Merge branch 'master' into 21369
2017-06-15 11:04:22 +05:30
David Rowe
16bebdd409
Rename identifiers
2017-06-15 09:20:55 +12:00
David Rowe
e3b4e4aa20
Disable print statements
2017-06-14 15:37:36 +12:00
David Rowe
395d40f0f9
Fix script default to match C++ default
2017-06-14 12:21:19 +12:00
David Rowe
05f19d54f4
Add HMD roll control JavaScript API
2017-06-14 11:55:04 +12:00
NeetBhagat
9646eba873
Complete console.trace and added a testcases for all 13 functions.
2017-06-13 23:52:48 +05:30
Olivier Prat
ace301945c
Added scale and duration debug parameters in debugFade.qml
2017-06-13 15:31:04 +02:00
Olivier Prat
24d45e0f5b
Updated from upstream master because of change of protocol
2017-06-13 10:43:25 +02:00
NeetBhagat
b0e9c62c12
Merge branch 'master' of https://github.com/highfidelity/hifi into 21369
2017-06-13 10:10:44 +05:30
Andrew Meadows
321e307c9f
Merge pull request #10609 from 1P-Cusack/21317
...
WL21317 helper functions for getting into avatar coordinate space
2017-06-12 11:18:29 -07:00
Chris Howe
08d93173f0
Minor code feedback changes, moving test scripts to developer/tests.
2017-06-09 11:07:56 -04:00
NeetBhagat
ead0d42cf3
Merge branch 'master' into 21369
...
# Conflicts:
# libraries/gl/src/gl/OffscreenQmlSurface.cpp
# libraries/gl/src/gl/OffscreenQmlSurface.h
2017-06-07 15:47:19 +05:30
NeetBhagat
904e25c9e3
intial commit #21369 Working on clear method of console
2017-06-07 14:37:18 +05:30
Olivier Prat
8af2f75996
Added FadeManager to centralize some common fade effect data and functions
2017-06-06 16:11:12 +02:00
NeetBhagat
0f9cd5d0c7
intial commit hifi: #21369 Implement parts of the JS "console" object
2017-06-06 15:20:08 +05:30
Olivier Prat
1936c209a5
Working fade debugging scripts for both opaque and transparents
2017-06-05 17:21:33 +02:00
Olivier Prat
08fcd6c357
Added new shaders
2017-06-05 16:32:36 +02:00
Olivier Prat
1433ae4b34
Merged from 21274
2017-06-05 11:12:57 +02:00
samcake
882df7391b
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-26 16:47:49 -07:00
Stephen Birarda
6c2758e4ea
fix reference to pending transfer count for progress/stats
2017-05-26 14:37:24 -07:00
Sam Cake
3eb95d2d19
cleaning the commented code
2017-05-25 01:16:45 -07:00
samcake
044110e4f3
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-24 15:40:40 -07:00
samcake
653abf0ee3
brining the new counters to 4.1
2017-05-22 17:34:06 -07:00
samcake
e0487f7e04
Solving the size evaluation for compressed format
2017-05-22 16:51:54 -07:00
samcake
e4f9f2935e
Solving the size evaluation for compressed format
2017-05-22 15:42:18 -07:00
Sam Cake
1f090d8148
Debugging the size problem and fixing the compression size evaluation
2017-05-22 01:00:34 -07:00
samcake
c449229850
Cleaned up the counters for memory
2017-05-19 17:52:56 -07:00
Sam Gateau
d9ad45bf4a
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-18 09:37:04 -07:00
samcake
2c6e10fbe1
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-05-18 09:21:02 -07:00
samcake
80b6fd65ae
Cleaning up counters and naming schemes...
2017-05-17 18:31:28 -07:00
samcake
b19b0007c8
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
2017-05-17 13:02:37 -07:00
Seth Alves
3570bd905e
update for spring to tractor name-change
2017-05-17 11:55:23 -07:00
Seth Alves
8a88b30da7
Merge pull request #10468 from AndrewMeadows/cleanup-actions
...
cleanup Actions and Constraints part-1
2017-05-17 11:33:53 -07:00
Sam Gateau
0f250e693d
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-17 09:49:20 -07:00
samcake
b466964817
REvisiting the stats counter for the gpu context in the hope of better understanding the gpu texture streaming behavior
2017-05-16 18:21:24 -07:00
Andrew Meadows
d705f529a0
use 'tractor' instead of 'spring' in JS files
2017-05-16 08:35:54 -07:00
ZappoMan
9c81a89ac3
add test script
2017-05-14 08:37:26 -07:00
Sam Gateau
ff3cf7801a
Merge branch 'master' into 21274
2017-05-09 11:48:57 -07:00
samcake
c36035d3eb
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-05-09 10:46:38 -07:00
Chris Collins
4bfb23b5d2
Merge pull request #10388 from humbletim/21308
...
CR #21308 Fix Script.print
2017-05-08 10:46:49 -07:00
Chris Collins
d88d52cd2e
Merge pull request #9735 from humbletim/21190-fix-unit-tests
...
CR 21190 unit_tests: add support for jasmine.done() and pending
2017-05-08 09:19:01 -07:00
samcake
df2c5b8c23
adding the notification for keyLight changes modifying the KeyLIghtPayoad
2017-05-04 18:28:12 -07:00
samcake
64317f5fd0
Adding a light item per zone
2017-05-04 16:47:03 -07:00
humbletim
f9d29256e0
use an actual Uuid value for the Uuid.print test
2017-05-04 18:58:30 -04:00
humbletim
f71552c648
* update Vec3.print, Quat.print, Mat4.print, ScriptUUID.print to work with JSConsole and HMD-friendly script log
...
* add test output for Quat-euler and Mat4-row/col prints
2017-05-04 18:33:49 -04:00
humbletim
deeb9c367a
update test to reflect support for scriptWarningMessage and scriptInfoMessage
2017-05-04 17:46:28 -04:00
humbletim
8cea7f6a62
add test for print/Script.print behavior
2017-05-04 16:54:16 -04:00
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
Olivier Prat
111f0762ea
Added debug scripts and fade position is now stable
2017-04-30 14:42:27 +02: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
humbletim
4c0f6a65b4
Merge branch 'master' into 21190-fix-unit-tests
2017-04-10 14:15:47 -04: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
