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

3510 commits

Author SHA1 Message Date
Zach Fox
5173774db0 MUCH faster filter! 2017-08-25 16:15:07 -07:00
Zach Fox
ee8f5d6e7b Filter 2017-08-25 16:08:32 -07:00
Zach Fox
d19377d2d4 Saving 2017-08-25 15:56:30 -07:00
Zach Fox
153c131482 Initial inventory progress 2017-08-25 15:28:35 -07:00
Atlante45
8a291f16ff Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake 2017-08-25 15:26:38 -07:00
Zach Fox
5487179a79 So much progress 2017-08-25 15:06:14 -07:00
David Kelly
b942faa60e Merge branch 'master' of https://github.com/highfidelity/hifi into dk/transactionHistoryDisplay 2017-08-25 14:16:31 -07:00
David Kelly
f015ac3c68 get transaction history into qml 2017-08-25 13:55:38 -07:00
Zach Fox
dd9bb17791 Progress! 2017-08-25 12:13:51 -07:00
Zach Fox
e606e3dfb3 Squashed commit of the following: 
commit 453897b9e2
Author: Zach Fox <fox@highfidelity.io>
Date:   Fri Aug 25 10:56:53 2017 -0700

    Huge cleanup!
 2017-08-25 11:45:37 -07:00
Zach Fox
453897b9e2 Huge cleanup! 2017-08-25 10:56:53 -07:00
Atlante45
348be788f7 Add BakingEnabled protocol 2017-08-25 10:56:27 -07:00
Atlante45
9e6502fe92 More UI work 2017-08-25 10:54:34 -07:00
vladest
26026cb2b5 Added logout. Truncate username to 8 characters 2017-08-25 17:37:10 +02:00
vladest
be56cab8e1 Merge branch 'master' into tablet_login_button 2017-08-25 15:50:10 +02:00
vladest
36879f83eb Added scroll bar. Cleanup 2017-08-25 15:44:07 +02:00
vladest
df09c80cd9 Merge branch 'master' into flickable_web_pages 2017-08-25 13:15:30 +02:00
Elisa Lupin-Jimenez
3a512e3072 Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-08-24 16:50:58 -07:00
beholder
cbbe03cee7 6788: You can deselect your current view mode 2017-08-25 02:33:11 +03:00
Zach Fox
8d3c394d00 More progress 2017-08-24 16:21:41 -07:00
Elisa Lupin-Jimenez
e71823a8b5 forgot to track a file 2017-08-24 15:46:22 -07:00
Elisa Lupin-Jimenez
77f93ae84b user agent switch allows downloads 2017-08-24 15:44:22 -07:00
Zach Fox
bdc1f7b236 Progress 2017-08-24 15:39:26 -07:00
Zach Fox
e2c74d8b88 Initial progress 2017-08-24 15:22:30 -07:00
vladest
d6079e70fb Binding to width to make sure it will follow Tablet with when rotating 2017-08-24 23:44:53 +02:00
David Kelly
eb9436ba96 Merge pull request #11235 from davidkelly/dk/encryptFile 
Initial wallet app plus some encryption of security image
 2017-08-24 13:17:14 -07:00
