Anthony J. Thibault
d8f04d90a7
Merge branch 'master' into feature/can-touch-this
2017-03-09 14:24:10 -08:00
Anthony J. Thibault
6f53aaed5c
Small simplification of building stylusTarget list.
2017-03-09 14:04:13 -08:00
Brad Hefta-Gaub
45efb235e3
Merge pull request #9842 from ZappoMan/tellCodecAboutSilence
...
improved noise gate
2017-03-09 11:04:22 -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
Brad Hefta-Gaub
bdab24d9bf
fix spelling
2017-03-09 08:25:56 -08:00
Brad Hefta-Gaub
79d8d90581
CR feedback
2017-03-08 20:35:24 -08:00
Brad Hefta-Gaub
2d595c1f87
CR feedback
2017-03-08 20:29:32 -08:00
Anthony J. Thibault
1acc5ea760
Finger now points when near tablet + deadspot added when touching the tablet
2017-03-08 19:03:56 -08:00
Brad Hefta-Gaub
60daaba525
small cleanup
2017-03-08 17:30:44 -08:00
Brad Hefta-Gaub
1bdad89cbe
properly handle silent packet transitions
2017-03-08 17:27:46 -08:00
Dante Ruiz
2a275a4f4b
removed tab at the end of word
2017-03-09 00:15:02 +00:00
Dante Ruiz
b878f164fb
minimize diff again
2017-03-09 00:10:38 +00: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
Dante Ruiz
ce105e0329
fix double tablets when reloading scripts
2017-03-08 22:21:57 +00: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
Seth Alves
a67f8ac0ed
Merge pull request #9807 from Menithal/21166-remove-limit
...
#9761 Cloneable Improvement
2017-03-08 07:15:06 -08: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
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
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
694fc58374
restore missing shading pipeline for simple opaque in deferred
2017-03-07 12:07:24 -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
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
Brad Hefta-Gaub
69a8ea99ca
Merge pull request #9823 from vladest/qml_js_in_qtcreator
...
Adding ability for QML/JS file to be visible in QtCreator. Also chang…
2017-03-07 09:20:51 -08:00
David Kelly
b760e86226
rest of cr feedback
2017-03-07 10:17:32 -07:00
David Kelly
c6dbfc85f0
cr feedback
2017-03-07 09:54:00 -07:00
Vladyslav Stelmakhovskyi
2d2b2094fd
Adding ability for QML/JS file to be visible in QtCreator. Also changed files will be installed to destination
2017-03-07 10:11:09 +01:00
Andrew Meadows
8c773483cf
Merge pull request #9820 from Atlante45/fix/avatar-lean
...
Fix avatar lean
2017-03-06 22:18:34 -08:00
Brad Hefta-Gaub
b111bcb826
Merge pull request #9818 from ctrlaltdavid/21205
...
Remove Developer > Network > Bandwith Details dialog
2017-03-06 22:02:33 -08:00
Brad Hefta-Gaub
87934ee82d
fix bugs in some meshes
2017-03-06 21:50:32 -08:00
Atlante45
ff9d6d657c
Remove weighted offset, special case downward pressure
2017-03-06 19:41:08 -08:00
David Rowe
51739f2f99
Remove Developer > Network > Bandwith Details dialog
2017-03-07 15:02:26 +13:00
Brad Davis
f9dcfa54aa
Add debug/release builds to oculus lib
2017-03-06 16:08:21 -08:00
Andrew Meadows
d749c0c8be
use fabsf() rather than fabs()
2017-03-06 15:50:32 -08:00
