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

58446 commits

This branch
This branch
All branches
Author SHA1 Message Date
Zach Fox
ceb38e261d HMD Keyboard for purchases filterBar 2017-08-28 10:45:08 -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
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
Zach Fox
b1378816d5 Revert "MUCH faster filter!" 
This reverts commit 5173774db0.
 2017-08-25 16:23:36 -07: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
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
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
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
d192009722 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_checkoutAndInventory 2017-08-25 11:20:26 -07:00
Zach Fox
453897b9e2 Huge cleanup! 2017-08-25 10:56:53 -07:00
Andrew Meadows
f82fa2f981 Merge pull request #11229 from ElderOrb/optional_build_tests 
make building tests optional
 2017-08-25 09:10:56 -07:00
Andrew Meadows
4d7700b774 Merge pull request #11243 from SamGondelman/sharks 
Fix ray pick crash on shutdown
 2017-08-25 09:01:14 -07:00
Sam Gateau
c5fbd5a2a5 Merge pull request #11131 from jherico/threaded_render_entities 
Threaded rendering of Entities
 2017-08-24 17:34:49 -07:00
Zach Fox
3980a478d9 Only show 'buy' on costed items' 2017-08-24 16:38:44 -07:00
Chris Collins
43b1e67e4a Merge pull request #11238 from misslivirose/set-home-with-sandbox-starter 
Create home bookmark for new content sets loaded in
 2017-08-24 16:25:04 -07:00
Zach Fox
8d3c394d00 More progress 2017-08-24 16:21:41 -07:00
SamGondelman
abaccf9edd crash on shutdown 2017-08-24 16:00:36 -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
Chris Collins
c0afda859f Merge pull request #11240 from kencooke/audio-gate-threshold 
More aggressive noise gate threshold
 2017-08-24 14:49:18 -07:00
Brad Davis
e817d3ced4 Threaded rendering & entity rendering refactor 2017-08-24 13:34:34 -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
David Kelly
a299aa7e24 initialize ptr! 2017-08-24 11:37:44 -07:00
Ken Cooke
684b7fee5a DC filter cutoff at 0.5Hz 2017-08-24 11:20:22 -07: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
Ken Cooke
4a253023ee float constants 2017-08-24 10:15:54 -07:00
Ken Cooke
c3ff505b73 More aggressive noise gate threshold 2017-08-24 10:06:41 -07:00
Sam Gateau
4a18c5c80e Merge pull request #11214 from SamGondelman/image3DFix 
Fix Image3DOverlays with fractional alpha
 2017-08-24 09:04:02 -07:00
David Kelly
d398adc195 warnings 2017-08-24 08:48:26 -07: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
Chris Collins
93457c0e42 Merge pull request #11237 from birarda/feat/ip-check 
add sender sock addr check to DS packet filter operator
 2017-08-24 07:51:23 -07:00
Chris Collins
751440388a Merge pull request #11225 from hyperlogic/bug-fix/simulation-deadlock-fix 
Bug fix for deadlock between EntitySimulation and EntityItem locks.
 2017-08-23 20:50:41 -07:00
David Kelly
c77dafdf12 fix warnings, prepare a bit for hooking up the passphrase 2017-08-23 17:43:37 -07:00
Liv
1050141b11 Create home path for new content sets loaded in 2017-08-23 17:38:24 -07:00
Stephen Birarda
133b7e66b7 adjust a comment and remove some debug 2017-08-23 16:38:23 -07:00
Stephen Birarda
c122b22dfc add additional IP check to DS packet filter operator 2017-08-23 15:32:25 -07:00
David Kelly
57d973851e accidentally left in I guess 2017-08-23 15:11:17 -07:00
Brad Hefta-Gaub
afce8b547a Merge pull request #11197 from hyperlogic/bug-fix/prevent-rig-crash-in-lambda 
Rig: Use a registry to prevent use after free crashes/corruption
 2017-08-23 15:09:28 -07:00
David Kelly
138534c3ff encrypt security image 2017-08-23 15:01:09 -07:00