Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-05-08 03:08:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
58531 commits 69 branches 58 tags 1.2 GiB
Commit graph

2292 commits

Author SHA1 Message Date
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
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
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
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
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
Elisa Lupin-Jimenez
2b44608ece Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-08-17 10:18:40 -07:00
Chris Collins
9c9bcd80b8 Merge pull request #11191 from SamGondelman/logging 
Miscellaneous logging fixes
 2017-08-16 15:46:32 -07:00
Zach Fox
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
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
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
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