Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-09 01:28:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
51528 commits 25 branches 0 tags 1.1 GiB
Commit graph

1704 commits

Author SHA1 Message Date
Triplelexx
f159d4c91d create nameTag.js script 
Running the script creates a text entity that will hover over the users
head showing their display name.
 2017-01-31 20:45:35 +00:00
Dante Ruiz
7a4a769015 fix more editing bugs 2017-01-31 16:53:57 +00:00
Dante Ruiz
b264d84385 minimize git diff 2017-01-30 13:27:25 -08:00
Dante Ruiz
57a9d34cda minimize git diff 2017-01-30 13:27:25 -08:00
Dante Ruiz
8879727d88 ability to grab tablet in edit mode 2017-01-30 13:27:25 -08:00
Anthony J. Thibault
98b53d1d29 Don't allow mouse dragging the tablet in HMD mode. 2017-01-30 12:07:18 -08:00
Faye Li
8e64de26a9 Merge branch 'tablet-ui' into new-users-js 2017-01-30 11:25:58 -08:00
Anthony J. Thibault
39d68828ab Disable FXAA on tablet overlay in desktop mode. 
This introduces the "isAA" property to 3d overlays. When false, the overlay is rendered after
the "Antialiasing" render pass.  Ironically, disabling FXAA makes the text more readable, which is
essential in 2D desktop mode.

Two new shaders were introduced.

simple_opaque_web_browser_overlay.slf
simple_transparent_web_browser_overlay.slf

These are tailored to write into the main framebuffer instead of the g-buffer.
 2017-01-30 11:24:59 -08:00
Faye Li
ff1c4995af removed unused code 2017-01-27 15:44:07 -08:00
Faye Li
8091b0ced4 button style 2017-01-27 13:33:07 -08:00
Dante Ruiz
2c7cbb1bd9 close tablet with mouse in HMD 2017-01-27 20:58:36 +00:00
Faye Li
bf51ba7195 button brings up add/remove friends page 2017-01-27 11:34:38 -08:00
Faye Li
bfbee20f43 display friends 2017-01-27 10:19:20 -08:00
Seth Alves
95d5c64e83 put a schmitt trigger in place to de-bounce tablet clicks 2017-01-26 15:09:35 -08:00
Seth Alves
c0f169e242 allow tablet-stabbers to more easily click buttons 2017-01-26 14:54:32 -08:00
Seth Alves
e3d4cae515 avoid having the snapshot script be multi-activated by a single button-click 2017-01-26 14:29:49 -08:00
Seth Alves
d85d892057 Merge pull request #9522 from fayeli/PAL-to-PEOPLE 
Tablet Button name from PAL to PEOPLE
 2017-01-26 12:58:16 -08:00
Faye Li
44fc8a5fbf update button name 2017-01-26 11:23:06 -08:00
Seth Alves
0b51b1d566 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-26 11:00:02 -08:00
Brad Hefta-Gaub
5ada689ab7 Merge pull request #9497 from ctrlaltdavid/fix-clara-download 
Fix intermittent Clara.io download crashes
 2017-01-26 10:58:27 -08:00
