Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-18 00:39:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
59280 commits 25 branches 0 tags 1.1 GiB
Commit graph

21941 commits

Author SHA1 Message Date
howard-stearns
29b717e22d remove dead code 2017-08-18 14:08:04 -07:00
howard-stearns
bd37679b65 working 2017-08-18 14:03:40 -07:00
Zach Fox
9636fad679 Updates from wireframes 2017-08-18 13:45:30 -07:00
Sam Gondelman
cbf2bb3a61 Merge pull request #10980 from SamGondelman/sharks 
Reduce laser pointer lag
 2017-08-18 13:14:38 -07:00
Zach Fox
1a62f60348 Commit early and often. 2017-08-18 11:30:25 -07:00
Zach Fox
ace1e00158 MOREEEE PROGRESS 2017-08-18 10:52:42 -07:00
Elisa Lupin-Jimenez
65f876acf3 enabled version check 2017-08-18 10:49:40 -07:00
howard-stearns
6e34ab45d6 Merge branch 'master' of https://github.com/highfidelity/hifi into asynchronous-commerce-2 2017-08-18 10:03:33 -07:00
howard-stearns
3d401129fb checkpoint 2017-08-18 10:03:00 -07:00
vladest
2e5e0c94f1 Added login button to Tablet 2017-08-18 15:34:15 +02:00
vladest
4eba09214c Delegate highlighting to delegate item. Make sure ListView will not snap highlighted item 2017-08-18 08:11:29 +02:00
Elisa Lupin-Jimenez
4c28b9f09a attempt to check version of interface 2017-08-17 18:16:41 -07:00
Zach Fox
ccf81f801d All the pieces! 2017-08-17 17:06:48 -07:00
Zach Fox
05648bdbcb Passphrases working 2017-08-17 16:53:38 -07:00
Zach Fox
d052b49a54 Login and picture selection done 2017-08-17 16:34:33 -07:00
Zach Fox
5f69f30551 MOAR PROGRESS 2017-08-17 16:20:50 -07:00
Zach Fox
9135e37078 Go go go go gog o 2017-08-17 15:20:17 -07:00
Zach Fox
eab16fc28c Initial progress 2017-08-17 15:01:25 -07:00
vladest
f3969b0909 Switch off snap behavior 2017-08-17 22:28:42 +02:00
vladest
855f9d8a95 Missed qml file added 2017-08-17 21:47:48 +02:00
vladest
f77b913a14 Added input meter 2017-08-17 20:55:00 +02:00
Elisa Lupin-Jimenez
2b44608ece Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-08-17 10:18:40 -07:00
vladest
1a32a6fac3 Merge branch 'master' into audio_devices_split 2017-08-17 17:20:11 +02:00
vladest
d6c426d064 Reworking according new design 2017-08-17 17:17:02 +02:00
Zach Fox
a4123e3024 Merge pull request #11201 from zfox23/sam_is_cool 
Allow users to take a snapshot from the Secondary Camera!
 2017-08-16 17:03:15 -07:00
Chris Collins
9c9bcd80b8 Merge pull request #11191 from SamGondelman/logging 
Miscellaneous logging fixes
 2017-08-16 15:46:32 -07:00
Zach Fox
ecd1f13197 Allow users to take a snapshot from the secondary camera 2017-08-16 15:34:06 -07:00
vladest
2cca584e58 Merge branch 'master' into audio_devices_split 2017-08-16 22:47:06 +02:00
David Kelly
73e943daaf Merge branch 'master' of https://github.com/highfidelity/hifi into dk/makeMeSomeKeys 2017-08-16 10:13:08 -07:00
Zach Fox
c024bd2d83 Merge pull request #11195 from zfox23/commerce_securityImage1 
Commerce: First pass at security images (NOT FINAL)
 2017-08-16 09:57:55 -07:00
SamGondelman
86cc938a47 Merge remote-tracking branch 'upstream/master' into sharks 2017-08-16 09:54:12 -07:00
SamGondelman
a641fb7a7f rename qvector findRayIntersection to avoid script conflicts 2017-08-15 18:03:52 -07:00
Zach Fox
2fa1bd25a8 Clipping and mipping! 2017-08-15 16:45:46 -07:00
Zach Fox
984a5aea2c You can now spawn infinite copies of items you've previously purchased 2017-08-15 16:32:23 -07:00
Zach Fox
5c157a7397 Move security image to top left 2017-08-15 16:24:14 -07:00
Zach Fox
ccf2d71036 V1 done 2017-08-15 16:11:34 -07:00
Zach Fox
29a9ae28e9 Fixes 2017-08-15 15:36:28 -07:00
Zach Fox
d376630bde Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_securityImage1 2017-08-15 15:03:02 -07:00
Zach Fox
768eb7f91c Getting closer 2017-08-15 15:02:28 -07:00
Liv
aea5f170f2 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/domain-setup 2017-08-15 13:58:22 -07:00
Liv
49eab847fd Refactor handleOctreeFileReplacement, style changes, align with handler for other file types 2017-08-15 13:58:02 -07:00
Liv
c0fa446b75 Remove domain management scripting interface 2017-08-15 13:49:13 -07:00
Zach Fox
b7282cc776 Lots of fixes 2017-08-15 13:46:20 -07:00
Anthony Thibault
342f8acff5 Merge pull request #11176 from hyperlogic/feature/improve-hand-body-collision 
Improve avatar hand vs body collision
 2017-08-15 13:43:21 -07:00
SamGondelman
9bb7e66859 separate raypickscriptinginterface, cleanup 2017-08-15 13:36:41 -07:00
Zach Fox
528d2072f9 Bugfixes and improvements 2017-08-15 12:14:32 -07:00
Anthony J. Thibault
6e0ddadb29 Fix for array size. 2017-08-15 11:45:22 -07:00
David Kelly
0f7db74ef1 missed a couple warnings 2017-08-15 11:44:15 -07:00
Anthony J. Thibault
04006a9f76 code review feedback 2017-08-15 11:19:41 -07:00
Zach Fox
bddce9328b V1 2017-08-15 11:08:03 -07:00
David Kelly
a6390edf46 ugh 2017-08-15 10:10:48 -07:00
Elisa Lupin-Jimenez
3d7995da34 Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-08-15 10:01:24 -07:00
Sam Gateau
2a75cde48a Merge pull request #11185 from samcake/blue 
Fixing the graphics setting for Ambient Occlusion
 2017-08-15 09:26:45 -07:00
