Dante Ruiz
|
b63ab05eec
|
improved general settting coloring
|
2017-03-10 19:33:14 +00:00 |
|
Dante Ruiz
|
9b3810814e
|
fiexed putting menu items on the hud when tablet not open when on desktop screen
|
2017-03-10 18:40:18 +00:00 |
|
druiz17
|
8490379517
|
Merge pull request #9795 from ctrlaltdavid/21197
Port avatar settings to tablet
|
2017-03-09 09:36:24 -08:00 |
|
druiz17
|
0069569e96
|
Merge branch 'tablet-ui' into 21197
|
2017-03-09 09:31:15 -08:00 |
|
druiz17
|
8750982567
|
Merge pull request #9785 from druiz17/menuFix
More dialog porting to tablet
|
2017-03-09 09:29:31 -08:00 |
|
Seth Alves
|
d1e54d0838
|
Merge pull request #9846 from sethalves/tablet-ui-quick-summon-1
Tablet ui quick summon 1
|
2017-03-09 09:18:17 -08:00 |
|
Seth Alves
|
023b01814e
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-quick-summon-1
|
2017-03-09 09:16:37 -08:00 |
|
druiz17
|
007ed9fe81
|
Merge pull request #9836 from druiz17/2-tablets-fix
Fixed having more than one tablet when reloading scripts
|
2017-03-09 09:13:14 -08:00 |
|
druiz17
|
840e29c8b9
|
Merge pull request #9840 from druiz17/close-tablet-during-switch
Close tablet when switching from HMD to desktop and vice versa
|
2017-03-09 09:12:29 -08:00 |
|
Dante Ruiz
|
b58a27cf10
|
Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix
|
2017-03-09 16:26:28 +00:00 |
|
Dante Ruiz
|
2a275a4f4b
|
removed tab at the end of word
|
2017-03-09 00:15:02 +00:00 |
|
Seth Alves
|
9435c58c2c
|
Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into tablet-ui-quick-summon-1
|
2017-03-08 16:10:38 -08:00 |
|
Dante Ruiz
|
b878f164fb
|
minimize diff again
|
2017-03-09 00:10:38 +00:00 |
|
Seth Alves
|
7f47835733
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
|
2017-03-08 16:10:18 -08:00 |
|
Seth Alves
|
3d309f57d4
|
Merge pull request #9831 from sethalves/fix-3d-line-bounds
fix Line3DOverlays bound updates
|
2017-03-08 16:09:54 -08:00 |
|
Dante Ruiz
|
f6d799c048
|
minimize diff
|
2017-03-09 00:09:32 +00:00 |
|
Dante Ruiz
|
561bd27c38
|
minimize diff
|
2017-03-09 00:08:50 +00:00 |
|
Dante Ruiz
|
5f7a0ea8fc
|
Close tablet when switching form HMD to desktop and vice versa
|
2017-03-09 00:05:26 +00:00 |
|
Seth Alves
|
6aac2eb338
|
for overlay tablets, precreate them so that they show up quickly when summoned
|
2017-03-08 15:31:24 -08:00 |
|
Seth Alves
|
de2dd7383d
|
didn't need invis flag, after all
|
2017-03-08 15:30:49 -08:00 |
|
Seth Alves
|
28ade45f97
|
make maxFPS a property
|
2017-03-08 15:30:15 -08:00 |
|
Seth Alves
|
ae48dae96f
|
get rid of toggleTabletUI lockout period
|
2017-03-08 15:29:46 -08:00 |
|
Dante Ruiz
|
ce105e0329
|
fix double tablets when reloading scripts
|
2017-03-08 22:21:57 +00:00 |
|
Seth Alves
|
371c20ee25
|
hide tablet by making it not visible rather than destroying it
|
2017-03-08 10:33:59 -08:00 |
|
Seth Alves
|
66d44ac6f0
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
|
2017-03-08 09:26:51 -08:00 |
|
Andrew Meadows
|
31fc50b38c
|
Merge pull request #9828 from kunalgosar/recorderFix
Fixed bug where recording sends you to (0, 0, 0)
|
2017-03-08 09:24:29 -08:00 |
|
Dante Ruiz
|
b740073358
|
Merge branch 'master' of github.com:highfidelity/hifi into menuFix
|
2017-03-08 16:28:58 +00:00 |
|
Dante Ruiz
|
74fe3da035
|
Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix
|
2017-03-08 16:28:24 +00:00 |
|
druiz17
|
6d84413d90
|
Merge pull request #2 from vladest/menuFix_AssetServer
Menu fix asset server
|
2017-03-08 08:26:32 -08:00 |
|
Seth Alves
|
a67f8ac0ed
|
Merge pull request #9807 from Menithal/21166-remove-limit
#9761 Cloneable Improvement
|
2017-03-08 07:15:06 -08:00 |
|
David Rowe
|
950f91965d
|
Merge branch 'tablet-ui-edit-js' into 21197
|
2017-03-08 17:35:58 +13:00 |
|
Seth Alves
|
adc3581d63
|
remove override of locationChanged which was keeping the render-bounds of Line3DOverlays from updating during calls to editOverlay
|
2017-03-07 19:32:34 -08:00 |
|
Seth Alves
|
509ce3f2d2
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
|
2017-03-07 18:41:36 -08:00 |
|
kunalgosar
|
d2a2ba1846
|
Fixed recording bug
|
2017-03-07 17:19:21 -08:00 |
|
Brad Hefta-Gaub
|
1e51ae62b1
|
Merge pull request #9804 from jherico/oculus_update
Update Oculus SDK to 1.11
|
2017-03-07 15:00:44 -08:00 |
|
Seth Alves
|
71c2b4215d
|
Merge pull request #9811 from ZappoMan/triangleSet
Cleanup how Models do ray-picking and determination of point inside of convex hull
|
2017-03-07 14:12:56 -08:00 |
|
Thijs Wenker
|
d2c3b0b706
|
Fix coding standards link
|
2017-03-07 22:37:54 +01:00 |
|
Seth Alves
|
cd91d6ff3c
|
Merge pull request #9824 from sethalves/fix-tablet-qml-overlay-in-hmd
fix -- restore missing shading pipeline for simple opaque in deferred
|
2017-03-07 13:25:44 -08:00 |
|
Ryan Huffman
|
a744e0d11c
|
Merge pull request #9685 from humbletim/21114-part2
CR-2 21114 -- BaseScriptEngine.cpp, order-of-operations fixes, reworked JS Exceptions
|
2017-03-07 13:25:25 -08:00 |
|
Howard Stearns
|
2b117407d4
|
Merge pull request #9805 from howard-stearns/fix-ban-remove-from-pal
fix 'banned user doesn't disappear from pal until refresh'
|
2017-03-07 12:27:41 -08:00 |
|
Brad Hefta-Gaub
|
f7e824e47c
|
Merge branch 'master' of https://github.com/highfidelity/hifi into triangleSet
|
2017-03-07 12:18:36 -08:00 |
|
howard-stearns
|
cb41b9135b
|
fix broken merge
|
2017-03-07 12:10:52 -08:00 |
|
Seth Alves
|
aa4cbe2892
|
Merge branch 'fix-tablet-qml-overlay-in-hmd' of github.com:sethalves/hifi into tablet-ui-edit-js
|
2017-03-07 12:10:20 -08:00 |
|
Vladyslav Stelmakhovskyi
|
a02807fb26
|
Merge branch 'menuFix' into menuFix_AssetServer
|
2017-03-07 21:07:53 +01:00 |
|
Seth Alves
|
694fc58374
|
restore missing shading pipeline for simple opaque in deferred
|
2017-03-07 12:07:24 -08:00 |
|
Seth Alves
|
b938579598
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
|
2017-03-07 11:42:44 -08:00 |
|
howard-stearns
|
8a489f36f4
|
Merge branch 'master' of https://github.com/highfidelity/hifi into fix-ban-remove-from-pal
|
2017-03-07 10:49:53 -08:00 |
|
Andrew Meadows
|
1e9623e2f2
|
Merge pull request #9813 from druiz17/multipule-audio-fix
removed duplicated audio devices
|
2017-03-07 10:00:48 -08:00 |
|
Brad Hefta-Gaub
|
d8b7076a9e
|
Merge pull request #9816 from AndrewMeadows/sphere-means-sphere
ModelEntityItems that use 'sphere' for shapeType should collide as true spheres
|
2017-03-07 09:53:52 -08:00 |
|
Seth Alves
|
df2e73c2f0
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
|
2017-03-07 09:44:41 -08:00 |
|