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

1590 commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
Cain Kilgore
4e81ebf85c Added Assets for Web Browser MP Script 2017-08-10 22:53:35 +01: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
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
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
1cf81495ab basic commerce infrastructure 2017-08-09 11:50:52 -07: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
Gerard Maguire
47b37ac04e Bool 2017-08-08 15:35:14 +01:00
Gerard Maguire
356f055b53 fixed missing bool 2017-08-08 15:26:21 +01:00
Gerard Maguire
6facc02125 Merge branch 'master' of https://github.com/highfidelity/hifi into 21466 2017-08-08 13:58:32 +01:00
Gerard Maguire
6f81dd53f2 Fixed avatar rotation upon teleportation using Pal 
Added "VisitUserFromPAL" to LookupTrigger enum
and bool "shouldMatchOrientation" to goToUser()
 2017-08-08 05:08:20 +01: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
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
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
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
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
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
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
4680911264 Enabled multiple selection and multiple deletion in asset browser 2017-07-27 14:47:30 -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
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
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
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
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
Dante Ruiz
625b7e535a Merge branch 'master' of github.com:highfidelity/hifi into bug-lock-default-scripts 2017-07-21 17:20:03 +01: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
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
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
43782a29c7 Avatar Scaler - WIP 2017-07-12 22:04:58 +01: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
David Kelly
b87d69b15d Insure spectator camera preview is up when reopening tablet 2017-07-10 13:16:08 -07:00
Dante Ruiz
89a072cfee fixed hmd keyboard for goto 2017-07-10 19:05:07 +01:00
David Kelly
1c9c36a8c8 Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/hmdPreview 2017-07-10 10:22:31 -07:00
David Kelly
4843b91f47 Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-07-10 09:50:17 -07:00
druiz17
6e44c95d53 Merge pull request #10906 from druiz17/audio-qml-fix 
Made the output audio listview dynamically change height base on content size
 2017-07-07 16:48:15 -07:00
Zach Fox
dbb48cd1aa Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-07-07 16:03:04 -07:00
Zach Fox
e222753aac Merge pull request #10911 from zfox23/PAL_adminFix2 
Set admin status even if QML can't find user in PAL
 2017-07-07 10:24:53 -07:00
Seth Alves
fc8b7c7cc5 Merge pull request #10904 from druiz17/window-root-spam 
fixed log spamming from windowRoot.qml in toolbar mode
 2017-07-07 07:17:08 -07:00
Zach Fox
ee9cdaff90 Set admin status even if QML can't find user in PAL 2017-07-06 23:26:40 -07:00
David Kelly
b41c470064 first cut, still stereo 2017-07-06 15:59:24 -07:00
Dante Ruiz
1ac415aa14 dynamic listview height 2017-07-06 23:50:32 +01:00
druiz17
b4182fe7ac Merge pull request #10899 from druiz17/calibration-update-2.0 
Updates to the Calibration UI
 2017-07-06 14:24:45 -07:00
Dante Ruiz
b0130896d1 fixed spamming from windowRoot.qml 2017-07-06 22:01:08 +01:00
Dante Ruiz
1fcb3b32d6 fixed letter cap 2017-07-06 20:55:19 +01:00
Seth Alves
0374d24b15 Merge pull request #10901 from druiz17/goto-keyboard-fix 
Fixed the keyboard not showing  up for goto in HMD mode
 2017-07-06 12:46:13 -07:00
Dante Ruiz
2d876377d5 keyboard know disappears when you click of the address line 2017-07-06 20:04:44 +01:00
Dante Ruiz
de5802418f fixed some keybaord logic 2017-07-06 19:27:48 +01:00
Dante Ruiz
4e3dba1767 goto HMD keyboard fix 2017-07-06 19:12:52 +01:00
Dante Ruiz
9e4b5693c7 fixed merge conflicts 2017-07-06 18:49:46 +01:00
Dante Ruiz
6e1f9d275c chnaged default head offset 2017-07-06 17:54:06 +01:00
Dante Ruiz
258c21838e finished calibration-ui updates 2017-07-06 17:32:40 +01:00
David Rowe
cfd155c198 Merge branch 'master' into 21418 2017-07-06 16:56:10 +12:00
Dante Ruiz
6c15dffb9d added new glyph 2017-07-06 00:45:59 +01:00
Zach Fox
39bdc20b4f On checkbox language change 2017-07-05 16:13:36 -07:00
Zach Fox
0af53bb4a5 Instructions and cool static :) 2017-07-05 14:46:59 -07:00
Zach Fox
aea5779ed6 When a display texture isn't set, show preview instructions 2017-07-05 14:46:58 -07:00
Zach Fox
44cb48b17d Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-07-05 09:59:57 -07:00
David Kelly
373bd0cc8a aspect ratio preserved upon blitting, minor qml tweak, warnings fixed 2017-07-03 14:23:23 -07:00
David Kelly
5f015ec77f Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview 2017-07-03 13:57:25 -07:00
Zach Fox
9411c2e732 Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-07-03 10:24:02 -07:00
Dante Ruiz
063984f573 Merge branch 'master' of github.com:highfidelity/hifi into calibration-ui-update 2017-07-03 16:44:47 +01:00
David Kelly
073eae39b2 timer now resumes when visible again 2017-06-30 18:44:32 -07:00
Dante Ruiz
6f30cb1825 Merge branch 'master' of github.com:highfidelity/hifi into vive-in-desktop 2017-07-01 00:48:49 +01:00
Dante Ruiz
51792769b5 finished vive in desktop mode 2017-07-01 00:48:36 +01:00
David Rowe
07697c5083 Merge branch 'master' into 21418 
# Conflicts:
#	interface/resources/qml/hifi/dialogs/GeneralPreferencesDialog.qml
#	interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml

