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
David Rowe
1fc6d82456
Tablet and desktop versions of avatar attachments dialog
2017-03-09 13:04:57 +13: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
Dante Ruiz
881213259d
Merge branch 'master' of github.com:highfidelity/hifi into toolbar-window-dont-close
2017-03-08 21:44:20 +00:00
Dante Ruiz
59b4fa5fd7
Close toolbar windows when scripts are reloaded
2017-03-08 21:44:04 +00:00
David Rowe
22e5229036
Use existing attachments dialog as base dialog content
2017-03-09 09:57:45 +13:00
David Rowe
1e3c717fd4
Method to show appropriate desktop or tablet dialog
2017-03-09 09:55:47 +13:00
Seth Alves
371c20ee25
hide tablet by making it not visible rather than destroying it
2017-03-08 10:33:59 -08:00
Dante Ruiz
e9086460e3
changed function names
2017-03-08 18:14:32 +00:00
Dante Ruiz
fd3e1fb320
Merge branch 'master' of github.com:highfidelity/hifi into goto-home-bug
2017-03-08 17:42:44 +00:00
Dante Ruiz
6acf2340a2
better way to determine if we can go to the homescreen
2017-03-08 17:42:24 +00: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
Anthony J. Thibault
836c701cb3
More accurate and responsive stylus and finger touching.
...
The algorithm used to detect when and where the stylus or finger is touching the tablet has been improved.
* hovering the finger/stylus over the surface of the tablet should cause buttons to highlight.
* flicking or using the stylus like a drum stick, should more accurately click buttons on the tablet.
* stabbing the tablet quickly, should also more accurately trigger button presses.
* moving the hand/stylus from behind the tablet should be less likely to cause press events.
2017-03-07 18:19:32 -08:00
Anthony J. Thibault
c7cd0fdc38
Add DebugDraw to .eslintrc config file
2017-03-07 18:13:42 -08:00
kunalgosar
d2a2ba1846
Fixed recording bug
2017-03-07 17:19:21 -08:00
Anthony J. Thibault
1b8a624edb
Fix for potential crash due to DebugDraw data race.
2017-03-07 16:07:30 -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
Dante Ruiz
656720ae36
Merge branch 'master' of github.com:highfidelity/hifi into goto-home-bug
2017-03-07 22:22:46 +00: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
Anthony J. Thibault
b0ad9a8110
Bug fix for potential crash when getting DebugDraw::instance
2017-03-07 10:03:38 -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
Howard Stearns
f0fd29abd3
Merge pull request #9815 from davidkelly/dk/3377
...
Retain selection in PAL when sorting or reloading
2017-03-07 09:38:07 -08:00
