Seth Alves
|
88e74251a1
|
cleanups
|
2017-03-10 12:51:34 -08:00 |
|
Seth Alves
|
411ec9a791
|
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-fix-edit-props-race
|
2017-03-10 10:22:10 -08:00 |
|
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 |
|
Seth Alves
|
d792559d9a
|
have edit.js resend properties of selected entity to entityProperties.js once it's ready
|
2017-03-10 09:59:23 -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
|
509ce3f2d2
|
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
|
2017-03-07 18:41:36 -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 |
|
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 |
|
Andrew Meadows
|
1b8f6b9835
|
Merge pull request #9784 from samcake/blue
Fixing Emissive on overlay for models (opaque and transparent)
|
2017-03-06 13:24:00 -08:00 |
|
samcake
|
21f36d7212
|
removing comments and restoring the correct behavior for Pal.js
|
2017-03-06 12:41:00 -08: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 |
|
Menithal
|
01ba44c572
|
Fixed print
|
2017-03-06 21:32:27 +02: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 |
|
Menithal
|
d50a0e33a9
|
CR. Run through Lint ECMAScript 5 standard
Meaning all const are out, non-variable definitions are out, etc
|
2017-03-06 21:07:16 +02: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 |
|
Menithal
|
04d3bf0c38
|
Cleanup and safeguards
- RegistrationPoint can no longer be set for magnetic blocks, will set it to
0.5 on snap.
- Simplified axis lock logic
|
2017-03-06 10:55:47 +02:00 |
|