Seth Alves
68de5c9757 Users to USERS in button 2017-01-26 10:23:38 -08:00
Seth Alves
e2b1f4b2ab include tablet fbx with interface distribution rather than get it from s3 2017-01-26 10:20:46 -08:00
Faye Li
6a4a9bcb32 end of day commit 2017-01-25 17:53:32 -08:00
Faye Li
0a3a0e817e polling users and displaying user count 2017-01-25 17:36:50 -08:00
Seth Alves
9497b2b7c5 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui 2017-01-25 17:16:12 -08:00
Seth Alves
129fe6ea49 dammit, emacs 2017-01-25 17:15:54 -08:00
Faye Li
b5b781f4a5 tab content switching 2017-01-25 16:59:16 -08:00
Anthony J. Thibault
2af59630fb Better legibility of tablet in 2D with small window sizes. 2017-01-25 16:43:36 -08:00
Seth Alves
204652514e fix some fallout from toolbar changes 2017-01-25 16:29:36 -08:00
Faye Li
5ad522668a tabs header for everyone and friends 2017-01-25 16:29:25 -08:00
Seth Alves
c317ba8054 merge from upstream 2017-01-25 15:57:53 -08:00
Seth Alves
f382b541c7 merge from upstream 2017-01-25 15:42:33 -08:00
Seth Alves
ff8d13ecc7 get button-states for toolbar buttons working again 2017-01-25 15:38:54 -08:00
Faye Li
49a8964c4e reference new users icon art 2017-01-25 14:43:39 -08:00
Faye Li
ce0ee610ea a test on polling friends 2017-01-25 14:32:36 -08:00
Seth Alves
98f1664a46 use a setting to decide which UI is enabled 2017-01-25 14:17:45 -08:00
Atlante45
f540c94113 Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr 2017-01-25 13:06:49 -08:00
Seth Alves
f18094f565 make use of tablet or HUD depend on a single variable. avoid some duplicated code 2017-01-25 12:00:34 -08:00
Faye Li
f02b2ef40a auto poll users when page loads 2017-01-25 11:59:31 -08:00
Faye Li
c7a0e609fc created a friends button for metaverse friends page 2017-01-25 11:41:07 -08:00
Seth Alves
11d01a0c00 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-HUD-ui 2017-01-25 09:42:59 -08:00
Ryan Huffman
2bb7a7a4a6 Remove entity server script status log spam from edit.js 2017-01-25 09:32:25 -08:00
Seth Alves
7d370fb791 Merge pull request #9507 from cozza13/tablet-ui 
Changes to tablet formatting
 2017-01-25 09:29:16 -08:00
Dante Ruiz
c811839163 tablet is not selectable in edit mode 2017-01-25 16:46:17 +00:00
Dante Ruiz
bc75cf5bed removed tabs 2017-01-25 16:11:37 +00:00
Dante Ruiz
bda8b65e79 fixing spaceing 2017-01-25 16:06:40 +00:00
Dante Ruiz
a147ce3f5f fixed load script issue 2017-01-25 08:00:41 -08:00
Chris Collins
df9bfa6eff Changes to tablet formating 
Changes to QML and .js formating to match style of mockup.
 2017-01-25 07:41:04 -08:00
David Rowe
dcd632013f Better variable name 2017-01-25 16:37:35 +13:00
David Rowe
7e56d0fae6 Fix up Clara.io error handling 2017-01-25 16:36:06 +13:00
Seth Alves
4335bbe4fe provide a way to switch mostly back to HUD-based ui 2017-01-24 18:48:11 -08:00
Seth Alves
ced1b61b70 close rather than attempt to repair the tablet after a domain change 2017-01-24 16:03:22 -08:00
Seth Alves
827ae7ad4d Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-close-tablet-upon-goto 2017-01-24 15:50:12 -08:00
Seth Alves
601a35a9b6 try a different way of repairing tablet after a domain change 2017-01-24 15:49:49 -08:00
Faye Li
71b6096644 toggle menu item 2017-01-24 15:12:46 -08:00
Faye Li
5bed68ac4c button toggle 2017-01-24 14:56:58 -08:00
Faye Li
95a92fc5eb added tablet button 2017-01-24 14:42:28 -08:00
David Rowe
1b05ae8a82 Make handling of Clara.io download-ready state transition more robust 2017-01-25 11:00:07 +13:00
Anthony J. Thibault
432bb27119 The tablet Help button should be active if window is visible 2017-01-23 18:37:08 -08:00
Anthony J. Thibault
e30d77eba1 Tablet goto button now properly tracks address bar shown state 2017-01-23 18:37:07 -08:00
Seth Alves
353b38286a Merge pull request #9490 from hyperlogic/tablet-ui 
For for Tablet Tilt and Oculus Touch A B buttons sending UINav events
 2017-01-23 18:14:53 -08:00
