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
Seth Alves
f633e0cd5a
Merge pull request #10012 from sethalves/raise-max-meshes-to-1000
...
raise max mesh count for static collision entities from 500 to 1000
2017-03-27 08:30:07 -08:00
Dante Ruiz
b8eac7abef
revoming useless code
2017-03-27 16:17:50 +01:00
Seth Alves
5ed0ff729b
cleanups
2017-03-27 07:25:40 -07:00
Seth Alves
2682586c38
some clean-ups and a bug fix in PolyVox to mesh code
2017-03-27 06:50:06 -07:00
David Rowe
e58e3fbbf7
Disconnect snapshot event handler when tablet "home" button pressed
2017-03-27 17:32:04 +13:00
David Rowe
dc3095bfcd
Fix "don't share" button not closing window
2017-03-27 16:24:14 +13:00
David Rowe
d0fc352d3b
Address event bridge being shared with other scripts
2017-03-27 16:07:58 +13:00
David Rowe
aa8a1e1dda
Open snapshot dialog in tablet or window appropriately
2017-03-27 15:04:33 +13:00
Sam Cake
e87bc91d0e
Fixing the roughness/reflection quantization bug
2017-03-26 11:48:02 -07:00
Seth Alves
9cdd85af05
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2
2017-03-26 09:33:39 -07:00
Seth Alves
8a678dfb04
Merge pull request #10013 from sethalves/tablet-ui
...
Tablet ui -- merge from upstream
2017-03-26 08:33:21 -08: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
e5326d146e
Merge pull request #10003 from hyperlogic/feature/my-avatar-jsdoc
...
Added jsdoc documentation for some of MyAvatar properties and methods
2017-03-26 07:55:41 -08:00
Seth Alves
c21b8b4eac
raise max mesh count for static collision entities from 500 to 1000
2017-03-26 08:48:08 -07:00
Seth Alves
90db9af2f9
Merge pull request #9978 from Triplelexx/fix-tablet-users-typo
...
fix myVisibility typo
2017-03-26 07:36:11 -08:00
Seth Alves
7455dcc2db
Merge pull request #9985 from jherico/cmake_threads
...
Force thread linkage
2017-03-26 07:27:07 -08:00
Seth Alves
66f8e4063d
Merge pull request #9984 from Atlante45/fix/warnings
...
Fix warnings
2017-03-26 07:03:33 -08:00
Seth Alves
5e8c1eab78
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2
2017-03-25 19:03:39 -07:00
samcake
8b1a0be754
Merge pull request #9997 from jherico/ktx_cache_fix
...
Correctly initialize a file cache with the proper key
2017-03-25 09:58:32 -07:00
Sam Cake
ad5c78349a
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-03-25 09:57:28 -07:00
Seth Alves
d45e124529
Merge pull request #9995 from hyperlogic/bug-fix/no-scroll-bar-on-marketplace
...
Hide the scrollbar on the marketplace
2017-03-25 08:36:31 -08: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
Seth Alves
a3dd5e3fc4
Merge pull request #10009 from vladest/tablet-ui-audio-screen
...
Tablet ui audio screen
2017-03-25 08:31:00 -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
Anthony J. Thibault
5eddd232b0
Fix for change from std::string to QString
2017-03-24 17:03:01 -07: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
70c7ba92f7
Merge pull request #10004 from sethalves/tablet-ui
...
Tablet ui -- merge from upstream
2017-03-24 14:18:42 -08:00
