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

18593 commits

Author SHA1 Message Date
David Kelly
67f25adac0 Merge branch 'master' of https://github.com/highfidelity/hifi into dk/transactionHistoryDisplay 2017-08-29 08:02:53 -07:00
David Kelly
a7af114144 fix wallet, use text from server in history (for now) 2017-08-28 17:04:19 -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
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
1c1b841a86 Fix security images; actually do the right thing when wallet not set up 2017-08-28 12:18:53 -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
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
Liv
59fe5ffdc1 Initial attempt at changing first run behavior 2017-08-25 17:48:35 -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
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
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
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
Andrew Meadows
4d7700b774 Merge pull request #11243 from SamGondelman/sharks 
Fix ray pick crash on shutdown
 2017-08-25 09:01:14 -07:00
vladest
26026cb2b5 Added logout. Truncate username to 8 characters 2017-08-25 17:37:10 +02:00
Armads
b30562b9ce Adding checks to hide avatar attachments to other head and facial joints 2017-08-25 10:25:34 -04:00
vladest
be56cab8e1 Merge branch 'master' into tablet_login_button 2017-08-25 15:50:10 +02:00
Sam Gondelman
4e7818180b Merge branch 'master' into tabletLayer2 2017-08-24 17:56:44 -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
beholder
cbbe03cee7 6788: You can deselect your current view mode 2017-08-25 02:33:11 +03: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
SamGondelman
abaccf9edd crash on shutdown 2017-08-24 16:00:36 -07:00
Zach Fox
3c7fadb1ce Final touch 2017-08-24 14:30:42 -07:00
SamGondelman
4a49801217 web overlays and entities are always nonAA 2017-08-24 14:23:21 -07:00
Zach Fox
56950e4614 It's working! 2017-08-24 14:17:39 -07:00
Brad Davis
e817d3ced4 Threaded rendering & entity rendering refactor 2017-08-24 13:34:34 -07:00
humbletim
9348048387 Merge remote-tracking branch 'upstream/master' into 21180-C++ 2017-08-24 16:23:47 -04: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
Zach Fox
baad5f195e I'm locking something wrong 2017-08-24 12:53:48 -07:00
David Kelly
a299aa7e24 initialize ptr! 2017-08-24 11:37:44 -07:00
Zach Fox
d370eeea2f Just gotta test 2017-08-24 11:07:58 -07:00
Zach Fox
e834e9d7a7 Progress 2017-08-24 10:46:18 -07:00
Zach Fox
92e8f84dc5 I understood last night at midnight 2017-08-24 09:43:35 -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
David Kelly
c77dafdf12 fix warnings, prepare a bit for hooking up the passphrase 2017-08-23 17:43:37 -07:00
Zach Fox
657beef70f I understand again...getting started again 2017-08-23 17:42:02 -07:00
Liv
1050141b11 Create home path for new content sets loaded in 2017-08-23 17:38:24 -07:00
Zach Fox
52ef0f2037 More progress 2017-08-23 16:37:13 -07:00
Zach Fox
88c24c16d7 I finally understand - initial progress 2017-08-23 15:02:07 -07:00
David Kelly
138534c3ff encrypt security image 2017-08-23 15:01:09 -07:00
SamGondelman
206862a90f fix flag bits 2017-08-23 12:20:30 -07:00
Zach Fox
f01d9ddbe7 Merge branch 'master' of https://github.com/highfidelity/hifi into SelectionScriptingInterface 2017-08-23 11:22:28 -07:00
SamGondelman
d7b3686364 include noncollidable entities 2017-08-22 17:37:51 -07:00
Brad Davis
0a5bef22fc Allow asynchronous editing of non-QML overlays 2017-08-22 17:12:18 -07:00
Zach Fox
69364f2ecd Initial progress 2017-08-22 17:10:57 -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
Zach Fox
edb64b047f It compiles! 2017-08-22 16:00:44 -07:00
Zach Fox
ec2a27e68c Progress 2017-08-22 15:02:06 -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
Zach Fox
2a75d97006 First steps 2017-08-22 12:56:16 -07:00
SamGondelman
b8a7fce201 boop 2017-08-22 11:54:55 -07:00
Zach Fox
f1da7a6381 Checkpoint 2017-08-22 11:53:37 -07:00
SamGondelman
a904ae1a8a can set precision picking on lasers/raypicks, EntityTreeRender uses ray pick API 2017-08-22 11:41:20 -07:00
SamGondelman
3a80c6cbe2 fix alpha issues, pipeline issue, clamping issue 2017-08-21 18:09:25 -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
SamGondelman
8ebaeddbc4 Merge remote-tracking branch 'upstream/master' into image3DFix 2017-08-21 11:05:44 -07:00
Ken Cooke
099723fe4d Use RAII to avoid deletion of extended argv while in use 2017-08-20 13:49:26 -07:00
vladest
3783b8a57c Merge branch 'master' into tablet_login_button 2017-08-19 17:27:46 +02:00
Zach Fox
512a08f67f Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_walletApp 2017-08-18 17:05:56 -07:00
David Kelly
1904bd3f2b encrypting image, rough first pass, lots left 2017-08-18 16:14:10 -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
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
SamGondelman
f56e952253 properly update image3d render item 2017-08-18 14:21:46 -07:00
howard-stearns
29b717e22d remove dead code 2017-08-18 14:08:04 -07:00
Sam Gondelman
cbf2bb3a61 Merge pull request #10980 from SamGondelman/sharks 
Reduce laser pointer lag
 2017-08-18 13:14:38 -07:00