Seth Alves
3496e4cc7a Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-23 16:50:41 -08:00
Anthony J. Thibault
3db8c5b4a7 Fix tilt on tablet for HMD users without hand controllers 2017-01-23 16:36:04 -08:00
Seth Alves
f2ff6fd9e7 allow stylus to work when edit.js is running 2017-01-23 15:52:40 -08:00
Ryan Downe Karpf
3f151cb3d7 Merge pull request #9483 from Atlante45/fix/rescale 
Fix Edit.js rescale for decimal values
 2017-01-23 15:44:10 -08:00
Faye Li Si Fi
f8162970ec filter out yourself from user list 2017-01-23 15:24:33 -08:00
Ryan Downe Karpf
e080746990 Merge pull request #9481 from huffman/fix/edit-collision-names 
Update the name of the collision shapes used in edit.js properties
 2017-01-23 15:10:01 -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
Atlante45
a1962e274d Fix rescale for 0.x values 2017-01-23 14:35:16 -08:00
Ryan Huffman
f6d5a59c8a Fix width of edit.js dropdown to accomodate collision options 2017-01-23 14:18:56 -08:00
Ryan Huffman
d108fabd0b Update the name of the collision shapes used in edit.js properties 
Update the names to be consistent with what is shown on the add model
dialog.
 2017-01-23 13:56:48 -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
Seth Alves
be8bc9652b Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-23 09:44:04 -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
Dante Ruiz
41bf65ed5e home button improvments 2017-01-20 16:35:41 -08:00
Ryan Huffman
ad70431c26 Fix edit.js server script status getting reset when changing properties 2017-01-20 15:34:38 -08:00
Seth Alves
87ea9161e4 avoid bad interaction between far-grab and equip 2017-01-20 14:49:49 -08:00
Faye Li Si Fi
afc85a3afe Don't display users who aren't in a domain 2017-01-20 13:53:09 -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
Anthony J. Thibault
3ebf2ebc9b Updated tablet dimensions to better reflect mockup and 3d model 2017-01-20 12:27:44 -08:00
Dante Ruiz
58e04f8e35 home button works in desktop mode 2017-01-20 19:43:13 +00: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
2d220a557f unmangle merge 2017-01-20 10:29:18 -08:00
Zach Fox
c83cd4a94a Complex checkpoint 2017-01-20 10:24:51 -08:00
Seth Alves
c492319be2 merge from upstream 2017-01-20 10:14:11 -08:00
Seth Alves
caae804318 re-enable haptic pulse when stylus touches tablet overlay 2017-01-20 10:12:15 -08:00
Ryan Downe Karpf
03851d4188 Merge pull request #9441 from davidkelly/dk/makeUsSomeAnalytics 
Some initial analytics for PAL usage
 2017-01-20 08:30:46 -08:00
Anthony J. Thibault
4e4545ac00 Updated orientation of tablet when no hand controllers are present. 2017-01-19 20:27:06 -08:00
Anthony J. Thibault
8304aa7b19 Added ability to mouse move the tablet in 2d desktop mode. 2017-01-19 18:04:08 -08:00
David Kelly
5adc2cc593 Couple improvements 
Only send one message when gain is changed.  Eliminated the bool and
now just sending un-personalMute, etc...
 2017-01-19 17:22:39 -08:00
Dante Ruiz
e1c2c73e5f clean up 2017-01-20 01:04:14 +00:00
Dante Ruiz
a319db3cb4 removed duplicate code 2017-01-20 00:57:48 +00:00
Dante Ruiz
1e7e4576cc comparing with ID instead of strings 2017-01-19 16:38:55 -08:00
Faye Li
763028dad4 refresh icon 2017-01-19 15:46:02 -08:00
Faye Li
5bc0030c8f hook up event bridge 2017-01-19 15:24:56 -08:00
Ryan Huffman
7cd19192d9 Remove dead code in entityProperties.js 2017-01-19 15:00:30 -08:00
Faye Li
bbed26c8fa display all online users 2017-01-19 14:34:28 -08:00
Anthony J. Thibault
2c3c96b600 Fix for broken entity scrolling introduced by 23ea65e2 
this.grabbedEntity was being cleared before entityTouchingExit transition could send the release event.
 2017-01-19 14:23:43 -08:00