vladest
311dc9f0be Merge branch 'master' into flickable_web_pages 2017-08-24 21:39:01 +02:00
vladest
c7fe845403 Move common webview flickable code to separate core file 2017-08-24 21:35:47 +02:00
David Kelly
698644c3b4 Merge branch 'commerce_walletApp' of https://github.com/zfox23/hifi into dk/encryptFile 2017-08-24 10:37:58 -07:00
Zach Fox
3d0fd76997 Temp fix for inventory and buy 2017-08-24 10:24:06 -07:00
David Kelly
138534c3ff encrypt security image 2017-08-23 15:01:09 -07:00
David Kelly
f655bf2713 Merge branch 'commerce_walletApp' of https://github.com/zfox23/hifi into dk/encryptFile 2017-08-23 14:53:05 -07:00
beholder
9cd784990c 5830: Go-To menu shows up blank except for address bar 2017-08-23 23:27:02 +03:00
Zach Fox
a489267cec Hide behind switch and remove dead code 2017-08-23 10:48:47 -07:00
David Kelly
591c031e7b first pass still broken... 2017-08-22 16:24:25 -07:00
David Kelly
8bb7ea900a Merge branch 'commerce_walletApp' of https://github.com/zfox23/hifi into dk/encryptFile 2017-08-22 16:23:23 -07:00
David Kelly
0bd3f1728d Merge branch 'master' of https://github.com/highfidelity/hifi into dk/encryptFile 2017-08-22 14:40:10 -07:00
vladest
f7a704d9f4 Added current tab selection according to context 2017-08-22 23:33:09 +02:00
vladest
6f0229f450 Reworked according to designers request. Do not fall back to default audion output 2017-08-22 23:26:27 +02:00
Zach Fox
763ce73306 Taking a break now 2017-08-22 12:26:46 -07:00
Zach Fox
a31088b60f More progress 2017-08-22 12:16:17 -07:00
Zach Fox
f1da7a6381 Checkpoint 2017-08-22 11:53:37 -07:00
vladest
e403f7266a Merge branch 'master' into audio_devices_split 2017-08-22 20:46:03 +02:00
Zach Fox
db16035f26 Parse balance correctly 2017-08-21 15:07:54 -07:00
vladest
43d3544a0d Fix width of html pages in Create mode 2017-08-21 17:07:24 +02:00
vladest
9fd2a742a9 Fix QML warning. Fix AddressBar info scroll 2017-08-21 16:45:47 +02:00
vladest
3be684b973 Fixed spinner in center. Flicking only vertically 2017-08-21 16:31:25 +02:00
vladest
78e9bb6020 almost works for marketplace 2017-08-20 23:06:23 +02:00
vladest
56dedea66c 1st experimental approach 2017-08-20 17:57:14 +02:00
vladest
bad8c39444 Align user/login text right border with tablet buttons 2017-08-19 17:46:52 +02:00
vladest
3783b8a57c Merge branch 'master' into tablet_login_button 2017-08-19 17:27:46 +02:00
Zach Fox
512a08f67f Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletApp 2017-08-18 17:05:56 -07:00
Zach Fox
6e171d38ce Bugfixes 2017-08-18 17:04:46 -07:00
Zach Fox
a07598c738 Bugfixes 2017-08-18 16:36:11 -07:00
Zach Fox
94da149ac8 Almost there 2017-08-18 16:28:02 -07:00
druiz17
42f6333948 Merge pull request #11206 from vladest/goto_remove_snap 
Switch off snap behavior
 2017-08-18 16:14:59 -07:00
David Kelly
1904bd3f2b encrypting image, rough first pass, lots left 2017-08-18 16:14:10 -07:00
Zach Fox
c42a658bde Almost-working change pages 2017-08-18 16:06:39 -07:00
Howard Stearns
188cbee781 Merge pull request #11212 from howard-stearns/asynchronous-commerce-2 
Asynchronous Ledger Interactions with Server
 2017-08-18 15:40:24 -07:00
Elisa Lupin-Jimenez
44f1f340e1 Merge pull request #11147 from elisa-lj11/blocks 
Adding Blocks Tablet App to Marketplace
 2017-08-18 15:06:18 -07:00
Zach Fox
f28544e405 Show real balance 2017-08-18 14:53:55 -07:00
Zach Fox
a91c0cb169 Add 'exchange' tab 2017-08-18 14:22:25 -07:00
Zach Fox
4ff1fb8df0 Filling out home 2017-08-18 14:18:05 -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
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
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
Chris Collins
9c9bcd80b8 Merge pull request #11191 from SamGondelman/logging 
Miscellaneous logging fixes
 2017-08-16 15:46:32 -07:00
