Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-16 15:54:25 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
58934 commits 25 branches 0 tags 1.1 GiB
Commit graph

58934 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Kelly
a7af114144 fix wallet, use text from server in history (for now) 2017-08-28 17:04:19 -07:00
Seth Alves
b9c68f9156 give MouseRayPickResultOperator and SetPrecisionPickingOperator default values to avoid crash on startup 2017-08-28 17:01:01 -07:00
David Rowe
67eb92da8f Style color swatches 2017-08-29 10:51:36 +12: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
0cdef28cfd Fixup after Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface 2017-08-28 14:55:18 -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
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
Chris Collins
d675ee9427 Merge pull request #11250 from jherico/thread_safety 
Additional locking in model entities
 2017-08-28 09:22:30 -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
vladest
d8fb7300c3 Merge branch 'master' into tablet_login_button 2017-08-28 16:59:35 +02:00
David Rowe
9abcf9525c Use Settings values to determine whether or not swatches are populated 2017-08-28 15:51:11 +12:00
David Rowe
8dd06bc270 Style color picker button 2017-08-28 12:06:26 +12:00
David Rowe
c8381f32bb Style current color indicator 2017-08-27 21:15:27 +12:00
David Rowe
64821ccd76 Update general Color options layout 2017-08-26 17:09:04 +12:00
David Rowe
b0ef570ce0 Style Group options 2017-08-26 14:20:37 +12:00
David Rowe
c29a900588 Fix button hovering and pressing problems 2017-08-26 12:08:37 +12: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
David Rowe
2899d51835 Fix "Finish" buttons not clearing tool action 2017-08-26 11:18:25 +12: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
David Rowe
73a6f1f278 Style Delete options 2017-08-26 10:47:41 +12:00
Zach Fox
153c131482 Initial inventory progress 2017-08-25 15:28:35 -07:00
Zach Fox
5487179a79 So much progress 2017-08-25 15:06:14 -07:00
David Rowe
7e817652a7 Style Clone options 2017-08-26 09:51:51 +12: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
5bbe3c5a94 Merge pull request #11246 from davidkelly/dk/encryptionBug 
security image bug
 2017-08-25 14:14:22 -07:00
David Kelly
f015ac3c68 get transaction history into qml 2017-08-25 13:55:38 -07:00
Zach Fox
a024e82c5a Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_checkoutAndInventory 2017-08-25 13:53:48 -07:00
Zach Fox
3fdfe3fe68 Merge pull request #11249 from zfox23/commerce_walletStatus 
Huge cleanup of Wallet logic
 2017-08-25 13:53:17 -07:00
Zach Fox
dd9bb17791 Progress! 2017-08-25 12:13:51 -07:00
Brad Davis
3ad32af975 Additional locking in model entities 2017-08-25 11:49:45 -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
David Kelly
0f722992a5 add delete to client of decryptFile 2017-08-25 11:24:37 -07:00
Elisa Lupin-Jimenez
4c40e3bdf4 fixed weird info box display of filenames 2017-08-25 11:21:07 -07:00
Zach Fox
d192009722 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_checkoutAndInventory 2017-08-25 11:20:26 -07:00
Elisa Lupin-Jimenez
7cee80f0cf my own objects (or rather objects with low poly count) download now 2017-08-25 11:09:11 -07:00
Zach Fox
453897b9e2 Huge cleanup! 2017-08-25 10:56:53 -07:00
David Kelly
c316e50f0f security image bug 2017-08-25 10:29:40 -07:00
Elisa Lupin-Jimenez
ee36fd579c Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-08-25 09:55:48 -07:00