Seth Alves
47b59ffae3 don't save tablet to Settings when logging out or switching domains 2017-01-19 14:10:48 -08:00
Zach Fox
64ef3d5665 Merge pull request #9426 from zfox23/PAL_AdminLabel 
PAL: Admin Labels, Updated Letterboxes
 2017-01-19 13:48:05 -08:00
Faye Li
23269c2efb move refresh button to top bar 2017-01-19 13:41:36 -08:00
Ryan Huffman
c015ac1bd5 Add display of server script status to edit.js 2017-01-19 13:27:44 -08:00
Faye Li
193251eb8d background 2017-01-19 13:11:35 -08:00
Faye Li
450b94f641 load font 2017-01-19 12:55:06 -08:00
Seth Alves
18e9b476c5 Merge pull request #9439 from hyperlogic/tablet-ui 
Improved stylus and laser input deadspot
 2017-01-19 12:43:02 -08:00
Faye Li
53404caccf top bar css 2017-01-19 12:15:27 -08:00
David Kelly
d9fbf832e2 Some initial analytics for PAL usage 2017-01-19 11:35:17 -08:00
Seth Alves
41ddfbfd27 clean up grab.js. provide a way to delete old tablets that got saved into Settings on exit 2017-01-19 11:34:38 -08:00
Faye Li
10f512306e successfully polling all online users 2017-01-19 10:58:29 -08:00
Zach Fox
534fcd9399 Potential fix 2017-01-19 10:20:36 -08:00
Seth Alves
0e9ff7f7fc make tablet be an avatar-entity 2017-01-19 10:12:06 -08:00
Seth Alves
eb25e1c12d Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-19 09:41:49 -08:00
Chris Collins
601223aa98 Merge pull request #9402 from ctrlaltdavid/clara-tidying 
Remove a line of old code in Clara.io download
 2017-01-19 09:15:58 -08:00
Dante Ruiz
30b57b62da toggle help 2017-01-19 08:12:49 -08:00
Anthony J. Thibault
2fd691d844 Improved stylus and laser input deadspot 2017-01-18 18:23:00 -08:00
Faye Li Si Fi
5ad1cc6f4d end of day commit 2017-01-18 18:03:16 -08:00
Seth Alves
7c938728e5 don't do constant haptics if stylus touches tablet frame. home button triggers only once per click 2017-01-18 16:56:39 -08:00
Faye Li Si Fi
75b1eba84e initial commit for users.html 2017-01-18 16:10:42 -08:00
Faye Li Si Fi
9865f134db go to users.html on tablet button click 2017-01-18 16:09:12 -08:00
Seth Alves
c4d85c91d0 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui 2017-01-18 15:51:54 -08:00
Seth Alves
3517daaad2 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-18 15:49:12 -08:00
Anthony J. Thibault
56c897cc2f Process the tablet stylus even when reticle is over 2d HUD overlay. 2017-01-18 15:36:09 -08:00
Anthony J. Thibault
fc5c2c8def Fix for glitchy scrolling 2017-01-18 15:32:38 -08:00
Anthony J. Thibault
448e3fda0c fix for JSON parse exception 2017-01-18 15:32:37 -08:00
Anthony J. Thibault
28dac9d802 Lasers now interact with the tablet in edit mode. 2017-01-18 15:32:36 -08:00
Zach Fox
7f57251a0e Remove logs also removed in Master 2017-01-18 13:38:19 -08:00
Faye Li Si Fi
82e0ca2423 create users tablet button 2017-01-18 13:19:19 -08:00
Zach Fox
e9d3c36873 Final commit? 2017-01-18 12:55:25 -08:00
Zach Fox
346cfbfe02 First checkpoint 2017-01-18 12:55:24 -08:00
Seth Alves
02b708feaf Merge pull request #9419 from druiz17/buttonsMissing 
Fixed pal on tablet
 2017-01-18 11:04:10 -08:00
