David Rowe
|
35305b4476
|
Make dialog single column with images above controls
|
2017-03-28 08:55:38 +13: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 |
|
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
|
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 |
|
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 |
|
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
|
3e98b2273c
|
help in the tablet
|
2017-03-25 00:52:41 +01:00 |
|
Dante Ruiz
|
6178a86a46
|
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-help
|
2017-03-24 23:56:33 +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 |
|
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 |
|
Brad Davis
|
82d502ae9f
|
Correctly initialize a file cache with the proper key
|
2017-03-24 13:35:37 -07:00 |
|
Seth Alves
|
0d2e0eb9c3
|
Merge pull request #9994 from sethalves/avoid-deadlock-on-10k-mesh-fbx
Avoid deadlock on 10k mesh fbx
|
2017-03-24 12:34:37 -08:00 |
|
Brad Hefta-Gaub
|
9b26e8ee95
|
Merge pull request #9871 from Triplelexx/21208
21208 - Muted microphone indicator
|
2017-03-24 13:07:43 -07:00 |
|
Anthony J. Thibault
|
7e6ff7c2fb
|
Scrollbar is visible on marketplace in toolbar mode.
|
2017-03-24 11:40:10 -07:00 |
|
Ryan Huffman
|
bb09dd9414
|
Merge pull request #9988 from huffman/fix/touch-detection-after-launch
Fix Oculus Touch + Remote not being detected after initial launch
|
2017-03-24 11:37:57 -07:00 |
|
Lexx
|
fa606446a7
|
remove cache buster
|
2017-03-24 18:27:38 +00:00 |
|
Anthony J. Thibault
|
54b11bb6ee
|
Hide the scrollbar on the marketplace
|
2017-03-24 11:22:50 -07:00 |
|
Seth Alves
|
aaa78d108b
|
if a model has too many meshes, give up.
|
2017-03-24 11:17:24 -07:00 |
|
Seth Alves
|
e1e51614d9
|
don't hang loop if entity isDead
|
2017-03-24 11:16:54 -07:00 |
|
Clément Brisset
|
5ff7dbb254
|
Merge pull request #9991 from Atlante45/fix/entity-bad-url
Show entity bounding box for bad URLs
|
2017-03-24 10:56:06 -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
|
154cd444ad
|
Merge pull request #9993 from sethalves/tablet-ui
Tablet ui -- merge from upstream
|
2017-03-24 07:21:00 -08: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 |
|
Brad Hefta-Gaub
|
aa1883ba85
|
Merge pull request #9979 from jherico/crash_fix
Fix crash in render-perf-test
|
2017-03-24 08:10:37 -07:00 |
|
Atlante45
|
4f8d9b190b
|
Show green box when model entity has bad url
|
2017-03-23 17:56:33 -07:00 |
|
Ryan Huffman
|
56c5f06365
|
Fix Oculus Touch + Remote not being detected after initial launch
|
2017-03-23 16:29:08 -07:00 |
|
Brad Hefta-Gaub
|
20bc32fc89
|
Merge pull request #9980 from birarda/bug/ac-agent-audio
make sure the AC agent has an AudioScriptingInterface
|
2017-03-23 15:13:24 -07:00 |
|
Brad Davis
|
5a5eb6e168
|
Still trying to fix build error
|
2017-03-23 14:09:34 -07:00 |
|
Brad Davis
|
8116de7c14
|
Force thread linkage
|
2017-03-23 13:45:13 -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 |
|
Atlante45
|
d4353e1d19
|
Fix warnings
|
2017-03-23 11:39:42 -07:00 |
|
Seth Alves
|
9a59d4d83e
|
Merge pull request #9982 from sethalves/tablet-ui
Tablet ui -- merge from upstream
|
2017-03-23 08:52:18 -08:00 |
|
Dante Ruiz
|
3baff624a3
|
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-help
|
2017-03-23 17:51:47 +01:00 |
|
Seth Alves
|
ff3fc244d1
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
|
2017-03-23 09:50:53 -07:00 |
|
Seth Alves
|
1c62a80bc2
|
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui
|
2017-03-23 09:50:45 -07:00 |
|
Seth Alves
|
817a5335a0
|
Merge pull request #9981 from druiz17/tablet-popup
Use loadQMlSource if no stack is aviable when calling PushOnToStack
|
2017-03-23 08:49:41 -08:00 |
|
samcake
|
73227f6598
|
Merge pull request #9958 from highfidelity/smarter_textures
New texture streaming system
|
2017-03-23 09:44:31 -07:00 |
|