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 |
|
ZappoMan
|
bdfbc13185
|
add support for hand rotations to the kinect plugin, add notes on mapping from kinect orientations to our frame orientations
|
2017-03-28 15:09:03 -07:00 |
|
Brad Hefta-Gaub
|
692dc75977
|
Merge pull request #10025 from ZappoMan/improvedKinectCmake
add the default environment variable name for the kinect plugin to the search hints
|
2017-03-28 15:07:56 -07:00 |
|
Dante Ruiz
|
a76e5ef8d9
|
improve the design of the tablet goto
|
2017-03-28 23:02:23 +01:00 |
|
samcake
|
a1bf1beab4
|
Merge pull request #10014 from samcake/blue
Fixing the roughness/reflection quantization bug
|
2017-03-28 14:50:24 -07:00 |
|
Seth Alves
|
4516ddf855
|
Merge pull request #9847 from highfidelity/tablet-ui
Tablet ui
|
2017-03-28 14:48:02 -07:00 |
|
samcake
|
a2b2e3e169
|
Revert "Revert "Don't hold KTX files open for longer than transfers require""
|
2017-03-28 14:45:04 -07:00 |
|
samcake
|
78cab8ed5c
|
Merge pull request #10036 from highfidelity/revert-10020-ktx_refactor
Revert "Don't hold KTX files open for longer than transfers require"
|
2017-03-28 14:06:37 -07:00 |
|
samcake
|
08e1a2ba4c
|
Revert "Don't hold KTX files open for longer than transfers require"
|
2017-03-28 14:06:09 -07:00 |
|
samcake
|
e42cb52bd1
|
Merge pull request #10020 from jherico/ktx_refactor
Don't hold KTX files open for longer than transfers require
|
2017-03-28 14:06:02 -07:00 |
|
Andrew Meadows
|
49b3fc8674
|
Merge pull request #10015 from sethalves/model-scripting-2
model/mesh scripting
|
2017-03-28 12:53:16 -07:00 |
|
Andrew Meadows
|
b9e80d3fa5
|
Merge pull request #9972 from kunalgosar/marketsBug
Fixed buttons on Marketplace
|
2017-03-28 12:45:25 -07:00 |
|
Andrew Meadows
|
e22d825d07
|
Merge pull request #9989 from birarda/bullet-rel-with-debug
fix fresh MinSizeRel and RelWithDebugInfo builds
|
2017-03-28 12:35:24 -07:00 |
|
Zach Pomerantz
|
06bf5807ae
|
fix audio setting persistence for already selected device
|
2017-03-28 15:34:42 -04:00 |
|
Zach Pomerantz
|
5e0cfb6137
|
short-circuit audio switching on missing device
|
2017-03-28 15:34:13 -04:00 |
|
Zach Pomerantz
|
1bdef141c3
|
simplify audio menu parsing
|
2017-03-28 15:33:54 -04:00 |
|
Seth Alves
|
45e83906e7
|
Merge pull request #10035 from sethalves/tablet-ui
Tablet ui - merge from upstream
|
2017-03-28 11:42:55 -07:00 |
|
Seth Alves
|
6df4dda746
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
|
2017-03-28 11:42:14 -07:00 |
|
Seth Alves
|
8e38b41e44
|
Merge branch 'tablet-ui' of github.com:sethalves/hifi into tablet-ui
|
2017-03-28 11:41:58 -07:00 |
|
Seth Alves
|
851ea7dabc
|
fix initial finger/stylus setting
|
2017-03-28 11:41:51 -07:00 |
|