Seth Alves
a8038ce64e cleanups 2017-01-18 10:50:02 -08:00
Seth Alves
1f92b57bf2 switch to model stylus 2017-01-18 10:46:18 -08:00
Dante Ruiz
8172329ec3 Fixed pal 2017-01-18 10:33:58 -08:00
Seth Alves
b57803057d Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-18 06:38:44 -08:00
Seth Alves
0abb41ca2d Merge pull request #9413 from hyperlogic/tablet-ui 
clara.io marketplace works on tablet
 2017-01-18 06:37:55 -08:00
Anthony J. Thibault
03f8a310fc Fix for exception on script ending 2017-01-17 18:17:41 -08:00
Anthony J. Thibault
c6f3eb138a Adjusted tablet spawn position and orientation to be more natural 2017-01-17 18:16:40 -08:00
David Kelly
f5300d3862 Removing some PAL-related interface log spam 
Probably more, but these _seem_ to be the worst
 2017-01-17 17:06:18 -08:00
Zach Fox
7a568ed8a7 Merge pull request #9401 from zfox23/PAL_DisplayName 
PAL: Editable Display Names & Immediate Update
 2017-01-17 16:00:41 -08:00
Anthony J. Thibault
56fc42a2bd clara.io marketplace works on tablet 2017-01-17 15:38:44 -08:00
Ryan Huffman
71e039951c Add reload server scripts button to edit.js 2017-01-17 14:47:57 -08:00
Ryan Huffman
142c7da523 Add serverScripts property support to edit.js 2017-01-17 14:47:06 -08:00
Seth Alves
89d7b8bfc6 call releaseEquip when an equipped entity is dropped with a secondary press 2017-01-17 13:27:01 -08:00
Seth Alves
5c205f5800 avoid an unhook loop if two different hands have passed something back and forth more than once 2017-01-17 10:24:30 -08:00
David Kelly
2460e89a57 CR feedback 2017-01-17 09:53:04 -08:00
Seth Alves
1eb7b668bf merge from upstream 2017-01-17 09:33:49 -08:00
Seth Alves
6bace4f451 merge from upstream 2017-01-17 09:29:30 -08:00
David Kelly
6c07a9aece remove debuggng logspam 2017-01-16 19:06:36 -08:00
David Kelly
6c701bb0f0 remove ignored avatars from PAL when they disconnect 2017-01-16 18:22:53 -08:00
David Rowe
a1fe908380 Remove a lingering line of old code 2017-01-17 12:56:56 +13:00
howard-stearns
0a3236dcc9 handControllerGrab update loop change 2017-01-16 14:54:32 -08:00
David Kelly
95aad3140d Merge pull request #9386 from davidkelly/dk/manageAudioIntervalInPal 
Manage audio interval timer in PAL
 2017-01-16 11:29:05 -08:00
