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 |
|
David Kelly
|
4b40633104
|
oops damn space
|
2017-03-28 11:22:18 -07:00 |
|
Clément Brisset
|
82114ae6ab
|
Merge pull request #9940 from Atlante45/fix/sit
Fix a few sitting bugs noticed at the meetup
|
2017-03-28 11:14:31 -07:00 |
|
Seth Alves
|
1cf6945bf2
|
pass radials argument to AABox::touchesAAEllipsoid as const reference
|
2017-03-28 11:12:00 -07:00 |
|
Seth Alves
|
9789476a73
|
handle case where AAEllipsoid is entirely inside the AABox
|
2017-03-28 10:57:03 -07:00 |
|
Seth Alves
|
6f6343420c
|
don't crash if entity dimensions somehow include a zero
|
2017-03-28 10:56:33 -07:00 |
|
Seth Alves
|
54a843ee90
|
Merge pull request #10033 from druiz17/tablet-help-script
Remove help button from the tablet when reloading scripts
|
2017-03-28 10:19:14 -07:00 |
|
Seth Alves
|
7641677902
|
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2
|
2017-03-28 10:14:49 -07:00 |
|
Dante Ruiz
|
e276bb52d2
|
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-help-script
|
2017-03-28 18:14:28 +01:00 |
|
Dante Ruiz
|
b0e437cc5a
|
remove help button from tablet when reloading scripts
|
2017-03-28 18:14:05 +01:00 |
|
Seth Alves
|
39ec53d69a
|
Merge pull request #10032 from hyperlogic/bug-fix/null-tablet-proxy
Mark the system TabletProxy object as Cpp ownership.
|
2017-03-28 10:08:05 -07:00 |
|
Seth Alves
|
0cae616ab5
|
Merge pull request #10031 from hyperlogic/bug-fix/mouse-disconnect-issue
WebTablet.js: Don't remove or add mouse callbacks onHMDChanged
|
2017-03-28 10:07:52 -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 |
|
Bradley Austin Davis
|
9fc9253eeb
|
Fixing warnings
|
2017-03-28 09:54:18 -07:00 |
|
Anthony J. Thibault
|
ec6ef01600
|
Mark the system TabletProxy object as Cpp ownership.
This should prevent the problem where the QML engine erroneously thinks the QObject has been collected/destroyed.
|
2017-03-28 09:53:00 -07:00 |
|
Ryan Huffman
|
aa8d231e82
|
Remove extra setting of AnimationCache in Agent
|
2017-03-28 09:35:15 -07:00 |
|
Anthony J. Thibault
|
29a159b90d
|
WebTablet.js: Don't remove or add mouse callbacks onHMDChanged
This should prevent the exception on destroy, caused by disconnecting a signal that is not attached.
|
2017-03-28 09:27:13 -07:00 |
|
David Kelly
|
e119c38748
|
bad serialization of parentID
|
2017-03-28 09:26:40 -07:00 |
|
David Kelly
|
92718b6051
|
cr feedback
|
2017-03-28 08:57:27 -07:00 |
|
Andrew Meadows
|
60b8dbfce1
|
Merge pull request #10026 from AndrewMeadows/cleanup-fbx
reduce memory bandwitdh to GPU for skinned meshes
|
2017-03-28 08:55:06 -07:00 |
|
Seth Alves
|
dd6e4ed5d8
|
Merge pull request #10030 from sethalves/tablet-ui
Tablet ui - merge from upstream
|
2017-03-28 08:17:40 -07:00 |
|
Seth Alves
|
b50a02ea19
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
|
2017-03-28 08:16:59 -07:00 |
|
Seth Alves
|
fa0e2a69a6
|
Merge pull request #10029 from ctrlaltdavid/21238-b
Snapshot dialog into tablet
|
2017-03-28 08:16:42 -07:00 |
|
Seth Alves
|
79fbbdf470
|
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2
|
2017-03-28 07:53:44 -07:00 |
|
Seth Alves
|
651d87dc2a
|
move Qt-related stuff out of model and into model-networking
|
2017-03-28 07:53:25 -07:00 |
|
Chris Collins
|
83aa7358e2
|
Merge pull request #9998 from birarda/bug/oculus-buttons-flipped
fix swapped buttons in oculus touch graphic
|
2017-03-28 06:50:20 -07:00 |
|
Seth Alves
|
8da91695df
|
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2
|
2017-03-27 20:15:54 -07:00 |
|
David Rowe
|
6a3dea030e
|
Settings link
|
2017-03-28 15:15:33 +13:00 |
|
David Rowe
|
55033df354
|
Merge branch 'tablet-ui' into 21238-b
|
2017-03-28 14:47:57 +13:00 |
|