Sam Gateau
d624413c14 Merge pull request #11189 from SamGondelman/line3DFix 
Fix drawInFront overlays only rendering in left eye
 2017-08-15 09:26:18 -07:00
David Kelly
c08fce967f forgot a warning 2017-08-15 08:58:16 -07:00
SamGondelman
1c27335193 a couple logging fixes 2017-08-14 17:34:32 -07:00
Seth Alves
21cef482a5 Merge pull request #11190 from druiz17/fix-table-dialog 
Fixed unable to select items in a TreeView
 2017-08-14 17:05:42 -07:00
David Kelly
ef5863d169 warnings squashed 2017-08-14 16:24:50 -07:00
Dante Ruiz
459f2c5cdc fixed tab issue 2017-08-14 16:03:12 -07:00
Dante Ruiz
99617600c4 fix selection issue for TreeView.qml 2017-08-14 15:58:28 -07:00
Zach Fox
823f2fb252 Merge pull request #11181 from cain-kilgore/skybox-changer 
WL 21447 - Create a Skybox Changer
 2017-08-14 15:08:03 -07:00
Zach Fox
ee4a07b10d Merge pull request #11187 from zfox23/context_removeWhenDeleting 
Remove context overlay (if present) when removing entity
 2017-08-14 15:06:20 -07:00
SamGondelman
8163430282 fix depth buffer issue that was messing with drawInFront, plus some small fixes to line3ds 2017-08-14 15:03:14 -07:00
Cain Kilgore
e7a4bff705 Made Changes per Review, added js 2017-08-14 22:47:18 +01:00
druiz17
97aa92bc44 Merge pull request #11170 from cain-kilgore/web-browser-assets 
Added Assets for Web Browser MP Script
 2017-08-14 13:50:11 -07:00
David Kelly
170d2b186b url encode the base64 signature/key 2017-08-14 13:48:09 -07:00
Zach Fox
c1d771842d Remove context overlay (if present) when removing entity 2017-08-14 13:37:50 -07:00
David Kelly
803a5c6690 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/makeMeSomeKeys 2017-08-14 13:15:04 -07:00
David Kelly
b4b592cc00 one key file with (for now) both public and private keys in there 2017-08-14 12:53:10 -07:00
Zach Fox
199ba3bff0 Use new JSON inventory format 2017-08-14 11:55:21 -07:00
samcake
f86f22309b fix render.json 2017-08-14 11:31:40 -07:00
samcake
db1536c521 Reactivate watch dog exit 2017-08-14 10:47:58 -07:00
samcake
05b78b0df0 Just fixing the ao combo box field 2017-08-14 10:46:33 -07:00
Cain Kilgore
28c81534c4 Updated Text at Top 2017-08-14 05:11:53 +01:00
vladest
b22745d57a Fix binding loops 2017-08-12 12:52:35 +02:00
samcake
ff98dedbb2 Debugging the graphics fields activation 2017-08-11 18:10:44 -07:00
Anthony J. Thibault
cd57c0706a more warning fixes 2017-08-11 17:46:50 -07:00
Cain Kilgore
8c9f3ae977 Skybox Changer PR 2017-08-12 01:35:48 +01:00
David Kelly
f784bc42de Initial cut using RSA keys for now 2017-08-11 16:54:04 -07:00
Zach Fox
0835b7b8e6 Bugfix 2017-08-11 16:36:26 -07:00
Zach Fox
d8e5f7a067 Small improvements 2017-08-11 16:32:35 -07:00
Zach Fox
c38837c200 Remove fixmes 2017-08-11 16:21:39 -07:00
Zach Fox
9120e678f1 Use asynchronous commerce API 2017-08-11 16:17:13 -07:00
howard-stearns
d7f83a2fdf Merge branch 'master' of https://github.com/highfidelity/hifi into asynchronous-commerce 2017-08-11 15:53:53 -07:00
Anthony J. Thibault
9e1218b4a4 Use k-dop collision to prevent hands from entering body. 2017-08-11 14:50:00 -07:00
Zach Fox
a21ff75a49 Big progress! 2017-08-11 12:54:55 -07:00
howard-stearns
8ee54c7b36 Merge branch 'master' of https://github.com/highfidelity/hifi into asynchronous-commerce 2017-08-11 11:46:20 -07:00
howard-stearns
551ea921cd Make API asynchronous, for communicating with server 2017-08-11 11:45:40 -07:00
vladest
af39b5660b Merge branch 'master' into audio_devices_split 2017-08-11 20:42:49 +02:00
vladest
560696e41c Split logic and interface for HMD and desktop devices. Added CheckBox control based on QQC2 2017-08-11 20:39:17 +02:00
Zach Fox
080c6da71a Get HFC balance from QmlCommerce API 2017-08-11 10:49:11 -07:00
Zach Fox
e1064938cd Add inventory; also fix some bugs 2017-08-11 10:31:32 -07:00
SamGondelman
f058781f49 just kidding shared_mutexes are c++17 2017-08-11 10:07:20 -07:00
Elisa Lupin-Jimenez
6c2bf63392 Back button works 2017-08-10 17:51:19 -07:00
Anthony J. Thibault
49adf04913 Added Developer > Avatar > Show Detailed Collision menu option 2017-08-10 16:36:09 -07:00
Elisa Lupin-Jimenez
da5bb03187 Trying to add in a back button 2017-08-10 16:34:37 -07:00
SamGondelman
e4c954e862 merge from master 2017-08-10 16:30:33 -07:00
SamGondelman
353a3e8c68 properly fix AA stenciling 2017-08-10 16:07:40 -07:00
SamGondelman
96b179386f working on fixing non-AA overlays 2017-08-10 16:07:40 -07:00
Seth Alves
972a24fea9 Merge pull request #11169 from anshuman64/new-branch 
High Fidelity Interface Application Rename
 2017-08-10 15:57:10 -07:00
Anthony J. Thibault
ae98974d79 improve 14-dop generation for avatar joint collision 
Also added debug rendering functionality.
 2017-08-10 15:52:51 -07:00