Removed stray "Vive Controller Picks" configuration item which no longer exists.
 2017-07-01 11:19:00 +12:00
Brad Davis
31d2c9980e Merge pull request #10797 from ctrlaltdavid/21396 
Make Leap Motion a plugin
 2017-06-30 14:37:23 -07:00
Dante Ruiz
a7e4dc1473 clean up code 2017-06-28 23:51:00 +01:00
David Rowe
be0e1a75a4 User-friendly SDL2 controller name 2017-06-29 10:03:58 +12:00
Dante Ruiz
a2df2f8472 added user activity status 2017-06-28 19:52:19 +01:00
David Kelly
b73102d063 Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview 2017-06-28 08:57:04 -07:00
Zach Fox
5d8d2fd83e Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-27 16:47:44 -07:00
Zach Pomerantz
9b72ab96ff add peak values to qml 2017-06-27 17:51:45 -04:00
Ryan Huffman
209a4f33b5 Merge pull request #10784 from huffman/feat/pal-replicated 
Disable silence + ban buttons for replicated users
 2017-06-26 12:50:23 -07:00
Brad Hefta-Gaub
6314a8d273 Merge pull request #10782 from vladest/fix_browse_black 
Make background with default color. Fix few warnings
 2017-06-26 09:50:09 -07:00
David Rowe
72d712ac76 Add "enabled" setting for Sixense; bail in update if note enabled 2017-06-26 16:43:06 +12:00
David Rowe
31714675c3 Remove unused Sixense preference and associated methods 2017-06-26 16:14:57 +12:00
David Rowe
361bc1ce03 Add "enabled" setting for SDL2 joystick; bail in update if not enabled 2017-06-26 16:00:18 +12:00
Ryan Huffman
b56cfa56c7 Merge branch 'master' of github.com:highfidelity/hifi into feat/pal-replicated 2017-06-23 14:23:20 -07:00
David Rowe
6e266dfbac Merge branch 'master' into 21396 2017-06-24 09:19:12 +12:00
Brad Davis
d50c448151 Fix heap corruption coming out of running scripts dialog 2017-06-22 19:15:58 -07:00
Zach Fox
a1dfbc91da Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-22 10:27:52 -07:00
Vladyslav Stelmakhovskyi
30714d5d25 Make background with default color. Fix few warnings 2017-06-22 16:47:40 +02:00
David Rowe
6ff8aed5e3 Merge branch 'master' into 21396 2017-06-22 23:54:15 +12:00
Seth Alves
c70365d04a Merge pull request #10729 from druiz17/hand-pucks 
Hand pucks and Calibration UI
 2017-06-21 18:10:15 -07:00
Zach Fox
af3c249ae5 Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-21 17:16:10 -07:00
Dante Ruiz
c4699e00ca added hand offsets 2017-06-21 23:10:08 +01:00
Brad Hefta-Gaub
88a4f5c576 Merge pull request #10766 from humbletim/sort-running-scripts 
Sort Running Scripts... list alphabetically
 2017-06-21 13:08:47 -07:00
Ryan Huffman
0e7ddfd29f Disable silence/ban buttons in PAL if avatar is replicated 2017-06-21 09:49:16 -07:00
Dante Ruiz
729065749f fixed merge conficts 2017-06-21 16:59:53 +01:00
Zach Fox
8dab93e299 Merge pull request #10762 from zzmp/audio/input-select-active-level 
Add a VU meter to the active mic selection
 2017-06-20 18:38:49 -07:00
Dante Ruiz
17832b6022 edited some button behavior 2017-06-21 01:38:05 +01:00
Dante Ruiz
b7286db523 fixed merge conflict 2017-06-21 01:10:54 +01:00
Dante Ruiz
2c3db0fb91 finished calibration-ui 2017-06-21 01:07:12 +01:00
Zach Pomerantz
0075d8619a center MUTED text in InputLevel 2017-06-20 17:04:54 -07:00
Zach Pomerantz
1f7e1e8287 add level to active input selection 2017-06-20 17:04:54 -07:00
Zach Pomerantz
baafe1ad09 give Audio menu mute its own row 2017-06-20 16:15:05 -07:00
Zach Pomerantz
8e1cf763e3 Merge pull request #10756 from zzmp/audio/input-level 
Update chrome for the audio input level meter
 2017-06-20 15:33:17 -07:00
Zach Pomerantz
7e84f67391 Merge pull request #10744 from zzmp/audio/output-sample 
Add "Play sample sound" to audio setting
 2017-06-20 15:32:57 -07:00
Zach Pomerantz
278a122291 bring visibleChanged to standard 2017-06-20 14:04:50 -07:00
Zach Pomerantz
6823e7cae0 Audio -> HifiAudio to avoid collision 2017-06-20 12:20:14 -07:00
Zach Pomerantz
6c776e27af fix PlaySampleSound glyphs 2017-06-20 12:16:08 -07:00
Zach Pomerantz
ab6c8505b8 stop audio sample on visibleChanged 2017-06-20 12:15:23 -07:00
Zach Pomerantz
c33853f4cf update AvatarInputs with MicBar 2017-06-20 11:43:02 -07:00
Zach Pomerantz
ab68c44177 MicBar tweaks 2017-06-20 11:43:02 -07:00
Zach Pomerantz
c826858458 revamp tablet MicBar 2017-06-20 11:43:02 -07:00
Zach Pomerantz
7f90f8af45 Merge pull request #10746 from zzmp/audio/mute-check 
Emphasize mute state with red
 2017-06-20 10:58:11 -07:00