Zach Fox
32e330320e Cleanup after rebase 2017-01-16 11:26:57 -08:00
Zach Fox
6e4a4da92a Checkpoint 2017-01-16 10:42:29 -08:00
Seth Alves
23ea65e2b5 more changes to handle camera-relative-controller joints. 2017-01-16 10:26:16 -08:00
Seth Alves
b617b3a114 put code to delete prim-stylus tip back in 2017-01-16 07:50:36 -08:00
Seth Alves
756d96c368 fix search ray getting left on. started adding stylus models 2017-01-16 07:46:12 -08:00
Seth Alves
c2d6bf10d2 hard-code dimensions on home-button so that it doesn't sometimes show-up with the wrong size 2017-01-16 06:47:50 -08:00
Seth Alves
4a451e95dc don't call release when off state is entered. don't attempt to unhook stylus as a stray child 2017-01-15 11:29:29 -08:00
Seth Alves
b8234ad75c try a different way of keeping track of original parentIDs of grabbed entities 2017-01-15 10:16:28 -08:00
David Kelly
baed3bc3b3 Manage audio interval timer in PAL 
Now, it is only running when PAL is up.  Was running (but doing nothing
before.  Somewhat more efficient this way.
 2017-01-14 12:57:00 -07:00
Seth Alves
e46b40e729 adjust overlay position so that it shows up on new tablet fbx 2017-01-13 16:14:12 -08:00
Seth Alves
e00814dd53 auto-end a near-grab if the parentID is changed to something else 2017-01-13 14:21:44 -08:00
Zach Fox
b9cddc31a9 Checkpoint before implementing Ken's suggestions 2017-01-13 13:00:03 -08:00
Zach Fox
8bb200902f First pass 2017-01-13 12:57:35 -08:00
Seth Alves
9430d2a58d get marketplace-in-tablet working again 2017-01-13 11:03:02 -08:00
Seth Alves
9de8144f0d merge from upstream 2017-01-13 10:17:03 -08:00
Seth Alves
f9a36d68ad Merge pull request #9363 from ctrlaltdavid/21127 
Make Clara.io downloads convert textures to PNG
 2017-01-13 10:14:43 -08:00
Seth Alves
208c4686c4 merge from upstream 2017-01-12 15:44:27 -08:00
David Rowe
d7ab7316a8 Tidying 2017-01-13 12:28:53 +13:00
David Rowe
ad5822d96d Fix first progress message box not closing 2017-01-13 12:26:42 +13:00
David Rowe
632989e031 Fix progress messages not displaying in HMD 2017-01-13 12:09:22 +13:00
Seth Alves
b4870a14fa Merge pull request #9372 from druiz17/removeHud 
Completely removed HUD
 2017-01-12 14:24:40 -08:00
David Rowe
6f2386eabd Fix processing of Clara.io status messages 2017-01-13 11:20:00 +13:00
Seth Alves
9c148d2be0 Merge pull request #9370 from sethalves/tablet-ui-no-accidental-static-on-release 
make sure dynamic things are moving at least a little upon release
 2017-01-12 13:46:50 -08:00
Seth Alves
611a926894 if something dynamic is release and it's not moving, give it a little velocity so that it doesn't end up non-active in bullet 2017-01-12 13:45:03 -08:00
Dante Ruiz
71083645e9 branch update 2017-01-12 20:51:25 +00:00
David Rowe
4dee0efdd3 Use more reliable Clara.io API parameters 2017-01-13 09:12:49 +13:00
Dante Ruiz
a16b229c65 begining to remove hud items 2017-01-12 10:49:45 -08:00
Dante Ruiz
7d84aae670 closing tablet when taking snapshot 2017-01-12 17:29:38 +00:00
David Kelly
e36f6b6521 Merge branch 'master' of github.com:highfidelity/hifi into dk/letsHover 2017-01-12 08:40:04 -07:00
David Rowe
d45e6f00cb Prepare only one download at a time 2017-01-12 22:35:42 +13:00
David Rowe
288c069687 Make cancelling downloads more robust 2017-01-12 22:31:09 +13:00
David Rowe
6e622b3719 Don't request model be centered as work-around for downloads failing 2017-01-12 21:35:24 +13:00
David Rowe
cbe8ce0c19 Improve handling of zip file generation failing 2017-01-12 21:33:32 +13:00
David Rowe
9587b6a80e Fix initial marketplace URL 2017-01-12 20:53:57 +13:00
David Rowe
37da800a14 Display Clara model preparation progress 2017-01-12 15:47:41 +13:00
howard-stearns
88c2c534ad don't set bogus values 2017-01-11 17:01:46 -08:00
howard-stearns
9298bcf628 remove log spam 2017-01-11 16:32:15 -08:00
howard-stearns
5c06841732 use update signal instead of timer 2017-01-11 16:24:05 -08:00
howard-stearns
357b4db1db fix mouse vs lasers, again 2017-01-11 14:24:24 -08:00
howard-stearns
a808a8c749 revert "fix competition between seek mouse and lasers" 2017-01-11 14:23:18 -08:00
David Kelly
1e3a00d1fb Enable the LT and RT signals, use them 
A bit cleaner.  Still have to keep track of which hand is the mouse, but
this removes some of the hacky code.
 2017-01-11 14:43:37 -07:00
David Rowe
9bdcdf73c1 User must be logged into Clara.io site to download 2017-01-12 09:15:01 +13:00
Seth Alves
c76987c179 Merge pull request #9351 from sethalves/tablet-ui-show-lasers-when-scrolling 
update lasers when distance-scrolling a web entity/overlay
 2017-01-11 10:45:25 -08:00
Seth Alves
bacc796730 Merge branch 'master' of github.com:highfidelity/hifi into update-tablet-ui-again 2017-01-11 09:54:26 -08:00
Dante Ruiz
2d8d5401dc updated tablet position 2017-01-11 08:41:07 -08:00
David Rowe
71d6a5cb1d Implement model request and download 2017-01-11 21:33:03 +13:00
David Rowe
530b176d09 Replace Clara download button with own 2017-01-11 16:36:18 +13:00
David Kelly
0a018e133d Blue laser should be enough to hover 2017-01-10 18:23:39 -07:00
Seth Alves
c93d83dadd update lasers when distance-scrolling a web entity/overlay 2017-01-10 16:41:07 -08:00
Dante Ruiz
0b3a7d90f1 removed committed code 2017-01-10 23:26:37 +00:00
David Kelly
4fade3a53e CR feedback 2017-01-10 16:12:02 -07:00
David Kelly
5fd11ade9c minor tweak to hover color for glow effect 2017-01-10 16:00:19 -07:00
Dante Ruiz
d0baa0e303 home button works with the stylus 2017-01-10 14:51:46 -08:00
David Kelly
2d55ed2658 Fix hover - probably my merge didn't get this line 2017-01-10 15:51:24 -07:00
druiz17
ad48e79053 Merge pull request #9346 from hyperlogic/tablet-ui 
In desktop mode, tablet is in front of camera.
 2017-01-10 14:48:15 -08:00
David Kelly
17333ee307 Merge branch 'master' of github.com:highfidelity/hifi into dk/letsHover 2017-01-10 15:24:31 -07:00
druiz17
85c143e64d Merge pull request #9347 from sethalves/tablet-ui-grab-no-patch 
remember previous parentID in the script and try to put it back when releasing
 2017-01-10 14:08:08 -08:00
David Kelly
5c6ae6fe95 HMD hover working now 
Had to hack a bit -- the trigger mappings were not firing so instead I
just get the hand that is triggering (when HMD is active) and handle the
hover almost as before, with mouse move events.  Some thought about how
to map a 'mouse move' event into something where 2 triggers can both be
pressed at same time was in order.
 2017-01-10 14:47:34 -07:00
Anthony J. Thibault
3f0860f9c3 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui 2017-01-10 13:35:29 -08:00
Anthony Thibault
e7a88b5a3c Merge pull request #9343 from druiz17/menuApp 
Moved the context menu to the tablet
 2017-01-10 13:34:44 -08:00
howard-stearns
e67675ac36 color nodes by audio level 2017-01-10 13:24:38 -08:00
howard-stearns
42b2b2154e store audio level in overlay data object (so that they gc properly and we 
have the data to color with).
 2017-01-10 13:08:07 -08:00
Seth Alves
0fc1abc068 remember previous parentID in the script and try to put it back when releasing 2017-01-10 13:00:49 -08:00
Anthony J. Thibault
9db6806026 In desktop mode, tablet is in front of camera. 
* added a new fauxJointIndex for the camera. CAMERA_MATRIX_INDEX = -7
  this can be used to attach objects to the camera.
* WebTablet.js has been changed to detect when entering and exiting HMD mode
  to move the tablet appropriately.

There's a known bug with the tablet entity position lagging the camera by one frame.
 2017-01-10 11:31:45 -08:00
Seth Alves
bff9e9be38 put back code that replaces previous parentID on release 2017-01-10 09:22:36 -08:00
Dante Ruiz
2fc76d64fd clean up unused code and files 2017-01-10 09:13:46 -08:00
Dante Ruiz
6c51edec77 added context menu to tablet 2017-01-10 09:13:45 -08:00
Dante Ruiz
c99f897db1 first commit 2017-01-10 09:13:45 -08:00
Seth Alves
eb4a2b0af5 Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-grab-no-patch 2017-01-10 09:13:34 -08:00
druiz17
28c8d527df Merge pull request #9340 from fayeli/tablet-hide-yellow 
Ability to disable yellow highlight around Web Overlays
 2017-01-10 09:11:51 -08:00
Seth Alves
61f0c56a36 remove code that remembers previous state in userData 2017-01-09 14:20:03 -08:00
Faye Li Si Fi
32eda3a49c redo 2017-01-09 14:02:14 -08:00
Faye Li Si Fi
c39eb6294e undo 2017-01-09 14:01:59 -08:00
Faye Li Si Fi
5323e7f34d set showKeyboardHighlight to false when initialising tablet 2017-01-09 13:36:58 -08:00
Seth Alves
fa803aebe9 use /~/ style to reference includes 2017-01-09 10:21:07 -08:00
David Kelly
fef8c8900f Merge branch 'master' of github.com:highfidelity/hifi into dk/letsHover 2017-01-09 08:51:42 -07:00
David Kelly
409e785aa3 fix un-hover, add some comments 2017-01-09 08:42:43 -07:00
David Kelly
5eff12af34 add hover effect to PAL 2017-01-06 18:09:23 -07:00
Dante Ruiz
7205215baa coding standard fix 2017-01-07 00:38:39 +00:00
Dante Ruiz
07079ad78d fixed bug 2017-01-07 00:22:55 +00:00
Dante Ruiz
4ef5c76a65 fixed issues 3.0 2017-01-07 00:08:53 +00:00
Dante Ruiz
55e7b46790 fixed issues 2.0 2017-01-07 00:07:38 +00:00
Dante Ruiz
cec2692c77 fixed issues 2017-01-07 00:06:42 +00:00
Dante Ruiz
32938861cd indentation fix 2017-01-07 00:03:04 +00:00
Dante Ruiz
31e57a0dcd update branch 2017-01-06 15:35:32 -08:00
Dante Ruiz
19c6a672d9 re-did tablet position 2017-01-06 15:35:32 -08:00
Seth Alves
20a84e7288 Merge pull request #9322 from sethalves/tablet-ui-reenable-web-lasers 
Tablet ui reenable web lasers
 2017-01-06 15:23:16 -08:00
Seth Alves
ad6175857d Merge pull request #9328 from hyperlogic/tablet-ui 
Allow Hifi.SoundEffect to be used in all qml
 2017-01-06 15:21:08 -08:00
Anthony J. Thibault
0860c50a49 Allow Hifi.SoundEffect to be used in all qml 
Including webEntities, webOverlays and the system tablet.
We might want to add this to enable spatial sound effects for the web keyboard.
 2017-01-06 14:01:13 -08:00
Seth Alves
d32866c8cd Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-reenable-web-lasers 2017-01-06 13:32:47 -08:00
Seth Alves
668bc35227 Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-merge 2017-01-06 13:31:13 -08:00
Howard Stearns
36c99a604b Merge pull request #9319 from howard-stearns/edit-button-to-select-in-pal 
Edit button to select in pal
 2017-01-06 13:17:29 -08:00