SamGondelman
4c55849290 merge from master 2017-08-10 15:43:23 -07:00
SamGondelman
d0d5ac8dd1 switch to stl wherever possible, use bitset instead of unsigned ints 2017-08-10 15:33:55 -07:00
Brad Davis
eb143c42d0 Merge pull request #11168 from sethalves/avatar-url-command-line-flag 
cancel effects of --replaceAvatarURL when avatar is changed with preference dialog
 2017-08-10 15:18:21 -07:00
Cain Kilgore
4e81ebf85c Added Assets for Web Browser MP Script 2017-08-10 22:53:35 +01:00
Seth Alves
1d07bc3b4e try, try again 2017-08-10 14:32:52 -07:00
Elisa Lupin-Jimenez
b0c91547b4 Fixed WebGL rendering 2017-08-10 14:14:09 -07:00
Seth Alves
ff83a8158b cancel effects of --replaceAvatarURL when avatar is changed with preference dialog 2017-08-10 13:49:48 -07:00
Sam Gateau
79f3be1efe Merge pull request #11021 from Zvork/fade2 
Fade dissolve effect  JUST AVATARS
 2017-08-10 13:48:30 -07:00
Anshuman Dewangan
f79bf4e009 High Fidelity Interface rename 2017-08-10 13:40:00 -07:00
Zach Fox
334f71e4fb Merge pull request #11166 from howard-stearns/commerce-blance-inventory 
balance and inventory stubs
 2017-08-10 13:33:56 -07:00
howard-stearns
8f0fd10e2b fix 2017-08-10 12:51:05 -07:00
howard-stearns
ca13d58b0b blance and inventory stubs 2017-08-10 12:44:50 -07:00
Seth Alves
d812c293e8 Merge pull request #11120 from mukulHF/bug-lock-default-scripts 
Disable the ability for a user to edit default scripts if developer settings is not enabled - adjusting values
 2017-08-10 12:29:23 -07:00
druiz17
005c5a9278 Update TabletRunningScripts.qml 2017-08-10 12:26:57 -07:00
anshuman64
95b1d5fb91 Merge pull request #11146 from ElderOrb/help_buttons 
5351: Help Button has Old UI
 2017-08-10 11:56:11 -07:00
Elisa Lupin-Jimenez
af95d7f892 Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-08-10 10:13:27 -07:00
anshuman64
0f163a6a7c Merge pull request #11153 from hyperlogic/bug-fix/you-spin-me-right-round-baby-right-round 
Bug fix for HMD roll causing avatar yaw when standing still
 2017-08-09 18:00:03 -07:00
Seth Alves
f125ef04f1 Merge pull request #11150 from ElderOrb/Case6742 
6742: Multiple highlighted buttons
 2017-08-09 17:53:55 -07:00
Elisa Lupin-Jimenez
d3c76c99c2 See all markets button working again 2017-08-09 17:28:05 -07:00
Liv
6bde4db0d7 wrap in marketplace check and change landing point 2017-08-09 16:35:25 -07:00
Elisa Lupin-Jimenez
a2e407f786 fixed merge conflicts in marketplacesInject.js 2017-08-09 15:59:20 -07:00
Elisa Lupin-Jimenez
1ac9536f95 Downloading blocks from marketplace in own asset folder 2017-08-09 15:56:07 -07:00
Anthony J. Thibault
4d845bd208 Bug fix for HMD roll causing avatar yaw when standing still 
HMD roll should only cause the avatar to yaw when actively driving.
 2017-08-09 15:52:27 -07:00
Zach Fox
65f9b0052f Working buy button 2017-08-09 13:59:21 -07:00
Sam Gondelman
85c3f94976 Merge branch 'master' into sharks 2017-08-09 13:36:18 -07:00
Howard Stearns
cc634a2d1b Merge pull request #11148 from zfox23/commerce_singleSetting 
New commerce mode now depends on 1 setting; bugfixes; Tablet -> TAB key
 2017-08-09 13:25:10 -07:00
howard-stearns
f1ab91edd1 PR feedback 2017-08-09 12:41:16 -07:00
beholder
802b5733c5 6742: Multiple highlighted buttons 2017-08-09 22:26:13 +03:00
howard-stearns
a726b01263 remove duplicated line 2017-08-09 12:11:12 -07:00
howard-stearns
7414bf0d9a oops. didn't test what I thought I did 2017-08-09 12:09:03 -07:00
howard-stearns
1cf81495ab basic commerce infrastructure 2017-08-09 11:50:52 -07:00
Zach Fox
33fa8c4f86 Fix bugs and also change to single setting 2017-08-09 11:44:09 -07:00
Elisa Lupin-Jimenez
17acf0520d Download from blocks in marketplace working 2017-08-09 11:08:14 -07:00
beholder
836b09b83d 5351: Help Button has Old UI 2017-08-09 20:56:02 +03:00
Liv
0784686450 small typo fix 2017-08-09 10:17:31 -07:00
howard-stearns
9349e72eeb Merge branch 'master' of https://github.com/highfidelity/hifi into buy 2017-08-09 10:00:36 -07:00
Liv
bd1619b1b2 update error message wording 2017-08-09 09:14:46 -07:00
Elisa Lupin-Jimenez
d599753771 Started blocks download catch, fixed a debug typo 2017-08-08 18:43:35 -07:00
SamGondelman
3645bf04b6 possibly fix most annoying crash 2017-08-08 18:10:53 -07:00
Zach Fox
4f85923517 Tons of fixes and improvements! 2017-08-08 17:58:41 -07:00
Zach Fox
03729bf165 Actually fix context menu 2017-08-08 16:38:12 -07:00
Zach Fox
871a5ff1ab Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_CheckoutQMLInvestigation 2017-08-08 15:53:22 -07:00
Zach Fox
69fc69cffb Comment fix and overlay click fix 2017-08-08 15:52:59 -07:00
algoworks
15983150e3 Merge branch 'master' of https://github.com/highfidelity/hifi 2017-08-08 14:50:57 -07:00
Zach Fox
7d26d2d88b Switch and fix overlay clicks 2017-08-08 14:29:44 -07:00
algoworks
e00ef220da 3 file changes, build directory 2017-08-08 14:01:28 -07:00
Liv
ab8f5c1288 add user logging detail message 2017-08-08 13:55:07 -07:00
SamGondelman
684001a756 workaround deadlock in editRenderState 2017-08-08 11:11:19 -07:00
Liv
3f30162215 Make spawning point not 0,0,0 and change error message 2017-08-08 09:44:36 -07:00
SamGondelman
6d253fcc5f cleaning up 2017-08-07 18:37:55 -07:00
Zach Fox
1493a310af Beginning of stack stuff 2017-08-07 17:02:24 -07:00
Zach Fox
45424f0cfe Prototype V1 2017-08-07 16:25:42 -07:00
Zach Fox
7e922cb2c2 Layout 2017-08-07 16:16:17 -07:00
Zach Fox
517128a939 More steps 2017-08-07 16:03:42 -07:00
SamGondelman
42147640e2 remove LaserPointerManager as a dependency 2017-08-07 14:18:56 -07:00
SamGondelman
489e08aef0 Merge branch 'master' of https://github.com/highfidelity/hifi into sharks 2017-08-07 13:29:00 -07:00
Seth Alves
60895872ca Merge pull request #11123 from vladest/attachment_speedup 
Remove snap to item. Add caching for scrolling speedup
 2017-08-07 13:18:50 -07:00