Dante Ruiz
33b89c9d32 adding glyph and text 2017-06-20 17:26:17 +01:00
Dante Ruiz
13dff29bd5 adding calibration screen 2017-06-20 01:19:10 +01:00
Zach Pomerantz
6adfe34661 make mute red check 2017-06-19 15:07:28 -07:00
Zach Pomerantz
f0bc080502 fix tab 2017-06-19 14:51:30 -07:00
David Kelly
b4c75c3f87 working, except tablet issue 2017-06-19 14:41:42 -07:00
Zach Pomerantz
a7e1b75909 stopgap with MyAvatar.qmlPosition 2017-06-19 14:41:01 -07:00
Zach Pomerantz
d3d36324c0 play sample output sound 2017-06-19 14:41:01 -07:00
Zach Fox
e9ba223c09 Uncheck 'disable preview' when opening Spectator app 2017-06-19 13:40:50 -07:00
Dante Ruiz
cfffb74a29 Merge branch 'master' of github.com:highfidelity/hifi into hand-pucks 2017-06-19 21:40:26 +01:00
Dante Ruiz
734cde33e7 better calibrate button 2017-06-19 21:40:09 +01:00
Zach Fox
d0b68b8c32 First steps - also make letterbox closable only when clicking on gray 2017-06-19 11:46:56 -07:00
Zach Fox
08eb07242d Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-19 10:31:31 -07:00
Vladyslav Stelmakhovskyi
36ff765d7f Make sure registered object have different name from iport alias 2017-06-18 22:19:28 +02:00
Dante Ruiz
da29157a3c fixed merge conflict' 2017-06-17 00:40:50 +01:00
Dante Ruiz
2015f059c7 fixed hand calibration 2017-06-17 00:37:33 +01:00
Zach Fox
6230dcf93d Thanks to Thoys! 2017-06-16 16:34:35 -07:00
David Kelly
6dd1e6e069 Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview 2017-06-16 16:24:30 -07:00
David Kelly
5284b8dc0c fix for upside down preview, for now 2017-06-16 15:37:25 -07:00
Zach Fox
74fde8efd7 Revert "Fix teleporting to another user from the PAL" 
This reverts commit 6b659101d5.
 2017-06-16 15:33:47 -07:00
Zach Fox
6b659101d5 Fix teleporting to another user from the PAL 2017-06-16 15:09:13 -07:00
Zach Fox
7a76c9cf7f Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-16 14:59:23 -07:00
Zach Fox
749dede8b3 Start with empty string for checkbox 2017-06-16 10:08:58 -07:00
Zach Fox
3df414df36 Bugfixes and language changes 2017-06-16 10:08:58 -07:00
Zach Fox
8cf9c8708d Allow user to click left thumbstick to switch 'MONITOR SHOWS' 2017-06-16 10:08:58 -07:00
Dante Ruiz
07102cc98d improving the ui 2017-06-16 00:25:27 +01:00
David Rowe
febd0eaf98 Add Leap Motion settings 2017-06-16 10:58:11 +12:00
Zach Pomerantz
eb4255e1ac fix audio checkbox bindings 2017-06-15 18:21:23 -04:00
David Kelly
3d922f5db6 works, sorta, but blinks like crazy, cursor gets f-ed up... 2017-06-15 14:17:43 -07:00
Zach Pomerantz
3093a73ce1 Merge branch 'master' of github.com:highfidelity/hifi into audio/parity 2017-06-15 15:04:06 -04:00
Dante Ruiz
a1782bf7d2 Merge branch 'controller-ui' into hand-pucks 2017-06-15 16:27:55 +01:00
Dante Ruiz
d65c0dfbac Merge branch 'master' of github.com:highfidelity/hifi into controller-ui 2017-06-15 16:24:59 +01:00
David Kelly
54dfc33b38 initial skeleton of qml objects 2017-06-14 14:36:37 -07:00
Zach Fox
6b6b6026a4 Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-14 13:44:13 -07:00
Zach Pomerantz
bc44e7beaf bring qml to standard 2017-06-14 10:25:41 -04:00
Zach Fox
37e72f25a3 Make the PAL's tab background color white 2017-06-13 16:04:14 -07:00
Zach Pomerantz
a8f69bb2e0 Merge branch 'master' of github.com:highfidelity/hifi into audio/parity 2017-06-13 17:41:52 -04:00
Zach Pomerantz
e7da007acd only show Audio menu title when appropriate 2017-06-13 17:13:39 -04:00
Dante Ruiz
ef9a211f6e adding hand punck 2017-06-13 21:15:16 +01:00
Zach Pomerantz
20c0dac8e8 update QML with Audio.muted 2017-06-13 16:10:16 -04:00
Zach Pomerantz
bf5c70501d rm tester script 2017-06-13 14:54:53 -04:00
Zach Pomerantz
1a046b4d91 propagate title in Audio dialog qml 2017-06-13 14:42:48 -04:00
Zach Fox
7d1a7f4c0b Merge branch 'master' of https://github.com/highfidelity/hifi into 
spectator-camera - INCLUDING MERGE CONFLICT FIXES
 2017-06-13 09:42:14 -07:00
