Commit graph

57802 commits

Author SHA1 Message Date
Elisa Lupin-Jimenez
06ff766952 Drag zip cleaned up, marketplaces stylized, back button fixed 2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez
692aa4c4b9 Clara download working again, still can drag in Blocks zip 2017-08-04 16:58:15 -07:00
Elisa Lupin-Jimenez
9d2be28a8a troubleshooting Blocks injection 2017-08-04 16:58:15 -07:00
Elisa Lupin-Jimenez
c6d5b1a5e6 Removed extraneous print statements 2017-08-04 16:58:15 -07:00
Elisa Lupin-Jimenez
c3d943ff72 Drag zip folder works 2017-08-04 16:57:48 -07:00
Elisa Lupin-Jimenez
ed1ed4f3e0 Blocks drag does not work yet 2017-08-04 16:57:48 -07:00
Elisa Lupin-Jimenez
ca6a323d54 Can drag blocks zip folder into hifi and upload the .obj 2017-08-04 16:57:48 -07:00
Elisa Lupin-Jimenez
4570814145 Added Blocks to marketplace window 2017-08-04 16:56:30 -07:00
Elisa Lupin-Jimenez
a7dd6a5a41 Changed marketplaces message to be more discoverable 2017-08-04 16:56:30 -07:00
Brad Hefta-Gaub
cce0ba9596 Merge pull request #11043 from jherico/threaded_render_checkpoint
Updates from Threaded Rendering project
2017-08-04 15:28:00 -07:00
Brad Davis
0e508432c4 PR comments 2017-08-04 15:27:33 -07:00
Brad Davis
86e3489167 Updates from Threaded Rendering project 2017-08-04 15:22:14 -07:00
Brad Hefta-Gaub
57f62f59fb Merge pull request #11110 from Armads/WL21423
Camera mode on startup is determined by user settings and HMD status
2017-08-04 13:16:34 -07:00
Brad Hefta-Gaub
8f98d0b7c8 Merge pull request #11114 from ElderOrb/case6677
6677: Change "Desktop" App to Say "Exit VR"
2017-08-04 13:09:47 -07:00
beholder
d05e1677c3 6677: Change "Desktop" App to Say "Exit VR" 2017-08-04 23:04:15 +03:00
Brad Hefta-Gaub
0f85769098 Merge pull request #11116 from vladest/fix_menu_caps
Cleanup top menu on menu re instantiation
2017-08-04 12:37:14 -07:00
Brad Hefta-Gaub
0d0a1af166 Merge pull request #11085 from jherico/script_console_crash
Fix for potential crash in JS console
2017-08-04 11:44:20 -07:00
vladest
9058a8e2ca Cleanup top menu on menu reinstantiation 2017-08-04 16:36:00 +02:00
Anthony Thibault
732d0de48d Merge pull request #10976 from humbletim/21446
WL 21446: Add doppleganger "move-as-you-move" roomscale functionality
2017-08-03 17:22:49 -07:00
anshuman64
83e50f894a Merge pull request #11106 from seefo/tracked-objects
Added Vive pucks as an input channel and added new puck-attach script
2017-08-03 17:03:45 -07:00
Howard Stearns
71ce5a6494 Merge pull request #11016 from highfidelity/context-overlays
Context Overlays
2017-08-03 16:28:14 -07:00
seefo
67b5921079 Changed puck-attach to make tracked entities collisionless 2017-08-03 16:01:12 -07:00
seefo
498ac5d0ab Updated version of puck-attach.js 2017-08-03 15:08:06 -07:00
Chris Collins
ddb7d0f1ba Merge pull request #11112 from kencooke/audio-gate-bugfix
Possible fix for "screeching noise" after audio input device changes
2017-08-03 13:55:47 -07:00
druiz17
27f508ad9b Merge pull request #11088 from vladest/fix_opened_running_scripts
Fix opened running scripts
2017-08-03 13:09:50 -07:00
Chris Collins
6d57b4df38 Merge pull request #11108 from jherico/installer_remove_pdb
Fix installer issues
2017-08-03 12:51:58 -07:00
Armads
dff4e6e32c WL21423 Changing order of camera setup steps 2017-08-03 15:40:38 -04:00
vladest
a439cc1837 Make connection to tablet shown signal more consistent, eliminates missed signals 2017-08-03 20:58:44 +02:00
vladest
b049b0f415 Merge conflicts 2017-08-03 19:43:42 +02:00
Brad Davis
4756d4af66 Merge pull request #6 from marko8904/pr11108
Switching to completely silent VC++ redistributable installation
2017-08-03 09:50:29 -07:00
Marko Kudjerski
2279e174e6 Switching to completely silent VC++ redistributable installation 2017-08-03 09:41:41 -07:00
Ken Cooke
6ea4ed80cd Suppress initial PacketType::SilentAudioFrame on audio gate startup 2017-08-03 09:19:08 -07:00
Andrew Meadows
e465186511 Merge pull request #11048 from 1P-Cusack/21389
WL21389 PR1:  Representation of collision shapes need updating (details below).
2017-08-03 09:04:31 -07:00
David Kelly
4b7779f0f5 add flag to outline render flags, fix pal.js/edit.js interaction 2017-08-03 07:57:21 -07:00
Armads
24718e2424 WL21423 Camera mode on startup is determined by user settings and HMD status 2017-08-03 09:03:23 -04:00
Brad Hefta-Gaub
0f73496a44 Merge pull request #11055 from misslivirose/fix-chat-bubble-length
Fix chat bubble length
2017-08-02 23:29:09 -07:00
Brad Hefta-Gaub
8f34250a69 Merge pull request #11109 from kencooke/audio-wasapi-qt591
Update WASAPI plugin
2017-08-02 23:27:29 -07:00
Ken Cooke
3c1607715e Updated WASAPI plugin 2017-08-02 17:42:56 -07:00
seefo
82654c7cda Made requested changed to puck-attach.js 2017-08-02 15:28:26 -07:00
Brad Davis
5a7a6bab70 Remove PDB files, eliminate sixense 2017-08-02 14:08:46 -07:00
seefo
961f748d87 Fixed a potential bug with puck-attach parenting 2017-08-02 13:08:44 -07:00
seefo
620f1a65c0 New puck-attach script 2017-08-02 13:08:44 -07:00
seefo
106b0ad8bb Added Vive pucks as an input channel 2017-08-02 13:08:43 -07:00
druiz17
6680be2a03 Merge pull request #11103 from vladest/fix_toolbar_apps_switch
Fix toolbar apps switch
2017-08-02 12:59:31 -07:00
anshuman64
f3a9481123 Merge pull request #11104 from vladest/audio_mute_mouseover
Audio mic bar show only rectangle on mouse over
2017-08-02 12:32:15 -07:00
vladest
638eeede43 Merge conflict 2017-08-02 20:07:06 +02:00
vladest
7d361c69c2 Audio mic bar show only rectangle on mouse over 2017-08-02 19:52:47 +02:00
Seth Alves
728e7fb253 Merge pull request #11099 from druiz17/bug-blank-tablet-switch
fix blank tablet when switching between HMD and Desktop mode quickly
2017-08-02 10:09:56 -07:00
Seth Alves
2319006868 Merge pull request #11100 from hyperlogic/bug-fix/teleport-crash
Fix for crash when attempting to teleport while avatar was loading
2017-08-02 10:00:13 -07:00
David Kelly
96500d897c Merge pull request #11057 from zfox23/contextOverlays_renderMOde
Context Overlays - new render stuff. PREPARE FOR EDGE HIGHLIGHTING
2017-08-02 09:28:53 -07:00