Seth Alves
af1e27dc36 Merge pull request #11053 from hyperlogic/feature/secondary-pose-support 
Improved support for Vive Trackers on biceps
 2017-08-07 13:11:48 -07:00
howard-stearns
9bad26c2db stub files 2017-08-07 12:51:30 -07:00
mukulHF
780644fa38 Update TabletRunningScripts.qml 2017-08-07 11:37:27 -07:00
mukulHF
fadc19d8bb Update RunningScripts.qml 2017-08-07 11:36:37 -07:00
mukulHF
cf7b2ba547 Update LetterboxMessage.qml 2017-08-07 11:35:42 -07:00
mukulHF
3ca2bc0571 Update DesktopLetterboxMessage.qml 2017-08-07 11:35:27 -07:00
Zach Fox
07a4beac73 Fix the crash 2017-08-07 10:28:36 -07:00
Liv Erickson
da70071b5a Merge branch 'master' into feat/domain-setup 2017-08-07 10:04:54 -07:00
mukulHF
e9f268ff26 Update LetterboxMessage.qml 2017-08-07 10:01:50 -07:00
mukulHF
4382f22622 Update DesktopLetterboxMessage.qml 2017-08-07 10:01:26 -07:00
Ken Cooke
1fc050fdef Fix _devices access via shared_ptr 2017-08-07 08:11:43 -07:00
Seth Alves
c570d483d8 Merge pull request #11113 from elisa-lj11/zip_drag 
Zip drag (needs review)
 2017-08-07 03:17:31 -07:00
Seth Alves
8798e47f99 Merge pull request #11117 from hyperlogic/bug-fix/misc-crash-fixes 
Crash fixes for avatars without Hips, and web overlays
 2017-08-06 18:48:07 -07:00
Brad Davis
1ecca9fd29 Merge branch 'master' into zzmp-audio/peak-values 2017-08-06 17:21:00 -07:00
vladest
134bad9534 fixed typo leads to lost touch or mouse release events 2017-08-06 19:09:40 +02:00
vladest
3a013bf86e Remove snap to item. Add caching for scrolling speedup 2017-08-05 13:28:08 +02:00
SamGondelman
8b1c24e636 added setLockEndUUID, update handControllerGrab and grab 2017-08-04 18:26:11 -07:00
mukulHF
1ce1e29368 Update DesktopLetterboxMessage.qml 2017-08-04 17:44:43 -07:00
mukulHF
7aad4af533 Update LetterboxMessage.qml 2017-08-04 17:44:16 -07:00
Elisa Lupin-Jimenez
a246c59277 changed debug print for unsupported entity files 2017-08-04 16:59:21 -07:00
Elisa Lupin-Jimenez
8c9ce82986 Fixed Mac and Ubuntu platform build issue (hopefully) 2017-08-04 16:58:33 -07:00
Elisa Lupin-Jimenez
ebc28a6557 Renamed isBlocks to isZip, added debug print for non-entity files 2017-08-04 16:58:33 -07:00
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
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
Anthony J. Thibault
98bbe887b9 Merge branch 'master' into feature/secondary-pose-support 2017-08-04 16:11:13 -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
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
SamGondelman
bd942ec406 merge from master 2017-08-04 12:17:54 -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
Anthony J. Thibault
9fdc044ae1 Crash fix for web3d overlays that are not the tablet. 2017-08-04 11:19:59 -07:00
Anthony J. Thibault
85500841fb Crash fix for avatars that are missing "Hips", "Head" and other required joints. 2017-08-04 11:19:09 -07:00
Dante Ruiz
9be60ee658 made more requested changes 2017-08-04 17:57:53 +01:00
Dante Ruiz
b72ac63662 Merge branch 'master' of github.com:highfidelity/hifi into bug-lock-default-scripts 2017-08-04 17:19:06 +01:00
vladest
9058a8e2ca Cleanup top menu on menu reinstantiation 2017-08-04 16:36:00 +02: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
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
b049b0f415 Merge conflicts 2017-08-03 19:43:42 +02: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
Dante Ruiz
1e1ddf2941 making requested changes 2017-08-02 22:22:55 +01:00
Brad Davis
5a7a6bab70 Remove PDB files, eliminate sixense 2017-08-02 14:08:46 -07:00
Mohammed Nafees
93ad1b6cbf Add link in help page to report a problem 2017-08-03 01:54:21 +05:30
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
vladest
7d361c69c2 Audio mic bar show only rectangle on mouse over 2017-08-02 19:52:47 +02:00
Dante Ruiz
90db4aa9c0 Merge branch 'master' of github.com:highfidelity/hifi into bug-lock-default-scripts 2017-08-02 18:18:17 +01:00
vladest
2d4396ac8e Merge branch 'master' into fix_toolbar_apps_switch 2017-08-02 16:34:49 +02:00
vladest
4330e31212 Toolbar mode: 1. Fixed switching between different apps. 2. Fixed switching from Create 2017-08-02 16:32:09 +02:00
David Kelly
588afaaa85 unused variable... 2017-08-01 16:59:42 -07:00
Anthony Thibault
8a87ebd2a8 Merge pull request #11036 from AndrewMeadows/walkabout 
fix bugs preventing avatar from walking on spherical planet
 2017-08-01 16:36:35 -07:00
