Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-13 08:36:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
62016 commits 76 branches 59 tags 1.2 GiB
Commit graph

1450 commits

Author SHA1 Message Date
Ryan Huffman
883bdc6003 Merge pull request #11425 from Atlante45/feat/auto-bake 
Asset Browser auto-refresh
 2017-09-22 13:17:04 -07:00
vladest
5aab9bf5b0 Merge branch 'master' into fix_dde_visibility 2017-09-22 21:10:21 +02:00
vladest
4d530ef173 Make sure menu items vill be created even its not visible at the moment. Cleanup warnings on app close 2017-09-22 21:08:34 +02:00
Atlante45
6cdbf0c44a Fix RunningScripts in tablet mode 2017-09-21 15:53:27 -07:00
Atlante45
1a571d0991 Add Asset Server auto refresh 2017-09-21 14:41:59 -07:00
Ryan Huffman
a56303a3fe Merge pull request #11379 from highfidelity/feat/auto-bake 
Add auto baking to Asset Server and mesh compression for FBXs
 2017-09-21 08:33:51 -07:00
vladest
c48aba423a Rename check box 2017-09-20 22:48:39 +02:00
vladest
3376786288 Added text selection on focus. Added basic check for text within url input field to decide is this something for search or for goto. Limited popup list height to do not cover virtual keyboard 2017-09-20 17:02:54 +02:00
vladest
56e6c8674a Merge branch 'master' into webbrowser_updates 2017-09-20 14:38:09 +02:00
vladest
7a36894f76 Make sure audio device not gets unchecked 2017-09-19 23:25:41 +02:00
vladest
10f7f08171 Added peak model, missed during merging 2017-09-19 21:42:52 +02:00
vladest
6297448e90 Build fix 2017-09-19 19:49:19 +02:00
vladest
6c32783a09 Merge branch 'master' into audio_devices_split 2017-09-19 17:43:03 +02:00
vladest
e26118254f Implemented Audio injector in Tablet scripting interface. Added missed sound events 2017-09-18 19:40:06 +02:00
vladest
bb214d7bf3 Merge branch 'master' into tablet_extended_sounds 2017-09-17 16:16:03 +02:00
beholder
353bab5277 7384 On Domains without Edit Access, Create Button Text still Highlights 
(override color in states if captionColorOverride was specified)
 2017-09-16 16:50:45 +03:00
Atlante45
a37642ba44 Pull Auto-Baking changes to TabletAssetServer.qml 2017-09-15 14:43:15 -07:00
Atlante45
c4d018504b Pull Auto-Baking changes to TabletAssetServer.qml 2017-09-15 13:28:51 -07:00
vladest
de4f34aacb Add resizable flag. Use the flag for Create only 2017-09-15 21:49:38 +02:00
Atlante45
8711823a9b Sync up AssetServer.qml and TabletAssetServer.qml 2017-09-15 11:44:08 -07:00
Atlante45
ae14f1f88e Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake 2017-09-14 15:34:20 -07:00
Seth Alves
10494cf3e0 Merge pull request #11359 from vladest/fix_runningscripts_selection 
use selection model of TreeView
 2017-09-14 11:22:08 -07:00
Seth Alves
11df5a447e Merge pull request #11310 from ElderOrb/case6718 
6718 PR11082: Help text cannot be dismissed by clicking on the text i…
 2017-09-14 11:17:48 -07:00
vladest
61b283743e Merge branch 'master' into tablet_extended_sounds 2017-09-14 19:52:35 +02:00
vladest
7233c47257 use selection model of TreeView 2017-09-14 15:36:12 +02:00
Atlante45
2e84f48539 Fix QML errors 2017-09-13 09:54:55 -07:00
David Kelly
1903f65e45 oops 2017-09-08 16:58:12 -07:00
David Kelly
0a3958f743 cr feedback 2017-09-08 16:06:30 -07:00
David Kelly
99cdbbe306 and lets fix the purchases flow too 2017-09-08 14:00:09 -07:00
David Kelly
db0ecb61fd Merge pull request #11325 from davidkelly/dk/UserHfcAccountRework 
Use new hfc account endpoint
 2017-09-08 09:03:53 -07:00
David Kelly
45c8dd9dd4 cr feedback 2017-09-08 05:28:41 -07:00
vladest
832e4aa5eb Introducong tablet audio events 2017-09-08 09:51:10 +02:00
David Kelly
efdc340c5c Use new hfc account endpoint 2017-09-07 18:15:04 -07:00
Stephen Birarda
5e1decb02b Merge branch 'master' of github.com:highfidelity/hifi into feat/auto-bake 2017-09-07 12:06:53 -07:00
Brad Hefta-Gaub
c5098abfb9 Merge pull request #10937 from kencooke/zzmp-audio/peak-values 
Add peak values for all input devices in selection dialog
 2017-09-07 11:58:50 -07:00
