Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
58600 commits 2 branches 0 tags 1.1 GiB
Commit graph

3583 commits

Author SHA1 Message Date
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
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
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
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
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
Zach Fox
22d3857501 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_checkoutAndInventory 2017-08-28 15:10:17 -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
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
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
Brad Hefta-Gaub
5c832eae9c Merge pull request #11226 from SamGondelman/miceWithLasers 
EntityTreeRender uses RayPick API with precision picking
 2017-08-24 08:10:21 -07:00
Zach Fox
e815946744 Merge pull request #11231 from ElderOrb/Case5830 
5830: Go-To menu shows up blank except for address bar
 2017-08-23 14:33:04 -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
SamGondelman
d7b3686364 include noncollidable entities 2017-08-22 17:37:51 -07:00
Zach Fox
4d8980b538 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletApp 2017-08-22 12:30:24 -07:00
Zach Fox
f1da7a6381 Checkpoint 2017-08-22 11:53:37 -07:00
vladest
b7a048c6ea Adopt clonable settings to new styling 2017-08-22 11:23:55 -07:00
Chris Collins
a85022bb93 Merge pull request #11216 from MidnightRift/emitterShouldTrail 
Change emitShouldTrail to emitterShouldTrail.
 2017-08-21 15:29:05 -07:00
Zach Fox
512a08f67f Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletApp 2017-08-18 17:05:56 -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
anshuman64
a7090c7e07 Merge pull request #11211 from vladest/edit_clonable_lost 
Adopt cloneable settings to new styling
 2017-08-18 15:37:37 -07:00
Midnight
5f162c0352 Change emitShouldTrail to emitterShouldTrail. 2017-08-18 15:10:58 -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
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
vladest
d29d4b5016 Adopt clonable settings to new styling 2017-08-18 21:44:44 +02:00
SamGondelman
c9f4958925 handControllerGrab fix, maybe, hopefully 2017-08-18 10:39:40 -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