David Kelly
762b409814 unused variable 2017-08-01 16:20:33 -07:00
David Kelly
479d6abc58 Merge remote-tracking branch 'upstream/context-overlays' into contextOverlays_renderMOde 2017-08-01 16:18:20 -07:00
David Kelly
6ae516c46a Merge remote-tracking branch 'upstream/context-overlays' into contextOverlays_renderMOde 2017-08-01 15:45:34 -07:00
anshuman64
9bf4977e09 Merge pull request #11096 from humbletim/21487 
WL 21487: Fix Camera behavior in Mirror mode
 2017-08-01 14:59:06 -07:00
Dante Ruiz
51652482a4 Merge branch 'master' of github.com:highfidelity/hifi into bug-lock-default-scripts 2017-08-01 20:51:56 +01:00
anshuman64
97b4fd4032 Merge pull request #11071 from vladest/fix_menu_landscape 
Fix Landscape mode, when menu pushed in Create mode
 2017-08-01 11:29:15 -07:00
humbletim
3a9b8c02a6 * disable Avatar "follow" / recentering behavior when using HMD + "View > Mirror" 
* restore access to "View > Mirror" from HMD mode
 2017-08-01 13:41:28 -04:00
Brad Davis
bea91be521 Fix for potential crash in JS console 2017-07-31 17:50:30 -07:00
David Kelly
b371c875c4 undo tab mapping to bring up tablet, for now 2017-07-31 14:46:26 -07:00
David Kelly
43c8079f03 temporary inspectionMode setting to turn ContextOverlays completely off/on 2017-07-31 13:55:43 -07:00
David Kelly
bd7c4b3b26 Merge remote-tracking branch 'upstream/master' into context-overlays 2017-07-31 13:14:53 -07:00
Anthony J. Thibault
2383933252 Merge branch 'master' into feature/secondary-pose-support 2017-07-31 10:55:40 -07:00
vladest
e30e0b1a5f Make sure Tablet will be shown with opened running scripts dialog. Fixed potential stack corruption 2017-07-31 16:45:21 +02:00
Olivier Prat
490aad2a06 Merged from master 2017-07-31 12:00:35 +02:00
humbletim
3bcbec87e0 Merge remote-tracking branch 'upstream/master' into 21180-C++ 2017-07-30 16:15:34 -04:00
Brad Davis
7d18d2e017 Restore corrected touch event simulation 2017-07-29 08:51:51 -07:00
vladest
3c9ab36416 Remove already already implemented fix 2017-07-29 12:00:41 +02:00
vladest
0333849aa8 Merge branch 'master' into fix_menu_landscape 2017-07-29 11:44:58 +02:00
Brad Davis
5946a965da Disable touch event emulation for tablet until we fix crash 2017-07-28 18:54:16 -07:00
Chris Collins
cfd9f8b64e Merge pull request #11077 from jherico/overlay_event_crashes 
Fix overlay event handling thread issues
 2017-07-28 15:56:09 -07:00
anshuman64
e11388f7f7 Merge pull request #11068 from ctrlaltdavid/dominant-hand-signal 
Add a "dominant hand changed" signal
 2017-07-28 15:17:50 -07:00
Brad Davis
d42052a299 Fix overlay event handling thread issues 2017-07-28 14:56:21 -07:00
Stephen Birarda
17dd028ec7 make Paths available to desktop and tablet QML context 2017-07-28 14:23:18 -07:00
Andrew Meadows
d4e72df928 Merge pull request #10711 from burtsloane/midi 
Midi support for Entities
 2017-07-28 10:51:43 -07:00
utkarshgautamnyu
f407bf6f5a Merge pull request #11064 from highfidelity/bug/6513 
Enabled multiple selection and deletion in Asset Browser
 2017-07-28 09:46:34 -07:00
Andrew Meadows
3ec9640ea1 fix calculation of walk motor for HMD 2017-07-28 09:22:47 -07:00
vladest
45934cb53e Fix Landscape mode, when menu pushed in Create mode. Fix pages gets white in Create mode 2017-07-28 18:04:29 +02:00
Brad Davis
bb57504498 Prevent deadlocks from Overlays update logic recursing into other Overlays calls 2017-07-27 19:39:22 -07:00
David Rowe
c1d179eba1 Add "dominant hand changed" signal 2017-07-28 14:20:49 +12:00
Brad Hefta-Gaub
d572510770 Merge pull request #11009 from AndrewMeadows/fix-QueryAACube 
update EntityItem bounding cube when on changed dimensions
 2017-07-27 18:21:06 -07:00
Anthony J. Thibault
6c2b6674bb load and save shoulderConfig to settings. 2017-07-27 17:33:54 -07:00
utkarshgautamnyu
1beec26003 Update TabletAssetServer.qml 2017-07-27 15:55:55 -07:00
utkarshgautamnyu
a6a4bd5923 Update AssetServer.qml 2017-07-27 15:55:30 -07:00
utkarshgautamnyu
07fc9a6dc3 Indentation fixes 2017-07-27 14:53:49 -07:00
utkarshgautamnyu
4680911264 Enabled multiple selection and multiple deletion in asset browser 2017-07-27 14:47:30 -07:00
Brad Hefta-Gaub
9b3be6d164 Merge pull request #10808 from humbletim/21400 
WL 21400 -- Setting that lets you switch from cursor to reticle
 2017-07-27 13:16:58 -07:00
SamGondelman
e3288a9004 fix flicker, scissor warning, and handControllerGrab sphere size 2017-07-27 11:17:30 -07:00
Anthony J. Thibault
bcb4cc32d2 another clang error fix 2017-07-27 10:26:10 -07:00
Anthony J. Thibault
778c8bf9a7 clang build error fix 2017-07-27 10:08:35 -07:00
anshuman64
bcb819206b Merge pull request #11037 from sethalves/bug-camera-mode-mods 
use Qt menu hotkeys to drive camera-mode changes
 2017-07-27 09:44:53 -07:00
