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
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
Seth Alves
59da607d07
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2
2017-03-24 15:08:23 -07:00
Seth Alves
6e40f03c8e
cleanups
2017-03-24 15:08:13 -07:00
Stephen Birarda
3985354ff4
update graphic for oculus touch help with correct buttons
2017-03-24 13:45:56 -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
Seth Alves
8f7f5efade
new javascript call: Model.newMesh()
2017-03-24 12:51:00 -07:00
Seth Alves
642cf57976
obj-writer now outputs normals
2017-03-24 12:49:58 -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
samcake
13b3809fe3
removing includes if possible
2017-03-24 11:04:52 -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
ZappoMan
52335e20a2
fix typo
2017-03-24 09:59:55 -07:00
ZappoMan
ddd0645453
fix merge issue
2017-03-24 09:59:11 -07:00
ZappoMan
84836d9331
fix typo that broke gun
2017-03-24 09:58:56 -07:00
samcake
a0488cfb91
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-03-24 09:41:09 -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
ZappoMan
bc331af6a0
Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick
2017-03-24 08:46:43 -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
