Dante Ruiz
b6901bba3e
added tabletWebView.qml
2017-03-31 18:48:08 +01:00
Dante Ruiz
8f402c73b0
saving work 2.0
2017-03-31 01:18:31 +01:00
Dante Ruiz
cb8660c699
saving work
2017-03-30 01:34:14 +01: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
Dante Ruiz
a76e5ef8d9
improve the design of the tablet goto
2017-03-28 23:02:23 +01: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
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
9e675d4c93
Merge pull request #9990 from hyperlogic/bug-fix/sliders
...
Added inputMode property to Web3DOverlay
2017-03-28 10:07:37 -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
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
b50a02ea19
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-28 08:16:59 -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
c013813161
Merge pull request #10027 from druiz17/tablet-disable-vto
...
Remove visibleToOthers option for the tablet from general settings
2017-03-27 16:28:23 -07:00
Dante Ruiz
65be71fa69
min diff
2017-03-28 00:05:02 +01:00
Dante Ruiz
7434cc5644
force vto to false on start up
2017-03-28 00:02:02 +01:00
Dante Ruiz
02535722ba
removed visible to others opition from general settings
2017-03-27 23:31:41 +01:00
Dante Ruiz
018138f422
fixed some issues with tablet help
2017-03-27 22:46:06 +01:00
Andrew Meadows
18544581e6
remove warnings about implicit float cast
2017-03-27 14:40:31 -07:00
Brad Hefta-Gaub
c986077a4f
Merge pull request #10007 from hyperlogic/feature/ik-debug-draw
...
Added Developer > Avatar > Show IK Targets
2017-03-27 14:29:02 -07:00
Seth Alves
9c990b0358
Merge pull request #10018 from druiz17/tablet-login
...
Show login screen in tablet at startup if not logged in and connecting to a domain that requires login
2017-03-27 10:10:41 -08:00
Dante Ruiz
cba7adf32a
removed qDebug
2017-03-27 19:08:41 +01:00
Seth Alves
48ea9acfb3
Merge pull request #10016 from druiz17/tablet-goto
...
Porting goto to the tablet
2017-03-27 10:04:11 -08:00
Dante Ruiz
f4255735a9
make login screen show up on the tablet on startup
2017-03-27 18:03:38 +01:00
Dante Ruiz
b8eac7abef
revoming useless code
2017-03-27 16:17:50 +01:00
Seth Alves
bb28976d0e
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-26 09:32:35 -07:00
Seth Alves
3abd6b3948
Merge pull request #10006 from druiz17/tablet-help
...
Ported help into the tablet
2017-03-25 08:33:41 -08:00
Vladyslav Stelmakhovskyi
edb66ae704
Merge branch 'tablet-ui' into tablet-ui-audio-screen
2017-03-25 13:20:43 +01:00
Vladyslav Stelmakhovskyi
fc23c348cb
Implemented Audio settings screen for Tablet UI
2017-03-25 13:17:38 +01:00
Dante Ruiz
2a59139c76
trying to fix focus issue
2017-03-25 01:17:37 +01:00
Dante Ruiz
9e2768cc84
saving work
2017-03-25 01:06:21 +01:00
Dante Ruiz
3e98b2273c
help in the tablet
2017-03-25 00:52:41 +01:00
Anthony J. Thibault
49a95089d1
Remove hacks for debug rendering of IK targets
...
A AnimContext class was introduced. This context is passed into every node during evaluation/overlay.
It holds non-animVar "global" data passed from the application.
(cherry picked from commit a028d3ba58
2017-03-24 16:27:27 -07:00
Anthony J. Thibault
dd17b2e2f3
Added developer option to draw IK targets in world.
...
(cherry picked from commit 7e7803c648
2017-03-24 16:20:52 -07:00
Dante Ruiz
6178a86a46
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-help
2017-03-24 23:56:33 +01:00
Dante Ruiz
119a71d0d1
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-goto
2017-03-24 23:55:18 +01:00
Dante Ruiz
d9046a1982
goto on the tablet
2017-03-24 23:54:54 +01:00
Seth Alves
f1470e34f9
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-24 15:17:52 -07:00
Anthony J. Thibault
f7de74109b
Added jsdoc documentation for some of MyAvatar properties and methods
2017-03-24 15:10:26 -07:00
Stephen Birarda
3985354ff4
update graphic for oculus touch help with correct buttons
2017-03-24 13:45:56 -07:00
Brad Hefta-Gaub
1972b140b9
Merge pull request #9976 from mittens/21215
...
Worklist #21215 - Removing Duplicate Status Icons for Submeshes
2017-03-24 08:52:12 -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
Dante Ruiz
a078121c46
saving work
2017-03-24 00:23:13 +01: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
Anthony J. Thibault
8915ecd23d
compile time option to switch from touch to mouse events for web tablet
2017-03-23 13:54:17 -07:00
Zach Fox
a231b57472
Merge pull request #9962 from birarda/cmake-with-space
...
Fix failing POST_BUILD steps on Windows with spaces in build path
2017-03-23 11:41:38 -07:00
Dante Ruiz
ae111ff2e9
Merge branch 'tablet-goto' of github.com:fayeli/hifi into tablet-goto
2017-03-23 18:25:31 +01:00
Seth Alves
ff3fc244d1
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-23 09:50:53 -07:00
Dante Ruiz
e708c6478e
Merge branch 'tablet-popup' into tablet-help
2017-03-23 17:35:45 +01:00
Dante Ruiz
af97c7275e
Use loadQMlSource if no stack is aviable
2017-03-23 17:03:24 +01:00