Anthony J. Thibault
8f5c41af2d changed _controllerPoseMap from unordered_map to map 2017-07-27 09:44:37 -07:00
Anthony J. Thibault
78c6564174 Merge branch 'master' into feature/secondary-pose-support 2017-07-27 09:09:32 -07:00
Anthony J. Thibault
8dc9714282 Pass armCircumference and shoulderWidth to qml. 2017-07-27 09:08:34 -07:00
Chris Collins
853101fcbc Merge pull request #10928 from 1P-Cusack/21362 
Add point and thumb up gestures to the Vive.
 2017-07-26 22:07:14 -07:00
Sam Gondelman
fcaa39b245 Merge branch 'master' into sharks 2017-07-26 18:18:09 -07:00
SamGondelman
5e4a83dad9 defaultRenderStates, handControllerGrab.js, fix teleport.js a little 2017-07-26 17:58:39 -07:00
Zach Fox
8a7561d61b IT'S WORKING SOB SOB SOB 2017-07-26 16:35:55 -07:00
Zach Fox
39cb0bc357 WHYYYY DOESN'T THIS WORK 2017-07-26 16:14:35 -07:00
Seth Alves
9c9cfad4c4 use ctrl rather than alt to activate camera-mode shortcuts 2017-07-26 15:56:08 -07:00
Seth Alves
71023bcb1b Merge branch 'master' of github.com:highfidelity/hifi into bug-camera-mode-mods 2017-07-26 15:54:57 -07:00
Zach Fox
3a05219c59 Closer still 2017-07-26 14:10:41 -07:00
burtsloane
d4ae298a8d Merge branch 'master' into midi 2017-07-26 13:59:07 -07:00
Burt Sloane
4f7243e444 Merge branch 'master' of https://github.com/burtsloane/hifi into midi 2017-07-26 13:30:57 -07:00
Zach Fox
65c28ca821 Bugfixes 2017-07-26 13:17:51 -07:00
Zach Fox
62f6c10b2b Renaming things; bugfixes; improvements 2017-07-26 12:45:10 -07:00
Zach Fox
24ddbb4b22 Silly bug preventing the whole thing from working 2017-07-26 12:08:55 -07:00
Zach Fox
9147bc21d0 Getting there. 2017-07-26 11:41:27 -07:00
Liv
be860d6c87 small string fix 2017-07-26 10:20:29 -07:00
utkarshgautamnyu
71ddf1e7c1 Removed Compound Collision type 2017-07-26 10:20:17 -07:00
Liv
63d637c4db Add line to move user back to origin to be near new content 2017-07-26 10:02:21 -07:00
Liv
57b27a7bb7 change packet type to be sourced, change from packet list to single packet 2017-07-25 20:17:20 -07:00
Zach Fox
9020607ccf First pass 2017-07-25 17:54:46 -07:00
utkarshgautamnyu
24f4468fd5 added additional collision types to asset browser in tablet mode 2017-07-25 17:12:13 -07:00
utkarshgautamnyu
65192aa620 added additional collision types to asset browser and new model dialog 2017-07-25 17:12:13 -07:00
Anthony J. Thibault
572213daaf Added shoulder config to Controller Settings UI 
All offset values in Controller Settings UI are now in cm.
 2017-07-25 17:05:07 -07:00
Zach Fox
7702bfceaa Big cleanup and preparation; Actually fix desktop tablet 2017-07-25 16:12:32 -07:00
SamGondelman
3a8ad8b631 switch to QUuids 2017-07-25 15:11:44 -07:00
SamGondelman
658acd91f2 experimenting with drawHUDLayer depth testing 2017-07-25 14:17:39 -07:00
SamGondelman
0117950546 can edit drawHUDLayer property 2017-07-25 12:57:52 -07:00
1P-Cusack
9e25c3b7d8 Renaming 'not' route to 'logicalNot'. 
Build was failing on non-windows platforms because 'not' is a reserved
word in C++ (which Visual Studio happily ignores).
 2017-07-25 14:47:34 -04:00
Liv
9458e4a1eb Merge branch 'master' of https://github.com/highfidelity/hifi into feat/domain-setup 2017-07-25 11:32:13 -07:00
Liv
2377e4a5db fix message formatting 2017-07-25 11:32:02 -07:00
Liv
89a1c7a697 code cleanup 2017-07-25 11:24:57 -07:00
Zach Fox
c71dca5b4b Missed a magic number 2017-07-25 11:15:44 -07:00
Zach Fox
256b7efdd2 Handle the case when the camera is inside the bounding box of an entity 2017-07-25 11:06:54 -07:00
SamGondelman
3149c3e16c warnings 2017-07-25 10:16:50 -07:00
Zach Fox
40038ce54b Merge branch 'master' of https://github.com/highfidelity/hifi into context-overlays 2017-07-25 09:33:07 -07:00
Andrew Meadows
9d1fba3a3b Merge pull request #10821 from ctrlaltdavid/21418 
Don't execute body of controllers' plugin update methods if not enabled
 2017-07-25 08:51:17 -07:00
Ryan Huffman
9421e6ebb6 Merge pull request #11029 from cain-kilgore/dominant-hands 
WL 21453 - Add a "Dominant Hand" setting
 2017-07-25 08:01:31 -07:00
Cain Kilgore
f9204a7034 Now it should appear.. 2017-07-25 09:03:47 +01:00
Cain Kilgore
2f857a6d1a Forgot a file 2017-07-25 06:05:06 +01:00
SamGondelman
3c8b964cc9 replace setHandLasers with drawHUDLayer overlay property 2017-07-24 18:16:40 -07:00
Liv
32ddffd9c8 Move logic for confirmation into Application.cpp for handling files directly 2017-07-24 18:09:32 -07:00
Cain Kilgore
280a7a7e42 Fixing Styling, added Preference to Tablet, Moved Location to Avatar Tuning 2017-07-25 01:48:55 +01:00
Seth Alves
766c6f48c3 third person camera is alt+G rather than alt+O 2017-07-24 17:43:01 -07:00
Anthony J. Thibault
33a1d6e225 Merge branch 'master' into feature/secondary-pose-support 2017-07-24 17:27:33 -07:00
Anthony J. Thibault
9f6641ed10 Shoulder puck calibration work in progress 
* AnimInverseKinematics: debug draw for secondary targets
* AnimInverseKienmatics: better clean up of ik target debug draw
* GeometryUtil: added findPlaneFromPoints()
* ViveControllerManager: external dependency on eigen
* ViveControllerManager: record history of left/right hand controllers
* ViveControllerManager: use history to determine user shoulder location for better calibration
* ViveControllerManager: pass defaultToReferenceMat by const ref to calibrate functions.
* CMake: added external depenency to eigen linear algebra library.
 2017-07-24 17:22:48 -07:00
