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

3613 commits

Author SHA1 Message Date
Sam Gateau
78fee71524 seprating the constraint function 2017-09-05 10:04:49 -07:00
Sam Gateau
fd2d246f05 Merge branch 'master' of https://github.com/highfidelity/hifi into black 2017-09-02 09:28:24 -07:00
David Kelly
8723ff2df2 Merge pull request #11294 from zfox23/commerce_walletPassphraseModal 
Commerce: Wallet Passphrase Input Modal
 2017-09-01 17:46:09 -07:00
Seth Alves
8ccacf34f4 Merge pull request #11290 from Menithal/21484 
WL21484 - Add an additional parameter for entity animations to "allow translation"
 2017-09-01 15:34:07 -07:00
samcake
2035940cc9 Duplicating the qml hif stuff to be able to use the same objects 2017-09-01 15:33:17 -07:00
samcake
b243475cc9 New stuff for better rendering f ui 2017-09-01 15:32:23 -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
samcake
259ec3ec11 Merge branch 'master' of https://github.com/highfidelity/hifi into black 2017-09-01 09:30:11 -07:00
Sam Gateau
a3f1c487f1 adding disabling of jittering for comparison 2017-08-31 23:42:43 -07:00
samcake
ddb598203e COmparing against fxaa 2017-08-31 18:27:47 -07:00
Zach Fox
fa25c434ca Messages to marketplaces.js 2017-08-31 15:50:42 -07:00
Brad Davis
65b49a958f Merge branch 'master' into 21484 2017-08-31 14:59:30 -07:00
Zach Fox
ce32d2d420 Checkout and Purchases 2017-08-31 14:12:05 -07:00
David Kelly
de2ce1cd5f warning 2017-08-31 13:23:38 -07:00
druiz17
98b1fe6138 Merge pull request #11266 from ElderOrb/case6819 
6819 - Create button not disabled
 2017-08-31 12:36:08 -07:00
David Kelly
396f108182 forgot this the first time 2017-08-31 12:18:46 -07:00
Zach Fox
914a6bae00 Commerce: Wallet Passphrase Modal 2017-08-31 12:18:38 -07:00
Zach Fox
164eeaae64 Fix the duplicated buy buttons for admins on Marketplace 2017-08-31 10:41:44 -07:00
samcake
3a18d09bec Merge branch 'master' of https://github.com/highfidelity/hifi into black 2017-08-31 08:49:12 -07:00
Sam Gateau
16fbe00ef5 FIxing the jittering projection modification 2017-08-30 22:42:55 -07:00
David Kelly
988ee8c8d1 fix image provider, couple other things 2017-08-30 15:23:54 -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
samcake
af09ae0686 Some more refinment, no clear changes though 2017-08-29 18:12:05 -07:00
howard-stearns
5b264a867a fix wallet login (and share code with snapshot login) 2017-08-29 16:05:01 -07:00
Zach Fox
a9c99854f9 Haven't purchased anything yet UI 2017-08-29 15:39:07 -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
Zach Fox
91f4e59f61 Misc fixes. Get started. 2017-08-29 12:33:44 -07:00
samcake
66d35118cb Refining the debugging to better understand the issues 2017-08-28 18:14:46 -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
samcake
7d8356686c Merge branch 'master' of https://github.com/highfidelity/hifi into black 2017-08-28 09:28:00 -07:00
Sam Gateau
a98d861600 Merge pull request #11242 from SamGondelman/tabletLayer2 
Web overlays and entities are always non anti-aliased
 2017-08-28 09:10:14 -07:00
Sam Gateau
0f67f9bc52 Eposing the jitter sequence and debugging it 2017-08-27 22:08:33 -07:00
Sam Gateau
4035478b9a Merge branch 'master' of https://github.com/highfidelity/hifi into black 2017-08-25 18:18:35 -07:00
samcake
878ac64721 adding the qml styles 2017-08-25 17:00:27 -07:00
samcake
21987c4c5d Adding the code for the color clamping 2017-08-25 16:58:05 -07:00
Zach Fox
a03f9592c1 Inventory to Purchases 2017-08-25 16:34:48 -07:00
Zach Fox
d19377d2d4 Saving 2017-08-25 15:56:30 -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
samcake
46c6d52036 Merge branch 'master' of https://github.com/highfidelity/hifi into black 2017-08-25 08:51:06 -07:00
samcake
914db1d5a6 adding the tablet apps 2017-08-24 18:06:07 -07:00
samcake
9335acc887 Merge and a lot of rewriting the color conversion 2017-08-24 18:02:11 -07:00
Zach Fox
3980a478d9 Only show 'buy' on costed items' 2017-08-24 16:38:44 -07:00
Zach Fox
e2c74d8b88 Initial progress 2017-08-24 15:22:30 -07:00
SamGondelman
4a49801217 web overlays and entities are always nonAA 2017-08-24 14:23:21 -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
Menithal
e47dfeaeab Merge remote-tracking branch 'upstream/stable' into 21484 2017-08-24 21:37:20 +03:00
samcake
b6a4ec910c Merge branch 'master' of https://github.com/highfidelity/hifi into black 2017-08-24 11:05:28 -07:00