vladest
2cca584e58 Merge branch 'master' into audio_devices_split 2017-08-16 22:47:06 +02:00
SamGondelman
86cc938a47 Merge remote-tracking branch 'upstream/master' into sharks 2017-08-16 09:54:12 -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
768eb7f91c Getting closer 2017-08-15 15:02:28 -07:00
Zach Fox
b7282cc776 Lots of fixes 2017-08-15 13:46:20 -07:00
Zach Fox
528d2072f9 Bugfixes and improvements 2017-08-15 12:14:32 -07:00
Zach Fox
bddce9328b V1 2017-08-15 11:08:03 -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
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
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
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
Zach Fox
199ba3bff0 Use new JSON inventory format 2017-08-14 11:55:21 -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
Cain Kilgore
8c9f3ae977 Skybox Changer PR 2017-08-12 01:35:48 +01: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
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
Elisa Lupin-Jimenez
6c2bf63392 Back button works 2017-08-10 17:51:19 -07:00
Elisa Lupin-Jimenez
da5bb03187 Trying to add in a back button 2017-08-10 16:34:37 -07:00
SamGondelman
4c55849290 merge from master 2017-08-10 15:43:23 -07:00
Cain Kilgore
4e81ebf85c Added Assets for Web Browser MP Script 2017-08-10 22:53:35 +01:00
Sam Gateau
79f3be1efe Merge pull request #11021 from Zvork/fade2 
Fade dissolve effect  JUST AVATARS
 2017-08-10 13:48:30 -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
Seth Alves
f125ef04f1 Merge pull request #11150 from ElderOrb/Case6742 
6742: Multiple highlighted buttons
 2017-08-09 17:53:55 -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
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
beholder
836b09b83d 5351: Help Button has Old UI 2017-08-09 20:56:02 +03:00
Zach Fox
4f85923517 Tons of fixes and improvements! 2017-08-08 17:58:41 -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
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
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
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
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
Brad Davis
1ecca9fd29 Merge branch 'master' into zzmp-audio/peak-values 2017-08-06 17:21:00 -07:00
vladest
3a013bf86e Remove snap to item. Add caching for scrolling speedup 2017-08-05 13:28:08 +02: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
Anthony J. Thibault
98bbe887b9 Merge branch 'master' into feature/secondary-pose-support 2017-08-04 16:11:13 -07:00
SamGondelman
bd942ec406 merge from master 2017-08-04 12:17:54 -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
vladest
b049b0f415 Merge conflicts 2017-08-03 19:43:42 +02:00
Dante Ruiz
1e1ddf2941 making requested changes 2017-08-02 22:22:55 +01: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
vladest
4330e31212 Toolbar mode: 1. Fixed switching between different apps. 2. Fixed switching from Create 2017-08-02 16:32:09 +02: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
David Kelly
b371c875c4 undo tab mapping to bring up tablet, for now 2017-07-31 14:46:26 -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
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
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
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
utkarshgautamnyu
71ddf1e7c1 Removed Compound Collision type 2017-07-26 10:20:17 -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
SamGondelman
658acd91f2 experimenting with drawHUDLayer depth testing 2017-07-25 14:17:39 -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
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
Cain Kilgore
280a7a7e42 Fixing Styling, added Preference to Tablet, Moved Location to Avatar Tuning 2017-07-25 01:48:55 +01: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
Cain Kilgore
84609f27e3 Final Change - They're now Radio Boxes. 2017-07-24 23:53:03 +01:00
Cain Kilgore
9c152ddc6f Ticking left will keep it on left, not right 2017-07-24 22:30:43 +01:00
humbletim
de6975b227 add missing cursor-*.pngs 2017-07-24 17:16:13 -04: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
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
Dante Ruiz
95299244cf fixed running scripts popup 2017-07-22 00:24:24 +01:00
Dante Ruiz
7bf3f45e39 finished the locked default scripts 2017-07-21 23:32:25 +01: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
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
Olivier Prat
7bc7b1eabc Merge branch 'master' of git://github.com/highfidelity/hifi into fade2 2017-07-21 09:27:30 +02:00
Dante Ruiz
3c862c34b2 disable reload default scripts by default 2017-07-20 21:15:00 +01: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
Chris Collins
e99683fdcf Merge pull request #10985 from jherico/audio_deadlock 
Trying to resolve QML / Audio deadlocks
 2017-07-18 12:40:03 -07:00