Zach Fox
c22798a8e6 Offset tablet position to left of screen per feedback 2017-07-24 17:16:07 -07:00
Seth Alves
97756e6140 accidently deleted a break 2017-07-24 16:12:03 -07:00
Seth Alves
82a787a753 use alt+h for mirror-mode 2017-07-24 16:04:11 -07:00
Andrew Meadows
8c55476c65 fix motor direction when walking upside down 
also maintain worldUp and remove unnecessary cruft
 2017-07-24 16:00:13 -07:00
Andrew Meadows
f598b1f1f5 fix spelling typo in comment 2017-07-24 16:00:13 -07:00
Andrew Meadows
29be9aee65 move nextAttitude() from AvatarData to MyAvatar 2017-07-24 16:00:13 -07:00
Andrew Meadows
f0871c6878 avoid unnecessary and expensive gets 2017-07-24 16:00:13 -07:00
Seth Alves
e53badf88b use alt+f for 1st person camera and alt+o for 3rd 2017-07-24 15:56:37 -07:00
Cain Kilgore
84609f27e3 Final Change - They're now Radio Boxes. 2017-07-24 23:53:03 +01:00
Seth Alves
afc7eaff8d Merge branch 'bug-camera-mode-mods' of github.com:druiz17/hifi into bug-camera-mode-mods 2017-07-24 15:21:37 -07:00
Cain Kilgore
9c152ddc6f Ticking left will keep it on left, not right 2017-07-24 22:30:43 +01:00
Zach Fox
223ed5b59a Hack to mod tablet orientation when clicking context overlay 2017-07-24 14:29:06 -07:00
humbletim
de6975b227 add missing cursor-*.pngs 2017-07-24 17:16:13 -04:00
Andrew Meadows
a44b33ab11 Merge pull request #11023 from jherico/audio_deadlock 
Fix for audio deadlock & audio device selection
 2017-07-24 14:03:29 -07:00
SamGondelman
ee02a0bff4 fix build error 2017-07-24 12:44:54 -07:00
Cain Kilgore
9ff7891c88 Fixed reference error, Gustavo should build now. 2017-07-24 19:56:02 +01:00
Cain Kilgore
64ba159adf Updating Small Reference 2017-07-24 19:12:14 +01:00
Cain Kilgore
fd2264f7c9 removed duplicate 2017-07-24 19:05:49 +01:00
Cain Kilgore
e6fd85f45a Some code cleanup 2017-07-24 19:02:40 +01:00
Cain Kilgore
42742ba1f9 Changed the Return to a String "left/right" instead. 2017-07-24 18:31:16 +01:00
Brad Hefta-Gaub
0ba8d43522 Merge pull request #10994 from vladest/avatar_default_speeds 
Change default mouse speeds for avatar
 2017-07-24 10:13:27 -07:00
Stephen Birarda
26be7e1a01 Merge pull request #10999 from birarda/bug/html-path-on-mac-build 
fix create tab load on OS X
 2017-07-24 10:12:40 -07:00
Chris Collins
ceb218f4cc Merge pull request #10798 from humbletim/add-persistent-console-history 
Save JS "Console..." history across sessions
 2017-07-24 09:24:04 -07:00
Cain Kilgore
a4cf27402d Tabs and Cleanup of Code 2017-07-24 06:27:14 +01:00
Cain Kilgore
630922dd95 Dominant Hands Branch Initial Commit 
Adds a new option in the Avatar Basics section of the Avatar Settings.

API Accessible Functions:
MyAvatar.getUseAlternativeHand()
MyAvatar.setUseAlternativeHand()

Defaults to false (Right Hand). Will return True if set to Left Hand.
 2017-07-24 06:18:24 +01:00
humbletim
300b926464 only call QList::constFirst when history list isn't empty 2017-07-23 14:12:52 -04:00
Liv
76cc833747 move domain management into a separate API 2017-07-21 17:44:53 -07:00
Dante Ruiz
95299244cf fixed running scripts popup 2017-07-22 00:24:24 +01:00
Dante Ruiz
06b4c53d28 only desktop mode 2017-07-22 00:15:26 +01:00
Dante Ruiz
7bf3f45e39 finished the locked default scripts 2017-07-21 23:32:25 +01:00
David Kelly
e7c6ba9ae2 unused var 2017-07-21 14:44:45 -07:00
Zach Fox
811be15bbc Another attmept to fix the tablet 2017-07-21 14:02:19 -07:00
David Kelly
8de09affad Merge pull request #11025 from davidkelly/dk/contextOverlayPositioning 
reposition context overlay when far away
 2017-07-21 13:35:57 -07:00
Zach Fox
796292dd4c Fix the tablet 2017-07-21 13:21:13 -07:00
David Kelly
9e31024a0e merged with new stuff too 2017-07-21 13:16:41 -07:00
vladest
615a3c52e4 Ooops.. 2017-07-21 21:26:33 +02:00
Zach Fox
a346e5ccf6 New inspect icon 2017-07-21 11:56:06 -07:00
Zach Fox
a800f6c05a No magic numbers; Move (i) based on laser hand; Tablet to Tab key 2017-07-21 11:48:19 -07:00
Brad Davis
5b5e94700e Additional audio fixes 2017-07-21 09:52:44 -07:00
Brad Davis
d1c2218a31 Temporary patch for deadlock 2017-07-21 09:52:36 -07:00
Zach Fox
7d125f44e4 Set parentID even when overlay already exists 2017-07-21 09:35:49 -07:00
Dante Ruiz
625b7e535a Merge branch 'master' of github.com:highfidelity/hifi into bug-lock-default-scripts 2017-07-21 17:20:03 +01:00
vladest
33a8ab2d58 Adjusted according discussion in PR 2017-07-21 18:18:23 +02:00
Dante Ruiz
e2359f6bb9 changes api call 2017-07-21 17:15:31 +01:00
vladest
b13cbd5bde Merge branch 'master' into avatar_default_speeds 2017-07-21 17:45:11 +02:00
David Kelly
875d0eb815 Merge branch 'context-overlays' of https://github.com/highfidelity/hifi into context-overlays 2017-07-21 07:20:19 -07:00
David Kelly
6db2e2c6c9 Merge branch 'master' of https://github.com/highfidelity/hifi into context-overlays 2017-07-21 07:18:33 -07:00
Olivier Prat
7bc7b1eabc Merge branch 'master' of git://github.com/highfidelity/hifi into fade2 2017-07-21 09:27:30 +02:00
Stephen Birarda
7cfdf7d5ae Merge pull request #11000 from highfidelity/bug/6219 
made changes to size of content to display 'choose file' button
 2017-07-20 17:46:15 -07:00