Zach Pomerantz
89bd895054 mv showAudioTools to just AvatarInputs 2017-06-13 12:31:05 -04:00
Zach Pomerantz
b37a0239b0 up to reverb (needs cherry-picking) 2017-06-12 18:00:52 -04:00
Bradley Austin Davis
1968ecbc8f Simplify eventBridge mechanism exposing functionality to web pages 2017-06-12 14:46:37 -07:00
Dante Ruiz
89b0e31edc update calibrate button glyph 2017-06-12 22:21:46 +01:00
Dante Ruiz
bbe675ab72 making final changes 2017-06-12 22:01:41 +01:00
Dante Ruiz
1b13cd6d45 saving work 2017-06-12 17:31:02 +01:00
Dante Ruiz
067fc9bb98 fixed merge conflict 2017-06-12 16:45:34 +01:00
druiz17
f6ef1443c8 some more clean up 2017-06-11 12:08:45 -07:00
Dante Ruiz
ef1be931dc preparing to clean code 2017-06-10 00:50:32 +01:00
ZappoMan
6fe20f90a3 add better debugging for audio problems 
use OS default device if settings have no values
 2017-06-09 13:36:12 -07:00
Zach Fox
a4f5d327a2 Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-09 11:38:35 -07:00
Dante Ruiz
73e628461e confiration update status 2017-06-09 00:44:05 +01:00
Dante Ruiz
c97ea84cbf saving work 2017-06-08 17:44:55 +01:00
howard-stearns
fa74daf875 Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor 2017-06-07 16:43:25 -07:00
Dante Ruiz
11409aae9b connect the ui with the input plugins 2017-06-08 00:34:52 +01:00
howard-stearns
8db81ee5c9 wire up preview vs camera display in scripts 2017-06-07 16:19:36 -07:00
Zach Fox
d1719fade6 Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera 2017-06-07 09:46:04 -07:00
Dante Ruiz
4ba1fdc323 elimated uncofigurable items from the list 2017-06-07 00:48:12 +01:00
Dante Ruiz
70ba344f1b finished openvr ui 2017-06-07 00:25:08 +01:00
Zach Fox
6e9b083be1 Function renaming; turn cam off when changing domains 2017-06-06 15:49:15 -07:00
Zach Fox
383ef542a1 Remove 'debugSelfie.js'; Change 'HMD' to 'VR headset' 2017-06-06 14:59:26 -07:00
Zach Pomerantz
2b99f299c8 testing 2017-06-06 17:54:52 -04:00
Zach Fox
b50cf6cee6 Quick feedback from Alan 2017-06-06 14:50:01 -07:00
Zach Fox
ca05e3d0b6 Improvements to switch; switch settings persist 2017-06-06 14:17:38 -07:00
Zach Fox
afb7e72b25 Separator; Switch.qml updates; etc 2017-06-06 13:51:07 -07:00
Dante Ruiz
bb7c424d47 get ui working 2017-06-06 21:09:09 +01:00
Zach Fox
557d1c65a3 Another checkpoint; added Switch.qml 2017-06-06 11:59:23 -07:00
Zach Fox
9970802142 Another checkpoint 2017-06-06 11:59:22 -07:00
Zach Fox
1fc7094b2c Checkpoint 2017-06-06 11:59:22 -07:00
Zach Fox
e9bb982651 First checkpoint! 2017-06-06 11:59:22 -07:00
Dante Ruiz
038ffe920a fixing merge conflicts 2017-06-06 16:42:08 +01:00
Dante Ruiz
19b134b0ac base ui working 2017-06-06 00:32:20 +01:00
Bradley Austin Davis
995fe11c05 Migrate to single QML engine 2017-06-05 15:14:44 -07:00
Zach Pomerantz
d8815d1dce prep audio menu 2017-06-05 16:24:00 -04:00
Zach Pomerantz
7cb38d22c3 fix AudioBuffers to work in tablet 2017-06-05 15:06:47 -04:00
Howard Stearns
556dcd69ac wording change regarding use of exact for floors 2017-06-03 15:48:48 -07:00
Dante Ruiz
f0f10f74c6 inpput configutration stub 2017-06-03 00:30:00 +01:00
Brad Davis
9a80a81321 Merge pull request #10565 from vladest/fix_claraio_download_clones 
Make sure that there is only one connection created for web events, s…
 2017-06-01 20:42:50 -07:00
anshuman64
694d1d042d Merge pull request #10573 from druiz17/head-puck 
Added head puck configuration
 2017-06-01 16:06:00 -07:00
