Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-06-22 01:40:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
61951 commits 72 branches 59 tags 1.2 GiB
Commit graph

61951 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zach Fox
a03f9592c1 Inventory to Purchases 2017-08-25 16:34:48 -07:00
Atlante45
0755b77615 Fix for mac build 2017-08-25 16:32:32 -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
Atlante45
065721d23f Merge branch 'feat/auto-bake' of https://github.com/huffman/hifi into feat/auto-bake 2017-08-25 16:22:14 -07:00
Ryan Huffman
7d08a5788f Move outputFiles from FBXBaker to Baker 2017-08-25 16:21:00 -07:00
David Rowe
2899d51835 Fix "Finish" buttons not clearing tool action 2017-08-26 11:18:25 +12:00
Atlante45
700b11e28b Fix bad conditional 2017-08-25 16:17:37 -07:00
Zach Fox
5173774db0 MUCH faster filter! 2017-08-25 16:15:07 -07:00
Atlante45
a36ddf7b6d Fix failed connection 2017-08-25 16:13:29 -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
Anthony J. Thibault
3ac09b7716 Fix run blends and removed debug draws 2017-08-25 15:48:53 -07:00
David Rowe
73a6f1f278 Style Delete options 2017-08-26 10:47:41 +12:00
Atlante45
eaa2b9fda8 Fix packet version conflict 2017-08-25 15:36:33 -07:00
Anthony J. Thibault
4f830cf1dc Calculate jump speed based on canonical jump height. 2017-08-25 15:34:51 -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
Atlante45
7d103d24f4 Integrate my and Huffman's work 2017-08-25 15:21:08 -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
Dante Ruiz
a5508c9f75 Merge branch 'master' of github.com:highfidelity/hifi into controller-dispatcher-1 2017-08-25 14:21:01 -07:00
Dante Ruiz
b3ffa7b6b4 Working laser vs tablet 2017-08-25 14:20:31 -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
5bbe3c5a94 Merge pull request #11246 from davidkelly/dk/encryptionBug 
security image bug
 2017-08-25 14:14:22 -07:00
Stephen Birarda
2661f92e09 fix state setting for express/custom 2017-08-25 14:05:40 -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
Stephen Birarda
6ac255dd21 add custom install reg key to cpack properties 2017-08-25 12:07:26 -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
Stephen Birarda
e848253618 remember if express or custom was selected for install 2017-08-25 10:59:56 -07:00
Zach Fox
453897b9e2 Huge cleanup! 2017-08-25 10:56:53 -07:00
Atlante45
348be788f7 Add BakingEnabled protocol 2017-08-25 10:56:27 -07:00
Atlante45
9e6502fe92 More UI work 2017-08-25 10:54:34 -07:00
Atlante45
28c9aa031c Setup script model status 2017-08-25 10:54:34 -07:00
Atlante45
859ec57ded Move Baking Status 2017-08-25 10:54:33 -07:00
Atlante45
fd3156b57c Move BakingStatus 2017-08-25 10:54:33 -07:00
Atlante45
fac6015bb0 Asset baking status first pass 2017-08-25 10:54:30 -07:00
Atlante45
cefd16ad95 Fix asset server debug messages logging category 2017-08-25 10:52:49 -07:00
Anthony J. Thibault
e0ff7f5f40 Moved speed constants into AvatarConstants.h 2017-08-25 10:47:54 -07:00
David Kelly
c316e50f0f security image bug 2017-08-25 10:29:40 -07:00
Anthony J. Thibault
dd9ee28b18 Adjust avatar walking and flying speed based on sensor scale factor 2017-08-25 10:10:23 -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