Elisa Lupin-Jimenez
|
7cee80f0cf
|
my own objects (or rather objects with low poly count) download now
|
2017-08-25 11:09:11 -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 |
|
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 |
|
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 |
|
Liv
|
1050141b11
|
Create home path for new content sets loaded in
|
2017-08-23 17:38:24 -07:00 |
|
David Kelly
|
138534c3ff
|
encrypt security image
|
2017-08-23 15:01:09 -07:00 |
|
SamGondelman
|
d7b3686364
|
include noncollidable entities
|
2017-08-22 17:37:51 -07:00 |
|
SamGondelman
|
a904ae1a8a
|
can set precision picking on lasers/raypicks, EntityTreeRender uses ray pick API
|
2017-08-22 11:41:20 -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 |
|
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
|
2b44608ece
|
Merge branch 'master' of https://github.com/highfidelity/hifi into blocks
|
2017-08-17 10:18:40 -07:00 |
|
Zach Fox
|
ecd1f13197
|
Allow users to take a snapshot from the secondary camera
|
2017-08-16 15:34:06 -07:00 |
|
SamGondelman
|
86cc938a47
|
Merge remote-tracking branch 'upstream/master' into sharks
|
2017-08-16 09:54:12 -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 |
|
SamGondelman
|
9bb7e66859
|
separate raypickscriptinginterface, cleanup
|
2017-08-15 13:36:41 -07:00 |
|
Elisa Lupin-Jimenez
|
3d7995da34
|
Merge branch 'master' of https://github.com/highfidelity/hifi into blocks
|
2017-08-15 10:01:24 -07:00 |
|
Seth Alves
|
972a24fea9
|
Merge pull request #11169 from anshuman64/new-branch
High Fidelity Interface Application Rename
|
2017-08-10 15:57:10 -07:00 |
|
SamGondelman
|
4c55849290
|
merge from master
|
2017-08-10 15:43:23 -07:00 |
|
Sam Gateau
|
79f3be1efe
|
Merge pull request #11021 from Zvork/fade2
Fade dissolve effect JUST AVATARS
|
2017-08-10 13:48:30 -07:00 |
|
Anshuman Dewangan
|
f79bf4e009
|
High Fidelity Interface rename
|
2017-08-10 13:40:00 -07:00 |
|
Liv
|
6bde4db0d7
|
wrap in marketplace check and change landing point
|
2017-08-09 16:35:25 -07:00 |
|
Elisa Lupin-Jimenez
|
a2e407f786
|
fixed merge conflicts in marketplacesInject.js
|
2017-08-09 15:59:20 -07:00 |
|
Elisa Lupin-Jimenez
|
1ac9536f95
|
Downloading blocks from marketplace in own asset folder
|
2017-08-09 15:56:07 -07:00 |
|
Sam Gondelman
|
85c3f94976
|
Merge branch 'master' into sharks
|
2017-08-09 13:36:18 -07:00 |
|
howard-stearns
|
1cf81495ab
|
basic commerce infrastructure
|
2017-08-09 11:50:52 -07:00 |
|
Elisa Lupin-Jimenez
|
17acf0520d
|
Download from blocks in marketplace working
|
2017-08-09 11:08:14 -07:00 |
|
Liv
|
0784686450
|
small typo fix
|
2017-08-09 10:17:31 -07:00 |
|
howard-stearns
|
9349e72eeb
|
Merge branch 'master' of https://github.com/highfidelity/hifi into buy
|
2017-08-09 10:00:36 -07:00 |
|
Liv
|
bd1619b1b2
|
update error message wording
|
2017-08-09 09:14:46 -07:00 |
|
Elisa Lupin-Jimenez
|
d599753771
|
Started blocks download catch, fixed a debug typo
|
2017-08-08 18:43:35 -07:00 |
|
Liv
|
ab8f5c1288
|
add user logging detail message
|
2017-08-08 13:55:07 -07:00 |
|
Liv
|
3f30162215
|
Make spawning point not 0,0,0 and change error message
|
2017-08-08 09:44:36 -07:00 |
|
SamGondelman
|
42147640e2
|
remove LaserPointerManager as a dependency
|
2017-08-07 14:18:56 -07:00 |
|
SamGondelman
|
489e08aef0
|
Merge branch 'master' of https://github.com/highfidelity/hifi into sharks
|
2017-08-07 13:29:00 -07:00 |
|
Seth Alves
|
af1e27dc36
|
Merge pull request #11053 from hyperlogic/feature/secondary-pose-support
Improved support for Vive Trackers on biceps
|
2017-08-07 13:11:48 -07:00 |
|
howard-stearns
|
9bad26c2db
|
stub files
|
2017-08-07 12:51:30 -07:00 |
|
Liv Erickson
|
da70071b5a
|
Merge branch 'master' into feat/domain-setup
|
2017-08-07 10:04:54 -07:00 |
|
Elisa Lupin-Jimenez
|
a246c59277
|
changed debug print for unsupported entity files
|
2017-08-04 16:59:21 -07:00 |
|
Elisa Lupin-Jimenez
|
8c9ce82986
|
Fixed Mac and Ubuntu platform build issue (hopefully)
|
2017-08-04 16:58:33 -07:00 |
|
Elisa Lupin-Jimenez
|
ebc28a6557
|
Renamed isBlocks to isZip, added debug print for non-entity files
|
2017-08-04 16:58:33 -07:00 |
|
Elisa Lupin-Jimenez
|
06ff766952
|
Drag zip cleaned up, marketplaces stylized, back button fixed
|
2017-08-04 16:58:33 -07:00 |
|
Elisa Lupin-Jimenez
|
692aa4c4b9
|
Clara download working again, still can drag in Blocks zip
|
2017-08-04 16:58:15 -07:00 |
|
Elisa Lupin-Jimenez
|
c6d5b1a5e6
|
Removed extraneous print statements
|
2017-08-04 16:58:15 -07:00 |
|
Elisa Lupin-Jimenez
|
c3d943ff72
|
Drag zip folder works
|
2017-08-04 16:57:48 -07:00 |
|
Elisa Lupin-Jimenez
|
ed1ed4f3e0
|
Blocks drag does not work yet
|
2017-08-04 16:57:48 -07:00 |
|
Elisa Lupin-Jimenez
|
ca6a323d54
|
Can drag blocks zip folder into hifi and upload the .obj
|
2017-08-04 16:57:48 -07:00 |
|
Anthony J. Thibault
|
98bbe887b9
|
Merge branch 'master' into feature/secondary-pose-support
|
2017-08-04 16:11:13 -07:00 |
|
Brad Davis
|
86e3489167
|
Updates from Threaded Rendering project
|
2017-08-04 15:22:14 -07:00 |
|