David Kelly
f79c9ea021 we can sort on ignored 2017-06-01 07:29:31 -07:00
David Kelly
a17886aa58 do not allow sorting on non-sortable columns in PAL 2017-06-01 07:24:03 -07:00
Zach Pomerantz
2b40ad4275 mv Audio... to Settings as dialog 2017-05-28 17:42:24 -04:00
Zach Pomerantz
8ca8c3aa69 mv AudioPreferencesDialog to AudioBuffers 2017-05-28 17:40:57 -04:00
Vladyslav Stelmakhovskyi
bcee25acc7 Make sure that there is only one connection created for web events, so downloads from CLARA IO not duplicated 2017-05-28 19:54:41 +02:00
Dante Ruiz
a45bea2c90 fixed merge conflicts 2017-05-27 00:57:09 +01:00
Thijs Wenker
962d95ca46 add more precision to attachment scale in attachment dialog 2017-05-23 18:16:08 +02:00
Zach Fox
b9ddc3b19f Improve robustness of display name focus in PAL 2017-05-16 16:25:22 -07:00
David Kelly
a9716313be cr feedback -- really good feedback in fact 2017-05-11 17:02:37 -07:00
David Kelly
ae5f9e4fb1 animate scroll of partially visible cards 2017-05-11 15:10:19 -07:00
druiz17
e4df4369ad Merge pull request #10436 from druiz17/config-ui 
Added the ability to choose puck configuration from the general settings
 2017-05-11 13:39:05 -07:00
Vladyslav Stelmakhovskyi
bd6ac7a39e Code style fixes 2017-05-11 20:38:09 +02:00
Dante Ruiz
4365907462 drop down puck configuration for gernal settings 2017-05-10 22:12:11 +01:00
Vladyslav Stelmakhovskyi
2328da3c48 Merge branch 'master' into audio-source-sync 2017-05-10 21:22:40 +02:00
Vladyslav Stelmakhovskyi
2d46f9d30e Move most of the logic to C++ model, speed up initialization. Reduce number of AudioClient blocking calls to minimum 2017-05-10 21:21:39 +02:00
Zach Fox
cf3c10c5b1 Fix the bugs, add the feature 2017-05-09 14:40:41 -07:00
Vladyslav Stelmakhovskyi
fa9a4053ca Save selected device in settings to make sure it will not be changed back in Menu 2017-05-08 21:24:46 +02:00
Vladyslav Stelmakhovskyi
d0111ac0bb Merge branch 'master' into audio-source-sync 2017-05-08 20:09:34 +02:00
Zach Fox
6b00688289 Merge pull request #10392 from zfox23/AvailabilityLanguageChanges 
"Set Availability" UI changes
 2017-05-05 14:03:39 -07:00
Zach Fox
a10606b994 OMG language changed again 2017-05-05 11:44:59 -07:00
Zach Fox
905f36976f New language 2017-05-05 11:28:49 -07:00
howard-stearns
2ecc71a990 Annoncement Card visual tweeks. 2017-05-05 10:49:09 -07:00
Zach Fox
b41fb952ae UI changes - Thanks Alan! 2017-05-05 10:29:46 -07:00
Andrew Meadows
f809afae2f Merge pull request #10363 from jherico/qmlspam 
Removing logspam on toggling scripts window
 2017-05-05 08:29:12 -07:00
Howard Stearns
fc9e9e1d28 Merge pull request #10374 from howard-stearns/notification-circumstances 
Notification circumstances
 2017-05-04 16:18:58 -07:00
howard-stearns
9954380ce3 don't filter out the place you're at anymore 2017-05-04 14:44:48 -07:00
Andrew Meadows
7cb2bff4c5 Merge pull request #10350 from sethalves/fix-vr-2d-vr-tablet-crash 
Fix vr 2d vr tablet crash
 2017-05-04 10:08:55 -07:00
humbletim
34cadfc876 sort RunningScripts by caseless filename 2017-05-04 11:22:30 -04:00
Zach Fox
066b2db73f Make the change 2017-05-03 14:57:31 -07:00
Brad Davis
8e12c1959d Removing logspam on toggling scripts window 2017-05-03 09:53:32 -07:00
Vladyslav Stelmakhovskyi
e789b69a8e Merge branch 'master' into audio-source-sync 2017-05-02 20:57:01 +02:00
Seth Alves
6b2caf8081 Merge branch 'master' of github.com:highfidelity/hifi into fix-vr-2d-vr-tablet-crash 2017-05-02 09:41:47 -07:00
Seth Alves
71deac49c6 reset tablet to homescreen when going from 2d to vr 2017-05-01 17:06:15 -07:00
Howard Stearns
73c24a5240 Merge pull request #10344 from howard-stearns/announcement-styling 
goto announcement card styling
 2017-05-01 16:41:39 -07:00
howard-stearns
ca5318f121 remove debugging code 2017-05-01 15:57:22 -07:00
howard-stearns
545fd1355f cleanup 2017-05-01 15:45:26 -07:00
howard-stearns
61b738e3cd announcment styling 2017-05-01 15:35:17 -07:00
druiz17
67daa4b0a9 Merge pull request #10335 from druiz17/webview-js 
Implemented of a web app to bring up the tablet webView
 2017-05-01 15:03:55 -07:00