Howard Stearns
a0ae9ee747 Merge pull request #11311 from davidkelly/dk/walletCleanup 
wallet cleanup
 2017-09-06 14:29:24 -07:00
anshuman64
94e1545e58 Merge pull request #11298 from ElderOrb/case7382 
7382 Create Menu does not Work on Tablet
 2017-09-06 14:09:41 -07:00
vladest
e17f05a337 Correct UI 2017-09-06 14:52:08 +02:00
vladest
57643bd904 Merge branch 'master' into audio_devices_split 2017-09-06 14:20:41 +02:00
David Kelly
89cda8d306 oops -- === not == 2017-09-05 17:15:25 -07:00
David Kelly
1fd30b1e0f fix passphrase reset 2017-09-05 17:03:11 -07:00
David Kelly
350cee5f35 Wallet cleanup 2017-09-05 16:33:16 -07:00
beholder
41d014ca0c 6718 PR11082: Help text cannot be dismissed by clicking on the text inside the box. 2017-09-06 02:11:40 +03:00
Dante Ruiz
e69227aef8 Merge pull request #11209 from vladest/tablet_login_button 
Added login button to Tablet
 2017-09-05 12:59:02 -07:00
David Kelly
3bc45aefb1 Reset passphrase fix 2017-09-05 10:04:16 -07:00
vladest
87a5a6a5b9 Merge branch 'master' into webbrowser_updates 2017-09-05 13:12:27 +02:00
vladest
6de00c7969 Implemented suggestions popup. Cleanup 2017-09-05 13:11:52 +02:00
vladest
748ef8bb87 Enable edit in combobox 2017-09-03 18:10:53 +02:00
beholder
b5faa8ac56 7382 Create Menu does not Work on Tablet 2017-09-02 18:20:00 +03:00
David Kelly
90316e275a Merge branch 'commerce_walletPassphraseModal' of https://github.com/zfox23/hifi into commerce_walletPassphraseModal 2017-09-01 13:33:23 -07:00
David Kelly
9fe6ce0337 working change passphrase. some cleanup to come 2017-09-01 13:11:56 -07:00
Zach Fox
3cf0df518f Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletPassphraseModal 2017-09-01 11:53:47 -07:00
Zach Fox
51699c9a6a Minor changes to fonts and colors 2017-09-01 11:44:46 -07:00
Zach Fox
8fcdfa171d Add debug button to clear passphrase 2017-08-31 16:51:39 -07:00
Zach Fox
1bfc767daf Quick fixes 2017-08-31 16:42:14 -07:00
Zach Fox
fa25c434ca Messages to marketplaces.js 2017-08-31 15:50:42 -07:00
Zach Fox
0a9e3e8967 Remove unnecessary code 2017-08-31 15:46:37 -07:00
Zach Fox
2c2500875f Fixes and improvements 2017-08-31 15:39:58 -07:00
Zach Fox
eab2947d40 Auth flow 2017-08-31 15:16:29 -07:00
Zach Fox
ce32d2d420 Checkout and Purchases 2017-08-31 14:12:05 -07:00
David Kelly
cdadaa8c9c missed one 2017-08-31 13:41:53 -07:00
David Kelly
de2ce1cd5f warning 2017-08-31 13:23:38 -07:00
Zach Fox
21a73b2f39 Changes in what I think are the right direction 2017-08-31 13:16:10 -07:00
druiz17
98b1fe6138 Merge pull request #11266 from ElderOrb/case6819 
6819 - Create button not disabled
 2017-08-31 12:36:08 -07:00
