Commit graph

53206 commits

Author SHA1 Message Date
Zach Pomerantz
c30ab4de8b rm extra setDevice 2017-03-29 18:48:22 -04:00
Zach Fox
a6ff3fcdb7 Tablet PAL bugfix; Connections help text v1 2017-03-29 15:47:19 -07:00
Chris Collins
bf73183e79 Merge pull request #10057 from huffman/limitless-stable
Beta Release 36 - Adding support for Limitless VR Interactive Character platform
2017-03-29 15:40:16 -07:00
Zach Fox
1b74576259 Fix tablet-close behavior for PAL; remove users-tablet.js 2017-03-29 14:53:45 -07:00
ZappoMan
047a3b8d71 add debugging 2017-03-29 14:51:42 -07:00
ZappoMan
a4d1db1aeb tweak 2017-03-29 14:40:47 -07:00
ZappoMan
4ed5219b57 add a sample script to drive feet 2017-03-29 14:36:27 -07:00
Seth Alves
ce9eb1a377 more tablet landscape changes 2017-03-29 14:21:38 -07:00
Seth Alves
371df35013 remove code related to tablet being a model rather than an overlay. start on landscape mode 2017-03-29 14:16:14 -07:00
Anthony J. Thibault
332dfa098f Fix for disappearing toolbar after reload all scripts 2017-03-29 14:10:26 -07:00
ZappoMan
6f2f80e334 make sure kinect plugin debugging setting is actually saved and loaded 2017-03-29 14:06:11 -07:00
Delamare2112
3ebe1a0015 Add AvatarInputs::loudnessToAudioLevel 2017-03-29 14:01:27 -07:00
Howard Stearns
b8f557ca54 Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into pal-backend-integration 2017-03-29 13:30:15 -07:00
Howard Stearns
53d484c318 makes connections! 2017-03-29 13:23:31 -07:00
Delamare2112
2f6add3398 Expose LimitlessSpeechRecognition to scripts 2017-03-29 12:56:08 -07:00
Delamare2112
db11c40a08 Add AnimationCache to Agent 2017-03-29 12:54:25 -07:00
Delamare2112
4f7cbd5b7c Add limitless connection and scripting interface 2017-03-29 12:47:58 -07:00
Howard Stearns
b0c97d3a82 putative connection integration for 2-machine testing 2017-03-29 12:22:26 -07:00
samcake
60208bca69 Merge branch 'master' of https://github.com/highfidelity/hifi into ambient 2017-03-29 10:58:05 -07:00
samcake
9bc7e41642 Remove extra calls for binding default textures, not needed 2017-03-29 10:57:08 -07:00
trent
ba9aa753f0 Merge branch 'master' of https://github.com/highfidelity/hifi into 21240 2017-03-29 13:41:48 -04:00
Andrew Meadows
985924a476 Merge pull request #10040 from ZappoMan/addKinectHandRotation
add support for hand rotations to the kinect plugin
2017-03-29 10:25:04 -07:00
Seth Alves
63ccaee129 Merge pull request #10048 from ctrlaltdavid/open-feed-in-tablet
Open feed in tablet after sharing snapshot from tablet
2017-03-29 10:08:51 -07:00
samcake
8fd413e7c3 Merge pull request #10037 from highfidelity/revert-10036-revert-10020-ktx_refactor
Don't hold KTX files open for longer than transfers require
2017-03-29 10:02:33 -07:00
Andrew Meadows
b69073a872 Merge pull request #10042 from samcake/blue
Clean up the utilities scrips of the render folder
2017-03-29 08:39:21 -07:00
Vladyslav Stelmakhovskyi
209de29b2a Intial commit. Basically works. Need some testing 2017-03-29 17:36:05 +02:00
Vladyslav Stelmakhovskyi
9822193644 Set z-order of comboboxes to make sure lowest will no overlap higher ones 2017-03-29 14:41:18 +02:00
Andrew Meadows
c5eb2e0642 restore spelling in comment 2017-03-28 21:11:32 -07:00
Andrew Meadows
7100f44927 refresh AvatarData when receiving identity data 2017-03-28 21:03:01 -07:00
Andrew Meadows
2777ad0397 fix comments 2017-03-28 21:02:49 -07:00
David Rowe
c618e8e001 Open feed in tablet after sharing snapshot from tablet 2017-03-29 16:52:52 +13:00
Anthony Thibault
069ebaedf0 Merge pull request #10021 from huffman/fix/agent-animation-cache
Add AnimationCache to agent scripts
2017-03-28 20:15:21 -07:00
ZappoMan
9d3e8818f7 fix build 2017-03-28 18:49:36 -07:00
ZappoMan
80fb7bc287 add extra debugging to the kinect plugin 2017-03-28 18:42:15 -07:00
ZappoMan
a659b73edf Merge branch 'master' of https://github.com/highfidelity/hifi into addKinectHandRotation 2017-03-28 18:36:42 -07:00
Howard Stearns
c795d2ca3b Four-way discoverability. (Needs testing.) 2017-03-28 18:31:08 -07:00
Anthony Thibault
aea5cf0ac0 Merge pull request #10045 from hyperlogic/feature/ac-avatar-translation
Added translation support to AC avatar animations.
2017-03-28 18:09:26 -07:00
Zach Fox
b776f25b3b Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-28 18:09:17 -07:00
Zach Fox
81264c998b Revert "Merge from upstream/master"
This reverts commit b5ba4a109d.
2017-03-28 17:39:45 -07:00
Zach Fox
b5ba4a109d Merge from upstream/master 2017-03-28 17:37:34 -07:00
Anthony J. Thibault
e100e3d19b made UNIT_SCALE const 2017-03-28 17:34:15 -07:00
Anthony J. Thibault
ecc31802b8 Added translation support to AC avatar animations. 2017-03-28 17:23:36 -07:00
Seth Alves
8dcbf33e16 Merge pull request #10041 from druiz17/tablet-improve-goto
added left out design elements to the tablet goto page
2017-03-28 17:19:50 -07:00
Seth Alves
22a6e669b4 Merge pull request #10043 from sethalves/fix-polyvox-shader
fix polyvox shader
2017-03-28 16:45:42 -07:00
Seth Alves
6080c4782a fix polyvox shader 2017-03-28 16:44:31 -07:00
howard-stearns
c2a49a582e send credentials to local metaverse servers, and initial users data
integration.
2017-03-28 16:44:16 -07:00
samcake
a03d3a1ca8 Clean up the utilities scrips of the render folder 2017-03-28 16:00:18 -07:00
trent
ada7664749 Merge branch 'master' of https://github.com/highfidelity/hifi into origin/21240 2017-03-28 18:43:30 -04:00
howard-stearns
37ab0b57a7 Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into pal-backend-integration 2017-03-28 15:41:46 -07:00
trent
2d0fac794e Committing this work-in-progress loader as an example of how not to do this. 2017-03-28 18:41:38 -04:00