Seth Alves
fffff817a3
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-10 10:20:40 -08:00
Seth Alves
494b602d4c
Merge pull request #9850 from druiz17/toolbar-MIA-afetr-snapshot
...
toolbar becomes visible after taking a snapshot
2017-03-10 10:20:01 -08:00
Seth Alves
cef4c988c4
Merge pull request #9835 from druiz17/toolbar-window-dont-close
...
Close toolbar windows when reloading scripts
2017-03-10 10:19:07 -08:00
Dante Ruiz
d54005b62e
no more duplicate snapshot buttons after taking reloading scripts
2017-03-10 00:17:44 +00:00
Dante Ruiz
c6c0c6d382
toolbar becomes visible after taking a snapshot
2017-03-09 22:54:22 +00:00
druiz17
0069569e96
Merge branch 'tablet-ui' into 21197
2017-03-09 09:31:15 -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
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
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
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
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
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
b938579598
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-03-07 11:42:44 -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
Seth Alves
f594689fa8
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-03-07 09:24:50 -08:00
Dante Ruiz
fc65723d68
corrected removing duplicate devices
2017-03-06 22:14:20 +00:00
Seth Alves
4886f1cbfc
don't run stylus-on-overlay code unless the overlay is a web3d overlay
2017-03-06 12:38:19 -08:00
Brad Hefta-Gaub
38668b6ce5
Merge pull request #9812 from sethalves/dont-auto-ungrab-overlays
...
don't automatically unhook overlays from hands unless they were grabbable overlays
2017-03-06 12:32:18 -08:00
Thijs Wenker
6ded937b25
Merge pull request #9809 from Menithal/21201
...
WL#21201 Snap-together Magnetic blocks
2017-03-06 21:30:53 +01:00
David Rowe
09ecb12510
Merge branch 'tablet-ui-edit-js' into 21197
...
# Conflicts:
# interface/src/ui/overlays/Web3DOverlay.cpp
2017-03-07 08:59:40 +13:00
Seth Alves
27066e89a6
Merge branch 'dont-auto-ungrab-overlays' of github.com:sethalves/hifi into tablet-ui-edit-js
2017-03-06 11:46:19 -08:00
Seth Alves
a2d2c41f02
remove debug print
2017-03-06 11:45:49 -08:00
Seth Alves
08e2e421e4
Merge branch '21199' of github.com:ctrlaltdavid/hifi into tablet-ui-edit-js
2017-03-06 11:08:27 -08:00
Seth Alves
eb47db4441
Merge branch 'dont-auto-ungrab-overlays' of github.com:sethalves/hifi into tablet-ui-edit-js
2017-03-06 11:07:22 -08:00
Dante Ruiz
b6671d92c8
removed duplicated audio devices
2017-03-06 18:46:57 +00:00
Seth Alves
6ac576c9e6
Merge branch 'master' of github.com:highfidelity/hifi into dont-auto-ungrab-overlays
2017-03-06 10:43:43 -08:00
Seth Alves
19a31d7630
don't automatically unhook overlays from hands unless they were grabbable overlays
2017-03-06 10:15:53 -08:00
Seth Alves
93246b24b0
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-03-06 08:54:49 -08:00
Brad Hefta-Gaub
781e0be0e3
Merge pull request #9806 from howard-stearns/preserve-audio-data-during-pal-refresh
...
preserve audio data during pal refresh
2017-03-06 08:45:46 -08:00
Seth Alves
c677326025
Merge pull request #9754 from hyperlogic/feature/fingers-on-tablet
...
Touch the tablet with your finger
2017-03-04 11:58:47 -08:00
Menithal
ea3f7f0274
Initial Magnetic block
2017-03-04 18:50:30 +02:00
Menithal
d85cb645b0
Changed limit logic, default limit is now 0
...
Clones now have a named based on the original entity id
Limit is now calculated from the source instance, instead of just clone
name to avoid a single box being calculated as something else
Default limit is now 0, which disables limit
2017-03-04 11:42:43 +02:00
howard-stearns
15d680d4f9
preserve audio data during pal refresh
2017-03-03 16:56:12 -08:00
Anthony J. Thibault
e56f02d94f
Changed default for preferFingerOverStylus to false.
2017-03-03 14:12:04 -08:00
Seth Alves
bccfa79e8b
Merge pull request #9749 from ctrlaltdavid/21176
...
If someone else is grabbing entity you want to grab show their grab beam
2017-03-03 13:43:28 -08:00
David Rowe
6403e51d20
Merge branch 'tablet-ui-edit-js' into 21199
2017-03-04 09:00:49 +13:00
David Rowe
48ee661f02
Merge branch 'tablet-ui-edit-js' into 21197
2017-03-04 08:58:48 +13:00
Anthony J. Thibault
45febe8565
Merge branch 'master' into feature/fingers-on-tablet
2017-03-03 09:04:43 -08:00
Seth Alves
40caa1ea49
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-03-03 09:01:57 -08:00