Dante Ruiz
763feccbe1 removed tabs 2017-05-01 18:07:42 +01:00
Vladyslav Stelmakhovskyi
28447cde0b Get rid of QML errors in HMD mode. Sync Audio menu in Tablet/HMD without recreating menu items 2017-05-01 18:41:38 +02:00
druiz17
2bf7b12c7d open webview from tabletwebscreen 2017-04-30 15:27:34 -07:00
Howard Stearns
b6ae0a5bde add nextTick, and cleanup 2017-04-28 20:06:13 -07:00
howard-stearns
f9debf1388 checkpoint 2017-04-28 16:53:08 -07:00
Dante Ruiz
59f84a60c5 saving work 2017-04-29 00:31:09 +01:00
Vladyslav Stelmakhovskyi
368334e07e Merge branch 'master' into audio-source-sync 2017-04-28 23:04:17 +02:00
Vladyslav Stelmakhovskyi
d18ac6dd49 Reimplemented Tablet Audio screen using C++ model 2017-04-28 23:02:28 +02:00
Howard Stearns
0ad8f4d985 remove debugging 2017-04-28 07:15:22 -07:00
howard-stearns
aed762e986 ux 2017-04-27 17:16:03 -07:00
howard-stearns
e4f259e630 back to non-fake data 2017-04-27 13:01:33 -07:00
howard-stearns
56196c03a3 pr review 2017-04-27 12:56:32 -07:00
howard-stearns
97777a416d Merge branch 'master' of https://github.com/highfidelity/hifi into new-address-bar 2017-04-27 12:02:02 -07:00
anshuman64
d146431e9b Merge pull request #10268 from druiz17/input-recorder 
Input recorder/ input playback system  for all input actions
 2017-04-26 16:20:20 -07:00
Zach Fox
9ace7a7488 Merge pull request #10279 from andrewd440/21174 
21174 Make the Particle Emitter Easier to Use
 2017-04-26 15:35:29 -07:00
Andrew Lowry
d3a9114676 Uses spaces instead of tabs for Edit.qml and EditTabView.qml. 2017-04-26 18:29:38 -04:00
anshuman64
5bd9b2e631 Merge pull request #10130 from ctrlaltdavid/21249 
New avatar record and playback script
 2017-04-26 15:18:30 -07:00
Dante Ruiz
95d6a451c6 fixed work mapping 2017-04-26 22:14:53 +01:00
Zach Pomerantz
532284f779 fix tablet resolve typo 2017-04-26 16:28:42 -04:00
Dante Ruiz
4df953d510 fixed text issue 2017-04-26 19:14:14 +01:00
Dante Ruiz
d8e6e8e7d0 Merge branch 'master' of github.com:highfidelity/hifi into input-recorder 2017-04-26 16:53:02 +01:00
Dante Ruiz
79d827c6be added requested features 2017-04-26 16:52:51 +01:00
Dante Ruiz
b78bae37be added keyboard for tabletWebview 2017-04-25 23:22:27 +01:00
Dante Ruiz
8c020a0ec2 saving work 2017-04-25 18:01:19 +01:00
Dante Ruiz
367a6ac03c first prototype 2017-04-24 22:09:01 +01:00
Dante Ruiz
d057dfebf0 got input recording to work 2017-04-24 19:57:38 +01:00
Andrew Lowry
6a218eaca9 Embeds colpick color picker in dat.GUI for particle explorer. 
Cleans up eslint for particleExplorer.js.
 2017-04-24 13:35:37 -04:00
Andrew Lowry
aea89824c5 Switches tablet edit tab to particle explorer when particle entities are 
selected or created.
 2017-04-24 13:35:37 -04:00
Dante Ruiz
64fcfd33a4 working on loading files 2017-04-21 22:38:53 +01:00
Dante Ruiz
cc34cb96e4 making ui for input recorder 2017-04-21 18:15:47 +01:00
howard-stearns
4ea882cad1 faster initial response 2017-04-20 14:56:34 -07:00
howard-stearns
ce7145a388 Announcement cards, debug data. 2017-04-20 14:40:24 -07:00
howard-stearns
bc77eeeabd scroll, margins 2017-04-20 13:43:55 -07:00
howard-stearns
b8e9fb67b8 old style card fonts, margins, etc. 2017-04-19 16:34:10 -07:00
howard-stearns
2512255dd0 reusable feeds 2017-04-19 16:33:02 -07:00
howard-stearns
3ce238b8a0 make feed self contained 2017-04-19 13:45:58 -07:00
David Rowe
2108300272 Merge branch 'master' into 21249 2017-04-20 08:43:00 +12:00
howard-stearns
c5f1455872 go horizontal 2017-04-19 12:47:28 -07:00
Zach Fox
7505b82189 Merge pull request #10046 from Triplelexx/21224 
21224 - Allow people to save avatar bookmarks
 2017-04-18 11:10:50 -07:00
David Rowe
dae6d6fb69 Stub desktop dialog to select recording to play from ATP assets 2017-04-18 11:43:42 +12:00
Dante Ruiz
31b61c3225 removed white space 2017-04-18 00:24:34 +01:00
Dante Ruiz
e46d9da98f fixed merge conflict 2017-04-18 00:22:35 +01:00
Zach Fox
7a7cfb84e5 Remove HMD keyboard focus toggle on AddressBar input 2017-04-17 10:08:40 -07:00
Zach Fox
a623ced64e Fix hover states on back/forward buttons 2017-04-14 12:43:07 -07:00
Dante Ruiz
863d64b2fd removed comments and non-needed files 2017-04-14 18:06:44 +01:00
Dante Ruiz
7189d4d7fa daving web work 2017-04-14 17:01:23 +01:00
Zach Fox
0543709081 Focus fix 2017-04-13 16:10:36 -07:00
Zach Fox
520ceebf5b Small HMD tweaks 2017-04-13 15:52:59 -07:00
Zach Fox
d9dc8ebc41 More improvements 2017-04-13 15:48:51 -07:00
Zach Fox
71caf85a27 Quick fix! 2017-04-12 14:57:44 -07:00
David Kelly
a12407ddda Merge pull request #10202 from davidkelly/dk/3934 
Connection sort change
 2017-04-12 10:42:04 -07:00