Zach Fox
914a6bae00 Commerce: Wallet Passphrase Modal 2017-08-31 12:18:38 -07:00
David Kelly
8fbdd207c8 display hfc in "pennies" 2017-08-31 12:10:12 -07:00
vladest
d6a7e69275 Merge branch 'master' into webbrowser_updates 2017-08-31 15:50:04 +02:00
David Kelly
962d1fc81d Merge branch 'master' of https://github.com/highfidelity/hifi into reset-wallet 2017-08-30 15:30:29 -07:00
David Kelly
988ee8c8d1 fix image provider, couple other things 2017-08-30 15:23:54 -07:00
vladest
b547b2573e Added logged in property 2017-08-30 23:15:39 +02:00
Zach Fox
17d999e721 Fixes 2017-08-30 13:25:34 -07:00
vladest
903036a709 Merge branch 'master' into tablet_login_button 2017-08-30 22:12:03 +02:00
Zach Fox
580865fa5a Add skeleton for infinite scroll 2017-08-30 12:54:26 -07:00
Zach Fox
7a7d7f95d7 Polish transaction history and prepare for whatever new design 2017-08-30 12:45:13 -07:00
Zach Fox
fb4b0f60fa Remove most dependencies on 'onVisibleChanged' 2017-08-30 11:55:29 -07:00
howard-stearns
b8da08ca42 reset wallet 2017-08-30 11:29:43 -07:00
Zach Fox
f366743be7 Login; punctuationMode; new images 2017-08-30 11:07:03 -07:00
Zach Fox
1b48319a3f Merge pull request #11267 from zfox23/commerce_zachsPunchlist1 
Commerce: Zachs Punchlist 01
 2017-08-30 10:10:56 -07:00
Zach Fox
6ee634b90a Lock overlay on top of security image 2017-08-29 17:19:34 -07:00
druiz17
2a97257698 Merge pull request #11140 from ElderOrb/case6788 
6788: You can deselect your current view mode
 2017-08-29 17:15:51 -07:00
Zach Fox
5d1170c5d6 Only make message appear after inventory received 2017-08-29 16:17:59 -07:00
Zach Fox
a9c99854f9 Haven't purchased anything yet UI 2017-08-29 15:39:07 -07:00
Zach Fox
c7ad875485 Virtual keyboard and logic 2017-08-29 15:27:53 -07:00
Zach Fox
50241078ae Buncha punchlist items checked off 2017-08-29 14:30:00 -07:00
beholder
180acbc188 6819 - Create button not disabled 2017-08-29 23:49:44 +03:00
beholder
a0a43ebf26 show checkbox or radiobutton dependently on exclusiveGroup presence 2017-08-29 23:23:16 +03:00
vladest
55eed37698 Start working on autocompletion 2017-08-29 20:47:09 +02:00
David Kelly
84126d8f95 cr feedback 2017-08-29 08:46:13 -07:00
David Kelly
67f25adac0 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/transactionHistoryDisplay 2017-08-29 08:02:53 -07:00
David Kelly
a7af114144 fix wallet, use text from server in history (for now) 2017-08-28 17:04:19 -07:00
Zach Fox
22d3857501 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_checkoutAndInventory 2017-08-28 15:10:17 -07:00
Zach Fox
37b6099f36 Hook up root_file_url 2017-08-28 12:46:01 -07:00
Zach Fox
1c1b841a86 Fix security images; actually do the right thing when wallet not set up 2017-08-28 12:18:53 -07:00
Atlante45
ca62e7168c Merge branch 'master' of https://github.com/highfidelity/hifi into feat/auto-bake 2017-08-28 11:41:23 -07:00
Zach Fox
ceb38e261d HMD Keyboard for purchases filterBar 2017-08-28 10:45:08 -07:00
David Kelly
3955624e63 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/transactionHistoryDisplay 2017-08-28 10:13:21 -07:00
Zach Fox
ea00668725 Again to Another 2017-08-28 10:04:26 -07:00
Zach Fox
67f3b5c027 Remove quantity 2017-08-28 09:58:45 -07:00
Zach Fox
52cb1dd893 Correctly handle non-JSON items 2017-08-28 09:54:51 -07:00
Zach Fox
e293d122b1 Add security image to Checkout and Purchases 2017-08-28 09:33:30 -07:00
vladest
d8fb7300c3 Merge branch 'master' into tablet_login_button 2017-08-28 16:59:35 +02:00
vladest
d4332e7776 Adopting according comments from designers 2017-08-26 20:55:16 +02:00
vladest
7796946343 Merge branch 'master' into audio_devices_split 2017-08-26 20:00:00 +02:00
Zach Fox
4c16366562 Ints aren't floats, silly! 2017-08-25 16:55:50 -07:00
Zach Fox
50f7f91d4e Close the loop. 2017-08-25 16:49:02 -07:00
Zach Fox
a03f9592c1 Inventory to Purchases 2017-08-25 16:34:48 -07:00
druiz17
06ab8ddbb2 Merge pull request #11251 from elisa-lj11/blocks 
Blocks app accommodates updated Blocks website
 2017-08-25 16:32:14 -07:00
Zach Fox
b1378816d5 Revert "MUCH faster filter!" 
This reverts commit 5173774db0.
 2017-08-25 16:23:36 -07:00
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
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