anshuman64
5f3b68d544 Use ctrl+H instead of alt+H 2017-07-20 17:36:02 -07:00
Dante Ruiz
649b974927 mods for changes camera views 2017-07-21 01:01:23 +01:00
Zach Fox
e68f9499fa Add hover/unhover handlers to context overlays 2017-07-20 16:51:00 -07:00
Andrew Meadows
a8dac0cb79 don't send constant updates for grabbed objects 2017-07-20 15:45:50 -07:00
Zach Fox
3698fe9b6b Merge branch 'master' of https://github.com/highfidelity/hifi into context-overlays 2017-07-20 15:10:06 -07:00
David Kelly
c8015e4eb6 cleanup, fixed build issue 2017-07-20 14:52:58 -07:00
David Kelly
c1de09c7f6 whitespace issue 2017-07-20 14:24:16 -07:00
David Kelly
10503c3a16 registration point 2017-07-20 14:18:07 -07:00
SamGondelman
c7f0f03fce expanded RayPick JS API 2017-07-20 13:53:39 -07:00
Dante Ruiz
3c862c34b2 disable reload default scripts by default 2017-07-20 21:15:00 +01:00
Zach Fox
e18fec140a Merge branch 'context-overlays' of https://github.com/highfidelity/hifi into contextOverlays_improvements2 2017-07-20 13:03:34 -07:00
Zach Fox
a1a7ab945a Make dimensions better 2017-07-20 12:58:15 -07:00
SamGondelman
d156680bc8 ignore/include by ID, simplified caching logic 2017-07-20 12:15:06 -07:00
Zach Fox
f515a24568 UX improvements 2017-07-20 12:00:13 -07:00
David Kelly
b7be727b4c turn off ContextOverlay for pal, edit. Improve clicks too 2017-07-20 11:30:55 -07:00
David Kelly
0544c1e561 build issue 2017-07-20 08:18:37 -07:00
David Kelly
110efd63c8 enabled property so we can turn it off during edit, etc... 2017-07-20 08:08:49 -07:00
David Kelly
b236a21adc no clicks on 'highlight' overlay 2017-07-20 07:28:45 -07:00
SamGondelman
bf243d6025 lockEnd, editRenderState, and updated grab.js 2017-07-19 17:45:21 -07:00
David Kelly
0023832938 simple fixes 2017-07-19 17:38:19 -07:00
David Kelly
ebce1ce9de Merge branch 'context-overlays' of https://github.com/highfidelity/hifi into dk/placeholderHighlighting 2017-07-19 17:13:11 -07:00
Zach Fox
2dce254928 Actually increase target size 2017-07-19 17:11:45 -07:00
David Rowe
091b666d7e Fix noise reduction checkbox not always working 2017-07-20 12:06:19 +12:00
David Kelly
40ec770bc1 Highlight using simple yellow bounding box 2017-07-19 17:06:17 -07:00
Stephen Birarda
3936ee93f0 use default scripts path in EditTabView to fix load on OS X 2017-07-19 16:34:04 -07:00
utkarshgautamnyu
ce5ff23e70 made changes to size of content to dosplay 'choose file' button 2017-07-19 16:15:34 -07:00
David Kelly
920ac17caf minor renaming 2017-07-19 15:46:28 -07:00
David Kelly
5f82a76cc9 Merge branch 'context-overlays' of https://github.com/highfidelity/hifi into dk/marketplaceItemsOnly 2017-07-19 15:41:36 -07:00
David Kelly
ecd419e0d3 cr feedback 2017-07-19 15:32:03 -07:00
Zach Fox
4374d4d1e5 Small improvements to overlay 2017-07-19 15:27:48 -07:00
David Kelly
44c9f0e65e Overlay appears only on marketplace items 2017-07-19 15:13:26 -07:00
David Kelly
f0091f16a1 cr feedback 2017-07-19 14:46:10 -07:00
David Kelly
a8ab115b12 Open marketplace when we know the marketplaceID of an entity 2017-07-19 14:11:14 -07:00
SamGondelman
912b417dd4 mouse ray pick 2017-07-19 13:56:18 -07:00
Zach Fox
c866bd814d Make clicks work right 2017-07-19 12:24:20 -07:00
SamGondelman
c6b3f69db0 teleport third eye laser on invalid hand pose 2017-07-19 11:51:31 -07:00
Zach Fox
f06ec715f2 Quick bugfix 2017-07-19 09:59:44 -07:00
Zach Fox
1d26a268c1 Merge branch 'master' of https://github.com/highfidelity/hifi into HoverOverlay_CubeOverlay 2017-07-19 09:53:51 -07:00
Zach Fox
761d35d633 Getting there! 2017-07-18 17:10:23 -07:00
Zach Fox
8f6af3a1ab ContextOverlay 2017-07-18 16:28:24 -07:00
Zach Fox
265f978a06 It's working! 2017-07-18 15:57:26 -07:00
vladest
4b94d24c29 Change default mouse speeds for avatar 2017-07-18 23:51:19 +02:00
Zach Fox
084f4d2ab0 Why were Web3DOverlays done this way? 2017-07-18 14:42:59 -07:00
humbletim
f9e0e616f7 Merge remote-tracking branch 'upstream/master' into 21180-C++ 2017-07-18 17:34:39 -04:00
humbletim
190e1ac7d9 move/scope viewOrientation into the related code block 2017-07-18 17:22:16 -04:00
Zach Fox
2b1a0921da Initial work on clickable overlays 2017-07-18 14:01:16 -07:00
Brad Davis
1aee8f1f4d Ensure we continue calling idle when minimized 2017-07-18 13:44:58 -07:00
SamGondelman
55a025b827 initial code review 2017-07-18 12:43:34 -07:00