David Kelly
058a5b14a4 damn linter didn't run - vimrc work ahead... 2017-04-12 10:22:40 -07:00
David Kelly
9376ac646f offline people sort change 2017-04-12 08:41:36 -07:00
Dante Ruiz
d823093ddb fixed merge conflict 2017-04-11 16:58:25 +01:00
Chris Collins
d8581c1026 Merge pull request #10176 from vladest/snaps_hover 
Added hover to Snaps and Places
 2017-04-10 16:09:43 -07:00
Seth Alves
eb281389f5 fix includeActions so places show up in All 2017-04-10 14:46:31 -07:00
Howard Stearns
99ba07dcb2 Merge pull request #10181 from davidkelly/dk/infoButtonFix 
re-enable the info button for user images on nearby tab
 2017-04-10 13:27:33 -07:00
Dante Ruiz
e0f19944bc Merge branch 'master' of github.com:highfidelity/hifi into snapshot-fix 2017-04-10 20:58:46 +01:00
Dante Ruiz
4e94aaa9e8 finished allowing to go back to previous app 2017-04-10 20:58:10 +01:00
Howard Stearns
8682df6bb7 Merge pull request #10154 from davidkelly/dk/3995 
updated connection instructions
 2017-04-10 12:43:20 -07:00
David Kelly
5fc4bbc260 re-enable the info button for user images on nearby tab 2017-04-10 12:26:34 -07:00
David Kelly
082d0964d2 oops 2017-04-10 11:08:45 -07:00
David Kelly
cd55728490 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/4036 2017-04-10 10:09:27 -07:00
David Kelly
46b6903b93 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3995 2017-04-10 10:08:17 -07:00
Vladyslav Stelmakhovskyi
393b24452d Added hover to Snaps and Places 2017-04-10 17:07:59 +02:00
David Kelly
3ea6cac45a HMD.mounted instead of HMD.isMounted 2017-04-10 08:05:01 -07:00
druiz17
92bb7f2329 saving work 2017-04-09 18:55:53 -07:00
Dante Ruiz
86c67a3017 tablet pages 2017-04-08 02:01:21 +01:00
Chris Collins
8e12f62cbb Merge pull request #10153 from druiz17/goto-fix 
Ability to toggle goto with the crt-l and enter keys
 2017-04-07 16:36:41 -07:00
Chris Collins
1175f65cb0 Merge pull request #10162 from vladest/goto-white-buttons-fix 
Check if offset outside image, set to last image
 2017-04-07 15:58:48 -07:00
David Kelly
948a821824 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3995 2017-04-07 14:30:22 -07:00
David Kelly
174b2978e3 username stays around now when tabbing to connections 2017-04-07 14:01:36 -07:00
Howard Stearns
57d8ec883e Merge pull request #10163 from davidkelly/dk/3938 
updated availability combo dialog
 2017-04-07 13:57:17 -07:00
Dante Ruiz
cde9310f3e goto home button fix 2017-04-07 21:35:28 +01:00
Dante Ruiz
909fda98a4 git goto button toggle hightlight 2017-04-07 21:01:53 +01:00
David Kelly
870e003311 Scattered X glyphs around the letterbox and combo dialogs 2017-04-07 11:12:54 -07:00
David Kelly
ee9bc0bfa4 updated availability combo dialog 2017-04-07 10:25:37 -07:00
Vladyslav Stelmakhovskyi
9a563ba02f Check if offset outside image, set to last image 2017-04-07 19:17:09 +02:00
David Kelly
12b5b91754 Merge pull request #10161 from howard-stearns/fix-pal-connections-help 
fix pal connections-tab help trigger
 2017-04-07 09:34:11 -07:00
Howard Stearns
468cc7f19b Merge pull request #10150 from davidkelly/dk/3930 
friends checkbox speedup
 2017-04-07 09:27:39 -07:00
David Kelly
cb092d67dd Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3995 2017-04-07 09:01:59 -07:00
Howard Stearns
03013ecb3a fix pal connections-tab help trigger 2017-04-07 07:30:36 -07:00
David Kelly
d64a803451 no need to set checked 2017-04-06 16:08:48 -07:00
David Kelly
a1c211395b Merge pull request #10152 from howard-stearns/fix-sort-by-connections-friend-column 
fix sorting by pal connections-tab friends column
 2017-04-06 15:43:21 -07:00
David Kelly
179a445f59 updated connection instructions 2017-04-06 15:21:10 -07:00
Howard Stearns
67f2cc3567 Merge pull request #10148 from davidkelly/dk/3936 
pal selection changes
 2017-04-06 14:58:46 -07:00
howard-stearns
9577102c22 fix sorting by pal connections-tab friends column 2017-04-06 14:45:08 -07:00
Dante Ruiz
a89081601c fix merge issues 2017-04-06 22:31:47 +01:00
Dante Ruiz
52fd446d4d toggle goto in tablet 2017-04-06 22:27:37 +01:00
David Kelly
331f2da4f8 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/3936 2017-04-06 14:22:08 -07:00
Seth Alves
3c6429cdf3 Merge pull request #10103 from vladest/master-qml-bugfixes 
Master qml bugfixes
 2017-04-06 14:22:06 -07:00
David Kelly
726395ac3e friends checkbox speedup 2017-04-06 14:07:07 -07:00
Howard Stearns
f7ef587c61 Merge pull request #10138 from davidkelly/dk/3935 
Now you can forget connections
 2017-04-06 14:05:25 -07:00
