Seth Alves
d29abef9f5
Merge pull request #9485 from sethalves/tablet-ui
...
allow stylus to work when edit.js is running
2017-01-23 15:53:06 -08:00
Seth Alves
f2ff6fd9e7
allow stylus to work when edit.js is running
2017-01-23 15:52:40 -08:00
Seth Alves
613a88925d
Merge pull request #9482 from sethalves/tablet-ui-merge-upstream
...
Tablet ui merge upstream
2017-01-23 14:42:38 -08:00
Seth Alves
9d77e9937c
only make the last cm of the stylus active to avoid accidently closing tablet when grabbing base
2017-01-23 14:38:48 -08:00
Seth Alves
cdb14e7662
put name of button-click file back
2017-01-23 13:55:11 -08:00
Seth Alves
c958314918
merge from upstream
2017-01-23 13:52:01 -08:00
Philip Rosedale
45a4ec349e
Merge pull request #9467 from humbletim/21139
...
Code Review for Job #21139 - Do not allow grab or far-grab or click while editing objects
2017-01-23 13:20:57 -08:00
Clément Brisset
19622f86bf
Merge pull request #9475 from Atlante45/fix/injector-options
...
Fix invalid volume values in injector options silencing all injectors
2017-01-23 13:17:55 -08:00
Stephen Birarda
c8d505c482
Merge pull request #9474 from birarda/bug/web-entity-safe-url
...
use fromUserInput to avoid web entity crashes with bad URLs
2017-01-23 12:52:39 -08:00
Stephen Birarda
f02832ca71
output the actual value set in WebEntityItem
2017-01-23 11:50:05 -08:00
Atlante45
3f8b2f9cbb
Fix invalid volume values in injector options
2017-01-23 11:49:07 -08:00
Stephen Birarda
d7651e9838
move value sanitizing to WebEntityItem
2017-01-23 11:45:21 -08:00
Stephen Birarda
99e0c8c0e7
use fromUserInput in web entity URL set to avoid crashable URLs
2017-01-23 11:37:54 -08:00
Zach Pomerantz
9605379265
Merge pull request #9472 from zzmp/cmake/revert-libquazipd
...
Revert "Use supplied libquazip5.so for Debug builds" for WIN32/OSX
2017-01-23 14:31:09 -05:00
Stephen Birarda
8c5c1f32a0
Merge pull request #9471 from birarda/bug/places-paths-anchor
...
fix Places / Paths anchor in domain settings
2017-01-23 10:31:37 -08:00
Seth Alves
882723d3a0
Merge pull request #9473 from sethalves/tablet-ui
...
Tablet ui
2017-01-23 10:14:57 -08:00
Seth Alves
702aba9646
use a softer button-click sound
2017-01-23 10:13:45 -08:00
Zach Pomerantz
daf507fc81
revert "Use supplied libquazip5.so for Debug builds" for WIN32/OSX
2017-01-23 13:02:15 -05:00
Stephen Birarda
ab7ce19211
use html_id for settings anchor if no name
2017-01-23 09:49:46 -08:00
Seth Alves
be8bc9652b
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-23 09:44:04 -08:00
Seth Alves
4816f07384
Merge pull request #9466 from druiz17/textureSwap
...
tablet button bug fix
2017-01-23 09:43:36 -08:00
Dante Ruiz
d5427f8722
close tablet bug fix
2017-01-23 17:33:33 +00:00
humbletim
d20ac20ff2
move isInEditMode guard to setState
2017-01-23 01:31:11 -05:00
humbletim
15394056eb
* add isInEditMode to utils.js
...
* update grab.js to use the latest Settings edit mode detection approach
* add edit guards to handControllerGrab.js and grab.js
* update edit.js to consistently initialize Setting's edit flag
2017-01-20 22:29:40 -05:00
Dante Ruiz
5c55b86be6
fix bug
2017-01-21 01:56:06 +00:00
Seth Alves
d71b79ebed
Merge pull request #9465 from druiz17/textureSwap
...
home button flushed && texture swapping && close tablet when at home screen
2017-01-20 16:40:00 -08:00
Dante Ruiz
41bf65ed5e
home button improvments
2017-01-20 16:35:41 -08:00
Seth Alves
ff17aa7745
Merge pull request #9464 from sethalves/tablet-ui
...
Tablet ui
2017-01-20 14:51:16 -08:00
Seth Alves
e96a3d4bcb
try another click sound
2017-01-20 14:50:24 -08:00
Seth Alves
87ea9161e4
avoid bad interaction between far-grab and equip
2017-01-20 14:49:49 -08:00
samcake
afd3c3b504
Merge pull request #9436 from AndrewMeadows/cauterization-cleanup
...
Cleanup of code that decides not to render head when in first-person
2017-01-20 14:49:08 -08:00
Zach Fox
d535d816f4
Merge pull request #9463 from zfox23/PAL_FixScrollingVisibility
...
PAL: Fix card visibility when selecting out-of-table users
2017-01-20 14:01:04 -08:00
Zach Fox
11a57efafb
Fix it!
2017-01-20 13:44:29 -08:00
Seth Alves
dfa949f2d8
switch to new click sound
2017-01-20 13:35:41 -08:00
Seth Alves
2f08972578
Merge pull request #9460 from druiz17/touchUp
...
Tablet button clickable in desktop mode && correct icons for switch
2017-01-20 12:58:41 -08:00
Seth Alves
503723a269
Merge pull request #9459 from hyperlogic/tablet-ui
...
Updated tablet dimensions to better reflect mockup and 3d model
2017-01-20 12:40:47 -08:00
Anthony J. Thibault
3ebf2ebc9b
Updated tablet dimensions to better reflect mockup and 3d model
2017-01-20 12:27:44 -08:00
Ken Cooke
176531e395
Merge pull request #9450 from zzmp/fix/audio-pool-comp
...
fix warnings for signed comp in AudioMixerSlavePool
2017-01-20 12:17:40 -08:00
Dante Ruiz
58e04f8e35
home button works in desktop mode
2017-01-20 19:43:13 +00:00
Zach Fox
9fa80567a6
Merge pull request #9455 from zfox23/PAL_LastEditorBug
...
PAL: Fix "Last Editor" popup bug; Fix log spam
2017-01-20 11:28:41 -08:00
Seth Alves
d449c6ca78
Merge pull request #9456 from sethalves/tablet-ui
...
try again on haptics from touching tablet overlay with stylus
2017-01-20 11:07:59 -08:00
Seth Alves
7f25135633
try again on haptics from touching tablet overlay with stylus
2017-01-20 11:06:35 -08:00
Dante Ruiz
672deb903c
correct switch icons
2017-01-20 10:34:09 -08:00
Seth Alves
6641f9bafd
Merge pull request #9444 from druiz17/homeButtonFix
...
Home button is now an overlay
2017-01-20 10:32:31 -08:00
Seth Alves
7b2bc3a3ed
Merge pull request #9453 from sethalves/tablet-ui
...
unmangle merge
2017-01-20 10:29:48 -08:00
Seth Alves
2d220a557f
unmangle merge
2017-01-20 10:29:18 -08:00
Zach Fox
8f3c4794c6
Comments
2017-01-20 10:24:52 -08:00
Zach Fox
9c9206acc0
Prevent logspam
2017-01-20 10:24:51 -08:00
Zach Fox
c83cd4a94a
Complex checkpoint
2017-01-20 10:24:51 -08:00
Seth Alves
e96b646f66
Merge pull request #9452 from sethalves/tablet-ui
...
Tablet ui
2017-01-20 10:14:44 -08:00