Elisa Lupin-Jimenez
65f876acf3 enabled version check 2017-08-18 10:49: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
vladest
2e5e0c94f1 Added login button to Tablet 2017-08-18 15:34:15 +02:00
Elisa Lupin-Jimenez
4c28b9f09a attempt to check version of interface 2017-08-17 18:16:41 -07:00
Zach Fox
ccf81f801d All the pieces! 2017-08-17 17:06:48 -07:00
Zach Fox
9135e37078 Go go go go gog o 2017-08-17 15:20:17 -07:00
Zach Fox
eab16fc28c Initial progress 2017-08-17 15:01:25 -07:00
Elisa Lupin-Jimenez
2b44608ece Merge branch 'master' of https://github.com/highfidelity/hifi into blocks 2017-08-17 10:18:40 -07:00
Zach Fox
a4123e3024 Merge pull request #11201 from zfox23/sam_is_cool 
Allow users to take a snapshot from the Secondary Camera!
 2017-08-16 17:03:15 -07:00
Zach Fox
ecd1f13197 Allow users to take a snapshot from the secondary camera 2017-08-16 15:34:06 -07:00
David Kelly
73e943daaf Merge branch 'master' of https://github.com/highfidelity/hifi into dk/makeMeSomeKeys 2017-08-16 10:13:08 -07:00
Zach Fox
c024bd2d83 Merge pull request #11195 from zfox23/commerce_securityImage1 
Commerce: First pass at security images (NOT FINAL)
 2017-08-16 09:57:55 -07:00
SamGondelman
86cc938a47 Merge remote-tracking branch 'upstream/master' into sharks 2017-08-16 09:54:12 -07:00
SamGondelman
a641fb7a7f rename qvector findRayIntersection to avoid script conflicts 2017-08-15 18:03:52 -07:00
Zach Fox
d376630bde Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_securityImage1 2017-08-15 15:03:02 -07:00
Liv
aea5f170f2 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/domain-setup 2017-08-15 13:58:22 -07:00
Liv
49eab847fd Refactor handleOctreeFileReplacement, style changes, align with handler for other file types 2017-08-15 13:58:02 -07:00
Liv
c0fa446b75 Remove domain management scripting interface 2017-08-15 13:49:13 -07:00
Zach Fox
b7282cc776 Lots of fixes 2017-08-15 13:46:20 -07:00
Anthony Thibault
342f8acff5 Merge pull request #11176 from hyperlogic/feature/improve-hand-body-collision 
Improve avatar hand vs body collision
 2017-08-15 13:43:21 -07:00
SamGondelman
9bb7e66859 separate raypickscriptinginterface, cleanup 2017-08-15 13:36:41 -07:00
Zach Fox
528d2072f9 Bugfixes and improvements 2017-08-15 12:14:32 -07:00
Anthony J. Thibault
6e0ddadb29 Fix for array size. 2017-08-15 11:45:22 -07:00
David Kelly
0f7db74ef1 missed a couple warnings 2017-08-15 11:44:15 -07:00
Anthony J. Thibault
04006a9f76 code review feedback 2017-08-15 11:19:41 -07:00