Brad Davis
aab56cf2a9 Trying to resolve QML / Audio deadlocks 2017-07-17 16:21:28 -07:00
1P-Cusack
7319998df9 Move ThumbUp gesture detection into json map file. 2017-07-17 10:58:30 -04:00
Olivier Prat
9e9c0aff65 Merge branch 'master' of git://github.com/highfidelity/hifi into fadeshape 2017-07-17 09:59:59 +02:00
Dante Ruiz
93d1725b3c make cursor position change based on mouse click position 2017-07-14 19:30:35 +01:00
Zach Fox
a9197509d8 Merge pull request #10965 from CainFoool/avatar-scaler 
WL 21422 - Add a scale slider for avatar size
 2017-07-14 10:30:33 -07:00
Andrew Meadows
9584035aa4 Merge pull request #10886 from 1P-Cusack/21420 
[Worklist #21420] Implement Create button disabled state (details below).
 2017-07-14 10:06:45 -07:00
Olivier Prat
82da9fb537 Merge branch 'master' of git://github.com/highfidelity/hifi into fade 2017-07-14 17:28:35 +02:00
Cain Kilgore
c60c8c7b13 Missed two tabs.. 2017-07-14 00:59:25 +01:00
Cain Kilgore
4f8d958831 Some code cleaning, added comment for reasoning of specifying min and max in the qml 2017-07-14 00:56:42 +01:00
Cain Kilgore
d74c834f12 Fixed colour scheming and changed to a reload icon 2017-07-13 22:40:37 +01:00
Cain Kilgore
60300f5d7b changed to icon (hopefully) 2017-07-13 22:06:44 +01:00
Cain Kilgore
f91a8c0f53 Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-scaler 2017-07-13 21:25:39 +01:00
Cain Kilgore
247e7b8bed indentation!!! 2017-07-13 19:25:31 +01:00
Cain Kilgore
092725ad1a a thing 2017-07-13 19:24:30 +01:00
Cain Kilgore
5329c1ce42 Fixed Indentation, removed old debug code 2017-07-13 19:23:28 +01:00
Cain Kilgore
521babb6bd Avatar Scaler - should be PR Ready. 2017-07-13 19:18:51 +01:00
Anthony J. Thibault
22d8adcb99 Better shoulder/arm puck calibration. 2017-07-13 10:39:48 -07:00
Zach Fox
dc1b4b5324 New icons 2017-07-12 16:48:04 -07:00
Cain Kilgore
43782a29c7 Avatar Scaler - WIP 2017-07-12 22:04:58 +01:00
Olivier Prat
2f9885870b First merge with Sam's fader branch with custom pipeline support in shape plumber 2017-07-12 17:29:21 +02:00
1P-Cusack
2cd10fd459 Move 'index point' logic into json config file. 2017-07-12 11:08:50 -04:00
Zach Fox
d786820670 Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-07-11 16:16:37 -07:00
Ken Cooke
0da19af6f3 Stop all capture devices when Audio.qml is not visible. 
Otherwise, Windows will continue to capture audio from all attached devices (possibly causing mic audio glitches) until Interface shutdown.
 2017-07-11 10:06:38 -07:00
Ken Cooke
d6eb731f3a Merge branch 'master' into audio/peak-values 2017-07-10 21:55:11 -07:00
Zach Fox
ea62ef165c Fix image container background 2017-07-10 16:13:45 -07:00
Zach Fox
4a74522884 Ensure tablet button shows up; protections for controller mapping 2017-07-10 15:16:16 -07:00