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
David Rowe
a6ef592353
Non-scrolling window with images scaled to fit
2017-03-28 14:43:26 +13:00
Anthony Thibault
e18357196a
Merge pull request #10028 from sethalves/tablet-ui
...
fix home button
2017-03-27 18:30:30 -07:00
Seth Alves
cdac011472
fix home button
2017-03-27 18:21:00 -07:00
Andrew Meadows
5fc1e97166
fix windows build of render-utils-test
2017-03-27 16:49:43 -07:00
Bradley Austin Davis
2cf7ba4119
Fixing pending transfer calculation
2017-03-27 16:34:08 -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
Bradley Austin Davis
638364497d
Trying a different tactic to avoid multiple concurrent file access
2017-03-27 16:18:04 -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
Andrew Meadows
92b41d7a38
fix link error for linux build
2017-03-27 15:50:40 -07:00
Dante Ruiz
02535722ba
removed visible to others opition from general settings
2017-03-27 23:31:41 +01:00
Andrew Meadows
ff2f4da4b2
final changes as per samcake
2017-03-27 15:19:28 -07:00
Seth Alves
343c9335b3
Merge pull request #10023 from hyperlogic/bug-fix/stylus-touching-deleted-entity
...
tablet bug fixes
2017-03-27 14:07:14 -08:00
Seth Alves
1916a46a31
Merge pull request #10024 from druiz17/tablet-goto-fix
...
fix spelling and page selection for help page on the tablet
2017-03-27 14:05:58 -08:00
ZappoMan
876dd4c850
add the default environment variable name for the kinect plugin to the search hints
2017-03-27 15:02:00 -07:00
Dante Ruiz
018138f422
fixed some issues with tablet help
2017-03-27 22:46:06 +01:00
Andrew Meadows
fcf18cba91
render pipeline support for normalized intergers
2017-03-27 14:40:31 -07:00
Andrew Meadows
60bc76e1c4
store cluster indices and weights in uint16_t
2017-03-27 14:40:31 -07:00
Andrew Meadows
f6d6c62fab
move variable closer to context where it is used
2017-03-27 14:40:31 -07:00
Andrew Meadows
18544581e6
remove warnings about implicit float cast
2017-03-27 14:40:31 -07:00
Andrew Meadows
60874e6041
remove unused cruft
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
Brad Hefta-Gaub
3bdcfd8b78
Merge pull request #9796 from ZappoMan/removePropertiesFromRayPick
...
remove properties from RayToEntityIntersectionResult
2017-03-27 14:26:51 -07:00
Anthony J. Thibault
a0c42bacdb
Fix problem with ContextMenu triggering on button up and button down.
...
This is fixed by clearing the ButtonPressedMap in the KeyboardMouseDevice every update.
Previously, this button would never be cleared, causing other controller actions mapped to the same button to have the incorrect state.
In this case, ContextMenu action would become 2 when pressed and 1 when released, anytime after the right mouse button was pressed.
2017-03-27 14:26:17 -07:00
Bradley Austin Davis
f764cd614b
Don't hold KTX files open for longer than transfers require
2017-03-27 13:33:00 -07:00
David Rowe
ead1f00bbf
Title
2017-03-28 09:10:20 +13:00
David Rowe
35305b4476
Make dialog single column with images above controls
2017-03-28 08:55:38 +13:00
Seth Alves
e0e36b7a0c
Merge pull request #10022 from sethalves/tablet-ui
...
Tablet ui -- merge from upstream
2017-03-27 11:06:57 -08:00
Seth Alves
f6ebc87f92
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-27 12:06:27 -07:00
Seth Alves
f8ba540d03
Merge pull request #9992 from samcake/brown
...
Fixing the broken rendering of subsurface scattering
2017-03-27 11:06:04 -08:00
Ryan Huffman
d84e2fb048
Add AnimationCache to agent scripts
2017-03-27 12:05:25 -07:00
Seth Alves
a3fce13a04
Merge branch 'brown' of github.com:samcake/hifi into tablet-ui
2017-03-27 12:00:45 -07:00
Seth Alves
174a3b0da6
Merge pull request #10019 from sethalves/tablet-ui
...
Tablet ui -- merge from upstream
2017-03-27 10:14:57 -08:00
Seth Alves
a6c54907b4
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui
2017-03-27 11:14:24 -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
Anthony J. Thibault
5796cbc898
Bug-fix for touching deleted entities or overlays.
2017-03-27 10:26:33 -07:00
Dante Ruiz
f4255735a9
make login screen show up on the tablet on startup
2017-03-27 18:03:38 +01:00
Seth Alves
d0c8994a8c
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-27 09:51:40 -07:00
samcake
25d39d2430
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-03-27 09:50:44 -07:00