David Kelly
e0a1422345 pal selection changes 2017-04-06 12:07:51 -07:00
howard-stearns
1d60a55d5f notice login/logout change in pal 2017-04-06 11:20:08 -07:00
David Kelly
85c78da839 updated, plus fixed some annoying errors in logs from Pal.qml 2017-04-06 11:16:51 -07:00
David Kelly
06bd9c97bf remove info button from avatar image 2017-04-05 18:21:54 -07:00
David Kelly
61ece265f4 now you can forget connections 2017-04-05 18:16:16 -07:00
Dante Ruiz
34f3c4abee removed mousearea 2017-04-05 18:08:03 +01:00
Dante Ruiz
de8b7eeb27 removed commented code 2017-04-05 18:02:55 +01:00
Dante Ruiz
24b89275f2 fix new model dialog textInput 2017-04-05 18:00:43 +01:00
Lexx
af95741a7e Merge branch 'master' into 21224 2017-04-04 18:24:49 +01:00
Howard Stearns
b0fa784267 Merge pull request #10108 from davidkelly/dk/PalImprovementsMostlyZach 
Dk/pal improvements mostly zach
 2017-04-04 10:03:10 -07:00
David Kelly
08ac25473f wording change 2017-04-04 09:53:09 -07:00
Vladyslav Stelmakhovskyi
367555acdb Fixed BasicTableView.qml:610:17: QML Item: Binding loop detected for property width. width must be explicitly set 2017-04-04 16:35:21 +02:00
Vladyslav Stelmakhovskyi
332f9bb283 Fixed TabletMenuStack.qml:56: Error: Cannot assign [undefined] to QString. Fixed keyboardRaised undefined error 2017-04-04 16:22:40 +02:00
David Kelly
4d6886d1f4 cr feedback, plus changed 'People' to 'Connections' in a couple places 2017-04-03 17:03:14 -07:00
Seth Alves
fbf2014f04 Merge pull request #10102 from vladest/tablet-ui-goto 
Put current address to location instead of inputfield
 2017-04-03 16:09:58 -07:00
David Kelly
4629accc9c style updates 2017-04-03 15:35:53 -07:00
Vladyslav Stelmakhovskyi
990e1379e3 Fix warning in Audio page. Revert commented out assert in OffscreenGLCanvas: move to separate task 
(cherry picked from commit d966979c2368b159cf5b96c5fd535411cda019b8)
 2017-04-03 19:33:41 +02:00
Vladyslav Stelmakhovskyi
156166ce4a Fixed another warning in TabletAddressDialog.qml 
(cherry picked from commit 73c923bb522ad711380a2fcdaa9babe9f01a639a)
 2017-04-03 19:33:13 +02:00
Vladyslav Stelmakhovskyi
9e96888534 Fixed warning: TabletAddressDialog.qml:546: Error: Cannot assign to non-existent property 'shown' 
(cherry picked from commit e70c2cdcc74f9fd43273dca268433cdefd9ecf40)
 2017-04-03 19:32:09 +02:00
Vladyslav Stelmakhovskyi
6b7f3f7125 Fixed warning: TabletAddressDialog.qml:282:13: QML ListView: Cannot specify top, bottom, and verticalCenter anchors at the same time. 
(cherry picked from commit b11e245cb1b19149ff00f16b718ff4088b856f3e)
 2017-04-03 19:32:09 +02:00
Vladyslav Stelmakhovskyi
849d65f95f Fixed warning: Tablet.qml:205: TypeError: Cannot read property of null 
(cherry picked from commit b1dc14b355bc6053a0e264a057a799a4d446e347)
 2017-04-03 19:32:09 +02:00
Vladyslav Stelmakhovskyi
d207dae5b7 Put current address to location instead of inputfield 2017-04-02 20:02:40 +02:00
Zach Fox
f148bca1c0 More progress on ComboDialog 2017-03-31 17:12:41 -07:00
Zach Fox
8a96969471 Merge pull request #9873 from highfidelity/PAL_v2 
PAL v2.0
 2017-03-31 17:00:41 -07:00
Zach Fox
fd3167ca9c 'PEOPLE' back to 'CONNECTIONS' 2017-03-31 16:41:25 -07:00
David Kelly
8ceb6a20f0 friend/unfriend working 2017-03-31 15:05:21 -07:00
Zach Fox
6a4c2c5e12 Fix issues; checkpoint on new ComboDialog 2017-03-31 14:56:42 -07:00
Dante Ruiz
70d2d69557 Merge branch 'master' of github.com:highfidelity/hifi into tablet-webView 2017-03-31 19:29:31 +01:00
Dante Ruiz
9658e1b8ac better web view handling 2017-03-31 19:25:03 +01:00
Dante Ruiz
8f402c73b0 saving work 2.0 2017-03-31 01:18:31 +01:00
Zach Fox
05c34fb3ee Move some things around so ComboBox works (and layout improves) 2017-03-30 15:19:19 -07:00
Zach Fox
c24b8b47a9 Minor layout changes 2017-03-30 14:08:29 -07:00
Howard Stearns
0edbf1fbd9 Merge pull request #10044 from howard-stearns/pal-backend-integration 
Pal backend integration
 2017-03-30 12:55:11 -07:00
David Kelly
e66c075f8e Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2 2017-03-30 10:14:29 -07:00
Dante Ruiz
cb8660c699 saving work 2017-03-30 01:34:14 +01:00