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

58381 commits

This branch
This branch
All branches
Author SHA1 Message Date
David Kelly
138534c3ff encrypt security image 2017-08-23 15:01:09 -07:00
David Kelly
f655bf2713 Merge branch 'commerce_walletApp' of https://github.com/zfox23/hifi into dk/encryptFile 2017-08-23 14:53:05 -07:00
Zach Fox
a489267cec Hide behind switch and remove dead code 2017-08-23 10:48:47 -07:00
David Kelly
591c031e7b first pass still broken... 2017-08-22 16:24:25 -07:00
David Kelly
8bb7ea900a Merge branch 'commerce_walletApp' of https://github.com/zfox23/hifi into dk/encryptFile 2017-08-22 16:23:23 -07:00
David Kelly
0bd3f1728d Merge branch 'master' of https://github.com/highfidelity/hifi into dk/encryptFile 2017-08-22 14:40:10 -07:00
Chris Collins
06641ade94 Merge pull request #11228 from Atlante45/new-master 
Update master from stable
 2017-08-22 13:29:51 -07:00
Atlante45
697aed2fa2 Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master 2017-08-22 12:58:38 -07:00
Chris Collins
8474bfb550 Merge pull request #11227 from highfidelity/RC-52 
Beta Release 52 - Includes up to Developer Release 7030
 2017-08-22 12:57:17 -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
763ce73306 Taking a break now 2017-08-22 12:26:46 -07:00
Zach Fox
a31088b60f More progress 2017-08-22 12:16:17 -07:00
Zach Fox
f1da7a6381 Checkpoint 2017-08-22 11:53:37 -07:00
Stephen Birarda
9dfc74de57 always write rank ID to variant when present 2017-08-22 11:24:32 -07:00
vladest
b7a048c6ea Adopt clonable settings to new styling 2017-08-22 11:23:55 -07:00
Chris Collins
8cab4435c9 Merge pull request #11224 from birarda/bug/group-clear 
always write rank ID to variant when present
 2017-08-22 09:08:59 -07:00
Stephen Birarda
1eb7fb5b3d always write rank ID to variant when present 2017-08-21 17:15:44 -07:00
Chris Collins
72bb52c7ed Merge pull request #11046 from rickdaniels/21448 
Address bug #21448 "Correctly Size Bounding Boxes for Polylines"
 2017-08-21 15:32:22 -07:00
Chris Collins
fcd3a8bd22 Merge pull request #11204 from EagleJumpDev/hifi_eaglejumpdev 
Base requirements change : dev system must have at least 8GB of RAM.
 2017-08-21 15:30:51 -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
db16035f26 Parse balance correctly 2017-08-21 15:07:54 -07:00
Zach Fox
ed5445ec51 Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletApp 2017-08-21 13:09:41 -07:00
Chris Collins
52a850662c Merge pull request #11219 from kencooke/interface-argv-bugfix 
Fix crashes caused by deleting argv while in use
 2017-08-21 10:26:05 -07:00
Ken Cooke
099723fe4d Use RAII to avoid deletion of extended argv while in use 2017-08-20 13:49:26 -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
Zach Fox
6e171d38ce Bugfixes 2017-08-18 17:04:46 -07:00
Zach Fox
a07598c738 Bugfixes 2017-08-18 16:36:11 -07:00
Zach Fox
94da149ac8 Almost there 2017-08-18 16:28:02 -07:00
druiz17
42f6333948 Merge pull request #11206 from vladest/goto_remove_snap 
Switch off snap behavior
 2017-08-18 16:14:59 -07:00
David Kelly
1904bd3f2b encrypting image, rough first pass, lots left 2017-08-18 16:14:10 -07:00
Zach Fox
c42a658bde Almost-working change pages 2017-08-18 16:06:39 -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
Chris Collins
2456126bcc Merge pull request #11157 from SamGondelman/tabletLayer 
Render non-AA overlays correctly
 2017-08-18 14:59:20 -07:00
Zach Fox
f28544e405 Show real balance 2017-08-18 14:53:55 -07:00
Liv
3406647966 Merge pull request #11203 from elisa-lj11/emoji 
Emoji Tablet App
 2017-08-18 14:37:14 -07:00
Zach Fox
a91c0cb169 Add 'exchange' tab 2017-08-18 14:22:25 -07:00
Zach Fox
4ff1fb8df0 Filling out home 2017-08-18 14:18:05 -07:00
howard-stearns
29b717e22d remove dead code 2017-08-18 14:08:04 -07:00
howard-stearns
bd37679b65 working 2017-08-18 14:03:40 -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
Zach Fox
1a62f60348 Commit early and often. 2017-08-18 11:30:25 -07:00
Zach Fox
ace1e00158 MOREEEE PROGRESS 2017-08-18 10:52:42 -07:00
Elisa Lupin-Jimenez
762f1a9c5c Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-08-18 10:49:51 -07:00
Elisa Lupin-Jimenez
65f876acf3 enabled version check 2017-08-18 10:49:40 -07:00
SamGondelman
c9f4958925 handControllerGrab fix, maybe, hopefully 2017-08-18 10:39:40 -07:00