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
Brad Hefta-Gaub
57f62f59fb
Merge pull request #11110 from Armads/WL21423
...
Camera mode on startup is determined by user settings and HMD status
2017-08-04 13:16:34 -07:00
SamGondelman
bd942ec406
merge from master
2017-08-04 12:17:54 -07:00
Howard Stearns
71ce5a6494
Merge pull request #11016 from highfidelity/context-overlays
...
Context Overlays
2017-08-03 16:28:14 -07:00
Armads
dff4e6e32c
WL21423 Changing order of camera setup steps
2017-08-03 15:40:38 -04:00
David Kelly
4b7779f0f5
add flag to outline render flags, fix pal.js/edit.js interaction
2017-08-03 07:57:21 -07:00
Armads
24718e2424
WL21423 Camera mode on startup is determined by user settings and HMD status
2017-08-03 09:03:23 -04:00
Anthony Thibault
8a87ebd2a8
Merge pull request #11036 from AndrewMeadows/walkabout
...
fix bugs preventing avatar from walking on spherical planet
2017-08-01 16:36:35 -07:00
David Kelly
6ae516c46a
Merge remote-tracking branch 'upstream/context-overlays' into contextOverlays_renderMOde
2017-08-01 15:45:34 -07:00
humbletim
3a9b8c02a6
* disable Avatar "follow" / recentering behavior when using HMD + "View > Mirror"
...
* restore access to "View > Mirror" from HMD mode
2017-08-01 13:41:28 -04:00
David Kelly
bd7c4b3b26
Merge remote-tracking branch 'upstream/master' into context-overlays
2017-07-31 13:14:53 -07:00
Anthony J. Thibault
2383933252
Merge branch 'master' into feature/secondary-pose-support
2017-07-31 10:55:40 -07:00
Olivier Prat
490aad2a06
Merged from master
2017-07-31 12:00:35 +02:00
humbletim
3bcbec87e0
Merge remote-tracking branch 'upstream/master' into 21180-C++
2017-07-30 16:15:34 -04:00
Stephen Birarda
17dd028ec7
make Paths available to desktop and tablet QML context
2017-07-28 14:23:18 -07:00
Andrew Meadows
d4e72df928
Merge pull request #10711 from burtsloane/midi
...
Midi support for Entities
2017-07-28 10:51:43 -07:00
Brad Hefta-Gaub
9b3be6d164
Merge pull request #10808 from humbletim/21400
...
WL 21400 -- Setting that lets you switch from cursor to reticle
2017-07-27 13:16:58 -07:00
Sam Gondelman
fcaa39b245
Merge branch 'master' into sharks
2017-07-26 18:18:09 -07:00
burtsloane
d4ae298a8d
Merge branch 'master' into midi
2017-07-26 13:59:07 -07:00
Burt Sloane
4f7243e444
Merge branch 'master' of https://github.com/burtsloane/hifi into midi
2017-07-26 13:30:57 -07:00
Zach Fox
62f6c10b2b
Renaming things; bugfixes; improvements
2017-07-26 12:45:10 -07:00
Zach Fox
24ddbb4b22
Silly bug preventing the whole thing from working
2017-07-26 12:08:55 -07:00
Liv
be860d6c87
small string fix
2017-07-26 10:20:29 -07:00
Liv
63d637c4db
Add line to move user back to origin to be near new content
2017-07-26 10:02:21 -07:00
Liv
57b27a7bb7
change packet type to be sourced, change from packet list to single packet
2017-07-25 20:17:20 -07:00
Zach Fox
9020607ccf
First pass
2017-07-25 17:54:46 -07:00
Liv
9458e4a1eb
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/domain-setup
2017-07-25 11:32:13 -07:00
Liv
2377e4a5db
fix message formatting
2017-07-25 11:32:02 -07:00
Liv
89a1c7a697
code cleanup
2017-07-25 11:24:57 -07:00
SamGondelman
3c8b964cc9
replace setHandLasers with drawHUDLayer overlay property
2017-07-24 18:16:40 -07:00
Liv
32ddffd9c8
Move logic for confirmation into Application.cpp for handling files directly
2017-07-24 18:09:32 -07:00
Anthony J. Thibault
33a1d6e225
Merge branch 'master' into feature/secondary-pose-support
2017-07-24 17:27:33 -07:00
Anthony J. Thibault
9f6641ed10
Shoulder puck calibration work in progress
...
* AnimInverseKinematics: debug draw for secondary targets
* AnimInverseKienmatics: better clean up of ik target debug draw
* GeometryUtil: added findPlaneFromPoints()
* ViveControllerManager: external dependency on eigen
* ViveControllerManager: record history of left/right hand controllers
* ViveControllerManager: use history to determine user shoulder location for better calibration
* ViveControllerManager: pass defaultToReferenceMat by const ref to calibrate functions.
* CMake: added external depenency to eigen linear algebra library.
2017-07-24 17:22:48 -07:00
Seth Alves
97756e6140
accidently deleted a break
2017-07-24 16:12:03 -07:00
Seth Alves
82a787a753
use alt+h for mirror-mode
2017-07-24 16:04:11 -07:00
Andrew Meadows
8c55476c65
fix motor direction when walking upside down
...
also maintain worldUp and remove unnecessary cruft
2017-07-24 16:00:13 -07:00
Seth Alves
e53badf88b
use alt+f for 1st person camera and alt+o for 3rd
2017-07-24 15:56:37 -07:00
Liv
76cc833747
move domain management into a separate API
2017-07-21 17:44:53 -07:00
Dante Ruiz
06b4c53d28
only desktop mode
2017-07-22 00:15:26 +01:00
Olivier Prat
7bc7b1eabc
Merge branch 'master' of git://github.com/highfidelity/hifi into fade2
2017-07-21 09:27:30 +02:00
anshuman64
5f3b68d544
Use ctrl+H instead of alt+H
2017-07-20 17:36:02 -07:00
Dante Ruiz
649b974927
mods for changes camera views
2017-07-21 01:01:23 +01:00
Zach Fox
e68f9499fa
Add hover/unhover handlers to context overlays
2017-07-20 16:51:00 -07:00
Zach Fox
1d26a268c1
Merge branch 'master' of https://github.com/highfidelity/hifi into HoverOverlay_CubeOverlay
2017-07-19 09:53:51 -07:00
Zach Fox
8f6af3a1ab
ContextOverlay
2017-07-18 16:28:24 -07:00
Zach Fox
084f4d2ab0
Why were Web3DOverlays done this way?
2017-07-18 14:42:59 -07:00
humbletim
f9e0e616f7
Merge remote-tracking branch 'upstream/master' into 21180-C++
2017-07-18 17:34:39 -04:00
Zach Fox
2b1a0921da
Initial work on clickable overlays
2017-07-18 14:01:16 -07:00
Brad Davis
1aee8f1f4d
Ensure we continue calling idle when minimized
2017-07-18 13:44:58 -07:00
SamGondelman
55a025b827
initial code review
2017-07-18 12:43:34 -07:00
Dante Ruiz
976fec66f8
fixed loading script whitespace
2017-07-18 17:59:42 +01:00
Brad Hefta-Gaub
d94365cc44
Merge pull request #10979 from zfox23/hoverOverlay_lasers
...
Create/Destroy Hover Overlays using hand controller lasers
2017-07-18 08:44:48 -07:00
Olivier Prat
236270d798
Merge branch 'master' of git://github.com/highfidelity/hifi into fadeshape
2017-07-18 10:47:21 +02:00
Zach Fox
67c8ddfd57
Merge in changes from laser PR
2017-07-17 17:09:40 -07:00
Zach Fox
96f52a9812
First pass at getting overlays to show up on hover
2017-07-17 17:05:16 -07:00
utkarshgautamnyu
758ae9825d
Merge pull request #10939 from highfidelity/bug/6118
...
Record total number of ATP/HTTP/File bytes downloaded during session
2017-07-17 13:53:21 -07:00
Zach Fox
974dff36b0
Make hover overlays work for hand controller lasers
2017-07-17 13:16:53 -07:00
Zach Fox
aadf407842
Merge pull request #10978 from zfox23/hoverOverlayInterface
...
New HoverOverlayInterface skeleton
2017-07-17 13:16:32 -07:00
Olivier Prat
9e9c0aff65
Merge branch 'master' of git://github.com/highfidelity/hifi into fadeshape
2017-07-17 09:59:59 +02:00
Zach Fox
e602d3610e
Initial commit for HoverOverlayInterface
2017-07-14 17:26:53 -07:00
SamGondelman
8f533636f5
c++ side laserpointer rendering with renderstates
2017-07-14 11:13:40 -07:00
Andrew Meadows
9584035aa4
Merge pull request #10886 from 1P-Cusack/21420
...
[Worklist #21420 ] Implement Create button disabled state (details below).
2017-07-14 10:06:45 -07:00
Seth Alves
741feb7e54
Merge pull request #10951 from druiz17/tablet-modal-fixes
...
Allow the tablet to be closed when a modal dialog is open.
2017-07-14 09:40:58 -07:00
SamGondelman
6f970fd7a0
Merge remote-tracking branch 'upstream/master' into sharks
2017-07-14 09:37:11 -07:00
Olivier Prat
82da9fb537
Merge branch 'master' of git://github.com/highfidelity/hifi into fade
2017-07-14 17:28:35 +02:00
Anthony J. Thibault
c85e187c61
first stab at secondary target pose support
2017-07-13 18:12:33 -07:00
Anthony J. Thibault
fe711ccbe9
Refactored how controller poses are stored in MyAvatar.
2017-07-13 15:01:14 -07:00
Dante Ruiz
03fbd2a1e6
fixed another warning
2017-07-13 19:12:34 +01:00
Dante Ruiz
b46dc7d389
removed space
2017-07-13 18:42:26 +01:00
Dante Ruiz
070db2922d
fixed warning compile error
2017-07-13 18:40:38 +01:00
SamGondelman
ea65a04f28
expose RayPickMask to JS, move everything to interface/src/raypick to prevent dependency issues, start working on RayPickManager::update (needs testing)
2017-07-12 14:20:39 -07:00
SamGondelman
3ac369d782
framework for LaserPointers and abstracted RayPicking on C++ side, including JS API
2017-07-12 14:20:39 -07:00
utkarshgautamnyu
6b969bc39d
added code to record total number of ATP/HTTP/File bytes downloaded during session
...
Update FileResourceRequest.cpp
Update AssetResourceRequest.cpp
Update FileResourceRequest.cpp
Update HTTPResourceRequest.cpp
Update AssetResourceRequest.cpp
Update AssetResourceRequest.cpp
Update FileResourceRequest.cpp
Update AssetResourceRequest.cpp
Update AssetResourceRequest.cpp
Update FileResourceRequest.cpp
Update FileResourceRequest.cpp
Update HTTPResourceRequest.cpp
Update FileResourceRequest.cpp
Update FileResourceRequest.cpp
Update Application.cpp
Update Application.cpp
2017-07-12 11:13:13 -07:00
