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
Olivier Prat
0f60cca617
Merged cleaned up fader branch from Sam
2017-07-12 18:09:17 +02:00
Sam Gateau
5394ac8672
Cleaning up changes, removing comments and dead code etc...
2017-07-12 17:33:05 +02:00
Olivier Prat
2f9885870b
First merge with Sam's fader branch with custom pipeline support in shape plumber
2017-07-12 17:29:21 +02:00
Dante Ruiz
bedd0628b9
allowed tablet to toggle when a dialog is open
2017-07-12 00:51:07 +01:00
Sam Gateau
1f2f539507
Merge branch 'orange' of https://github.com/samcake/hifi into hobbes
2017-07-11 10:26:26 +02:00
David Kelly
4843b91f47
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-07-10 09:50:17 -07:00
Andrew Meadows
96b88dccd7
Merge pull request #10913 from samcake/orange
...
Introducing the Stages to the render::Scene, Better scene update phase and getting away from the singleton model
2017-07-10 09:46:09 -07:00
Brad Davis
8043caa9e9
Merge pull request #10925 from jherico/overlay_performance
...
Fix terrible script performance when rendering load is too high
2017-07-08 14:19:14 -07:00
Brad Davis
cd11f5cfa6
More tweaks for improved script performance
2017-07-07 22:02:56 -07:00
Brad Davis
148eece065
Tweak frame timing to avoid overloading the main thread
2017-07-07 21:00:33 -07:00
Zach Fox
dbb48cd1aa
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-07-07 16:03:04 -07:00
Zach Fox
3d14d3755e
Merge pull request #10898 from 1P-Cusack/21425
...
Add View->Enter First Person Mode in HMD checkbox.
2017-07-07 14:01:36 -07:00
Andrew Meadows
57842ce5a5
Merge pull request #10878 from mnafees/21355
...
CR for Job #21355 - Clean up and remove menu hotkeys
2017-07-07 14:01:21 -07:00
Olivier Prat
06d69d04c3
TransitionStage + FadeJob compiling but not linked to entity events
2017-07-07 18:22:11 +02:00
Sam Gateau
d15c4ea2d3
Merging with the stage branch
2017-07-07 15:12:40 +02:00
Sam Gateau
156c20d01e
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-07-07 10:58:05 +02:00
Clément Brisset
34e3f56002
Merge pull request #10843 from birarda/bug/user-activities-interface-only
...
disable user activity logger in DS/AC/ac-client
2017-07-06 14:01:49 -07:00
LaShonda Hopper
85111131da
[Worklist #21420 ] Resolves issue where domain changes didn't refresh the icon (details below).
...
* Adds a local message/event: "Toolbar-DomainChanged"
** This message is sent by the application via its registered domain handlers:
*** hostnameChanged
*** connectedToDomain
*** disconnectedFromDomain
* edit.js subscribes to the "Toolbar-DomainChanged" event and updates the Create
button icon as long as there's a valid known valid create button.
Item Ticket Link: https://worklist.net/21420
Changes to be committed:
modified: interface/src/Application.cpp
modified: scripts/system/edit.js
2017-07-06 15:27:15 -04:00
Stephen Birarda
916f57772b
default the UAL off for all targets, enable manually for Interface
2017-07-06 10:21:07 -07:00
Zach Fox
ee86638c4e
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-07-06 09:58:00 -07:00
David Kelly
1ccf0da7d8
Merge pull request #10897 from davidkelly/dk/cacheSwitchFix
...
redo cache switch
2017-07-06 09:53:01 -07:00
Andrew Meadows
4fad9d9b1a
Merge pull request #10858 from jherico/trace_cores
...
Additional threaded tracing of CPU cores
2017-07-06 08:23:21 -07:00
Olivier Prat
018c0489f4
Merged with 21378
2017-07-06 16:53:47 +02:00
Sam Gateau
53ffca796f
Drafting a better SHape plumber to render the items
2017-07-06 16:35:40 +02:00
David Kelly
4a22fbca1b
redo cache switch
2017-07-05 17:01:31 -07:00
Mohammed Nafees
eb354a4333
Cleanup menu shortcut keys
2017-07-05 14:50:48 +05:30
Olivier Prat
5cee2cff9f
Merge branch 'master' of git://github.com/highfidelity/hifi into 21378
2017-07-04 17:48:07 +02:00
Zach Fox
fcc131187d
Merge pull request #10856 from zfox23/spectatorCamera_positionSpeedup
...
Spectator Camera position/orientation update speedup
2017-07-03 16:44:12 -07:00
David Kelly
5f015ec77f
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview
2017-07-03 13:57:25 -07:00
1P-Cusack
38baeabbe5
Add View->Enter First Person Mode in HMD checkbox.
...
When checked, changing to an HMD display will switch the user to first
person mode. WL 21425.
2017-07-03 15:21:40 -04:00
Zach Fox
9c96cf811e
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into spectatorCamera_positionSpeedup
2017-07-03 10:33:55 -07:00
Seth Alves
70a7b302fc
Merge pull request #10860 from jherico/deadlock_guards
...
Don't use blocking connections on the main thread
2017-07-03 09:05:56 -07:00
humbletim
026e05f80c
Merge remote-tracking branch 'upstream/master' into 21180-C++
2017-07-03 11:55:59 -04:00
Olivier Prat
d9a83539b2
Merged with master
2017-07-03 15:32:30 +02:00
Brad Davis
31d2c9980e
Merge pull request #10797 from ctrlaltdavid/21396
...
Make Leap Motion a plugin
2017-06-30 14:37:23 -07:00
David Kelly
09d959bdeb
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview
2017-06-30 14:16:01 -07:00
Zach Fox
9bd80ec2bf
Improve naming and API
2017-06-30 14:07:00 -07:00
Brad Davis
6fc82bb351
Switch to preprocessor macro for blocking invokes to capture function information
2017-06-30 11:36:24 -07:00
Brad Davis
8372d73fec
Additional thread safety
2017-06-30 09:15:06 -07:00
Brad Davis
b52dd7b822
Don't use blocking connections on the main thread
2017-06-29 20:45:17 -07:00
Brad Davis
8ec20ef042
Additional tracing of CPU cores
2017-06-29 13:16:15 -07:00
Sam Gateau
ca7e782566
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-29 10:54:27 +02:00
Thijs Wenker
e781f97ddc
Merge pull request #10846 from sethalves/fix-server-scripts-more
...
make ResourceManager be owned by DependencyManager
2017-06-28 17:05:30 -07:00
Howard Stearns
3606418a22
Merge pull request #10836 from davidkelly/dk/scriptsSwitchBug
...
minor fix for --scripts switch
2017-06-28 16:11:18 -07:00
Seth Alves
794495c197
make ResourceManager be owned by DependencyManager
2017-06-28 14:18:14 -07:00
David Kelly
48de8011b2
cr feedback
2017-06-28 14:15:29 -07:00
David Kelly
b73102d063
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview
2017-06-28 08:57:04 -07:00
Olivier Prat
b76a8a6f9b
Merge branch 'master' of git://github.com/highfidelity/hifi into 21378
2017-06-28 14:37:03 +02:00
Sam Gateau
1e2b0ca91c
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-28 10:21:05 +02:00
Brad Davis
8130a91b8c
Cleanup entity dependencies
2017-06-27 19:15:49 -07:00
David Kelly
9417a176a1
make scripts tree show scripts in directory passed in with --scripts
2017-06-27 18:10:54 -07:00
David Kelly
01155ba4e3
this handles redirecting ktx_cache, data8, prepared
2017-06-27 08:47:54 -07:00
Sam Gateau
63835d0863
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-27 14:24:55 +02:00
Seth Alves
2f2a13ec27
Merge pull request #10799 from jherico/object_parent_warnings
...
Fix warnings about creating QObjects with parents in different thread
2017-06-26 09:39:29 -07:00
Olivier Prat
1bb0d51849
Merged with master
2017-06-26 11:55:46 +02:00
Sam Gateau
75e457ce7c
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-26 10:05:04 +02:00
David Rowe
bed0e8ef87
Merge branch 'master' into 21396
...
# Conflicts:
# interface/src/avatar/MySkeletonModel.cpp
2017-06-26 12:07:25 +12:00
Bradley Austin Davis
960017ddd7
Fix static plugin initialization on Linux
2017-06-24 22:22:47 -07:00
samcake
77650ac1b3
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-23 20:10:35 -07:00
humbletim
c10475186c
add support for switching cursor from arrow to reticle
2017-06-23 18:48:29 -04:00
Seth Alves
43ba5f3772
Merge pull request #10800 from hyperlogic/bug-fix/eyes-forward
...
Fix for eye direction when no look at targets are present.
2017-06-23 14:32:21 -07:00
David Rowe
6e266dfbac
Merge branch 'master' into 21396
2017-06-24 09:19:12 +12:00
humbletim
f6262ad54d
Merge remote-tracking branch 'upstream/master' into 21180-C++
2017-06-23 16:37:10 -04:00
samcake
17e2140826
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-23 13:28:58 -07:00
Brad Davis
f1fe4ed7cc
Merge pull request #10804 from jherico/fix_deps_3
...
Remove dependency between codec plugins and UI
2017-06-23 12:51:35 -07:00
Brad Hefta-Gaub
dc649e84df
Merge pull request #10792 from jherico/qml_crashes
...
Trying to fix QtQml/QtScript crashes
2017-06-23 12:41:43 -07:00
Brad Davis
fe7d4b1d23
Remove dependency between codec plugins and UI
2017-06-23 12:25:18 -07:00
Anthony J. Thibault
8f89ef0931
Fix for eye direction when no look at targets are present.
2017-06-23 10:52:23 -07:00
Brad Davis
416852c0cd
Fix warnings about creating QObjects with parents in different thread
2017-06-23 10:19:16 -07:00
David Rowe
9d0407cbdf
Merge branch 'master' into 21396
2017-06-23 16:52:04 +12:00
David Rowe
b26f5c5811
Clear finger joints when finger poses no longer being updated
2017-06-23 16:15:40 +12:00
samcake
20d8c11e28
ALmost there, getting eback everything to work with the light and background stages in the scene, not in deferredLighting Effect anymore
2017-06-22 17:54:16 -07:00
Brad Davis
4439de240a
Trying to fix QtQml/QtScript crashes
2017-06-22 16:39:57 -07:00
David Rowe
8682cee17a
Refactoring
2017-06-23 11:33:29 +12:00
David Kelly
ff5b37c785
new --scripts switch overrides default scripts location
2017-06-22 14:09:05 -07:00
samcake
96a10d2e95
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-22 09:32:49 -07:00
David Kelly
34edd95926
Merge pull request #10776 from davidkelly/dk/avatarUrlSwitch
...
new switches to override avatarURL
2017-06-22 07:11:29 -07:00
David Kelly
5da01f0074
updated comments
2017-06-22 07:09:24 -07:00
David Rowe
6ff8aed5e3
Merge branch 'master' into 21396
2017-06-22 23:54:15 +12:00
David Rowe
3bdf267900
Implement fingers control
2017-06-22 23:32:06 +12:00
samcake
9ae2861ee6
Moving the stage objects under the scene umbrella and creating a cear task to update the scene elements
2017-06-21 18:29:38 -07:00
Seth Alves
c70365d04a
Merge pull request #10729 from druiz17/hand-pucks
...
Hand pucks and Calibration UI
2017-06-21 18:10:15 -07:00
samcake
2919607f86
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-21 17:20:44 -07:00
Howard Stearns
ea5b074f6e
Merge pull request #10758 from howard-stearns/event-installer-interface-options
...
Event installer interface options
2017-06-21 16:46:06 -07:00
David Kelly
92cbb86e8b
remove debugging
2017-06-21 16:09:08 -07:00
David Kelly
94a33fea94
new switches to override avatarURL
2017-06-21 16:03:05 -07:00
Chris Collins
f3ae1d8078
Merge pull request #10750 from Atlante45/master
...
Stable -> Master
2017-06-21 13:34:28 -07:00
samcake
56d5f4ec5c
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-21 11:25:07 -07:00
Brad Hefta-Gaub
f7d42c782d
Merge pull request #10764 from thoys/feat/ac-location-jsapi
...
Expose location scripting interface to Agent (AC script)
2017-06-21 10:22:48 -07:00
Thijs Wenker
47643e1efe
Expose location API to Agent scripts (side-effect, agents now can teleport)
2017-06-21 06:31:36 +02:00
Howard Stearns
fea8a95fc7
Don't leave running markers around if they weren't there before and we quit after reporting (protocol)version.
2017-06-20 18:09:27 -07:00
Dante Ruiz
5e82b13d65
removed double include
2017-06-21 01:15:17 +01:00
Dante Ruiz
b7286db523
fixed merge conflict
2017-06-21 01:10:54 +01:00
Dante Ruiz
2c3db0fb91
finished calibration-ui
2017-06-21 01:07:12 +01:00
Atlante45
6bd1946e96
Merge branch 'stable' of https://github.com/highfidelity/hifi
2017-06-20 16:36:57 -07:00
howard-stearns
41003bd307
Merge branch 'master' of https://github.com/highfidelity/hifi into event-installer-interface-options
2017-06-20 13:25:38 -07:00
howard-stearns
480ff784b9
add a skipTutorial option, that does not change settings
2017-06-20 13:25:03 -07:00
Brad Hefta-Gaub
cbded766b1
Merge pull request #10676 from NeetBhagat/21369
...
WL 21369 - Implement parts of the JS "console" object
2017-06-20 11:06:34 -07:00
howard-stearns
d71666f337
Remove useless command line arg for steam, but add one for version.
2017-06-20 09:59:15 -07:00
howard-stearns
974768390c
Merge branch 'master' of https://github.com/highfidelity/hifi into event-installer-interface-options
2017-06-20 09:47:52 -07:00
samcake
653ce89e08
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-19 15:48:46 -07:00
howard-stearns
91656a5fe5
Merge branch 'master' of https://github.com/highfidelity/hifi into event-installer-interface-options
2017-06-19 14:22:12 -07:00
Zach Fox
cbdffce88e
Merge branch 'master' of https://github.com/highfidelity/hifi into spectatorCamera_mergeable_20170619
2017-06-19 13:53:29 -07:00
Dante Ruiz
cfffb74a29
Merge branch 'master' of github.com:highfidelity/hifi into hand-pucks
2017-06-19 21:40:26 +01:00
Brad Davis
ed6620fc51
Merge pull request #10718 from jherico/frame_thread
...
Cleanup and refactoring
2017-06-19 13:31:44 -07:00
howard-stearns
c6d66d439b
report and quit command line switches
2017-06-19 12:57:26 -07:00
Olivier Prat
0211338657
Put back test if not physics enabled in entity items should fade function as it gives too many undesired refades
2017-06-19 20:38:47 +02:00
Seth Alves
39fb94d76d
fix bug that causes hmd avatar eyes to be all the way to the side when there's not another avatar to look at
2017-06-19 11:21:08 -07:00
Zach Fox
08eb07242d
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-06-19 10:31:31 -07:00
samcake
ebc4745df0
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-19 09:27:35 -07:00
Olivier Prat
21276a85ad
Merge branch 'master' of git://github.com/highfidelity/hifi into 21378
2017-06-19 18:20:03 +02:00
Olivier Prat
b6b1875dd3
Disabled check on enabled physics when deciding is fade is adequate
2017-06-19 18:19:54 +02:00
humbletim
26f651ae7c
Merge remote-tracking branch 'upstream/master' into HEAD
2017-06-19 10:01:37 -04:00
Vladyslav Stelmakhovskyi
59a77c16bd
Cleanup
2017-06-18 20:59:22 +02:00
Vladyslav Stelmakhovskyi
b8bb8026ca
Merge branch 'master' into fix_tablet_buttons_qt59
2017-06-17 22:30:00 +02:00
Vladyslav Stelmakhovskyi
5a0783c38c
Send mouse events before touch event. It seems the order is important for Qt 5.9
2017-06-17 22:24:27 +02:00
Brad Davis
a69cf31f4b
PR feedback and cmake fixes
2017-06-16 16:59:58 -07:00
Dante Ruiz
da29157a3c
fixed merge conflict'
2017-06-17 00:40:50 +01:00
David Kelly
6dd1e6e069
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview
2017-06-16 16:24:30 -07:00
Zach Fox
7a76c9cf7f
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-06-16 14:59:23 -07:00
humbletim
fc33e95e2d
Merge branch 'master' into 21180-C++
2017-06-16 16:16:42 -04:00
Brad Davis
fece438602
Cleanup and refactoring
2017-06-15 18:58:56 -07:00
Burt Sloane
4f7a1a6e2e
got rid of tabs
2017-06-15 16:35:53 -07:00
Burt Sloane
7d92ef9f25
more PR fixes
2017-06-15 16:12:16 -07:00
Burt Sloane
a73281b827
fix PR issues
2017-06-15 16:10:08 -07:00
David Kelly
f75cbfa087
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview
2017-06-15 15:45:03 -07:00
Burt Sloane
7022c4009f
midi in and out
2017-06-15 15:18:06 -07:00
Zach Pomerantz
3093a73ce1
Merge branch 'master' of github.com:highfidelity/hifi into audio/parity
2017-06-15 15:04:06 -04:00
Zach Fox
60549075dd
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-06-15 10:09:07 -07:00
Brad Hefta-Gaub
035a9e898f
Merge pull request #10684 from howard-stearns/avatar-whitelist
...
avatar whitelist
2017-06-15 08:45:16 -07:00
Dante Ruiz
d65c0dfbac
Merge branch 'master' of github.com:highfidelity/hifi into controller-ui
2017-06-15 16:24:59 +01:00
David Rowe
a8501a7ac6
Remove old Leap Motion code
2017-06-15 14:45:40 +12:00
samcake
d8380923f0
Introducing the SCeneUpdtate job to the engine to take care of performing transactions and introducing the stages
2017-06-14 18:06:42 -07:00
David Kelly
54dfc33b38
initial skeleton of qml objects
2017-06-14 14:36:37 -07:00
Brad Davis
7a6df850c5
Fix crash on exit when tablet is open
2017-06-14 13:22:53 -07:00
Howard Stearns
87f3ce7699
reset avatar on domain change if the last domain imposed something on us
2017-06-13 19:30:01 -07:00
Zach Pomerantz
b24681125d
rm debugging
2017-06-13 18:16:16 -04:00
Zach Pomerantz
d4797dc9f8
update shift-x
2017-06-13 17:44:59 -04:00
Zach Pomerantz
a8f69bb2e0
Merge branch 'master' of github.com:highfidelity/hifi into audio/parity
2017-06-13 17:41:52 -04:00
Zach Pomerantz
4a39798a97
sticky audio selection
2017-06-13 14:38:52 -04:00
NeetBhagat
9646eba873
Complete console.trace and added a testcases for all 13 functions.
2017-06-13 23:52:48 +05:30
Zach Fox
ec162327a2
Merge branch 'spectator-camera' into flash
2017-06-13 10:22:02 -07:00
Zach Fox
7d1a7f4c0b
Merge branch 'master' of https://github.com/highfidelity/hifi into
...
spectator-camera - INCLUDING MERGE CONFLICT FIXES
2017-06-13 09:42:14 -07:00
Zach Pomerantz
89bd895054
mv showAudioTools to just AvatarInputs
2017-06-13 12:31:05 -04:00
Olivier Prat
24d45e0f5b
Updated from upstream master because of change of protocol
2017-06-13 10:43:25 +02:00
NeetBhagat
b0e9c62c12
Merge branch 'master' of https://github.com/highfidelity/hifi into 21369
2017-06-13 10:10:44 +05:30
Sam Cake
f973f7b5e3
Fix the background not rendering on the second frame, this was imply due to a bug in the GLBackend
2017-06-12 21:25:27 -07:00
Zach Pomerantz
b5dab39f83
sticky mic meter / noise reduction
2017-06-12 18:41:32 -04:00
Zach Pomerantz
b37a0239b0
up to reverb (needs cherry-picking)
2017-06-12 18:00:52 -04:00
Dante Ruiz
1b13cd6d45
saving work
2017-06-12 17:31:02 +01:00
Dante Ruiz
067fc9bb98
fixed merge conflict
2017-06-12 16:45:34 +01:00
NeetBhagat
e6a5930365
Merge branch 'master' into 21369
2017-06-12 11:17:26 +05:30
samcake
bb38938534
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-09 14:34:25 -07:00
Zach Fox
7aef4dab4c
Variable renaming pass
2017-06-09 11:39:28 -07:00
Zach Fox
a4f5d327a2
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-06-09 11:38:35 -07:00
Seth Alves
5b62c9e83b
try again to get forward not-looking-at-anyone gaze to work right
2017-06-09 10:45:04 -07:00
Seth Alves
197fb620d4
Merge branch 'master' of github.com:highfidelity/hifi into fix-head-puck-broken-eyes
2017-06-09 09:28:07 -07:00
NeetBhagat
c5d8268007
Merge branch 'master' of https://github.com/highfidelity/hifi into 21369
2017-06-09 18:04:34 +05:30
Seth Alves
485df396ef
Merge pull request #10628 from jherico/qt59
...
Fixes for Qt 5.9 compatibility
2017-06-08 16:51:08 -07:00
Seth Alves
ce4c3e1601
fix bug that causes hmd avatar eyes to be all the way to the side when there's not another avatar to look at
2017-06-08 13:55:30 -07:00
Seth Alves
3b47142592
fix bug that causes hmd avatar eyes to be all the way to the side when there's not another avatar to look at
2017-06-08 10:28:38 -07:00
Olivier Prat
20d4fcbbc7
Fixed fading on skinned objects. Added initialiazeShapePipelines on GeometryCache to postpone simple pipeline creation after initializeGL
2017-06-08 09:24:12 +02:00
samcake
3664655512
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-07 17:43:50 -07:00
Seth Alves
b1c7c251ac
Merge branch 'master' of github.com:highfidelity/hifi into head-controller
2017-06-07 10:09:46 -07:00
Zach Fox
d1719fade6
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-06-07 09:46:04 -07:00
NeetBhagat
ead0d42cf3
Merge branch 'master' into 21369
...
# Conflicts:
# libraries/gl/src/gl/OffscreenQmlSurface.cpp
# libraries/gl/src/gl/OffscreenQmlSurface.h
2017-06-07 15:47:19 +05:30
NeetBhagat
904e25c9e3
intial commit #21369 Working on clear method of console
2017-06-07 14:37:18 +05:30
Brad Hefta-Gaub
e5ac3eeea7
Merge pull request #10548 from NeetBhagat/21255
...
On Oculus Rift on/off, switch automatically to/from desktop mode
2017-06-06 18:05:56 -07:00
samcake
bac66ee4c7
Introducing the renderview task
2017-06-06 18:00:41 -07:00
Bradley Austin Davis
fc6a278217
Fixing dangling thread issues, consolidating thread management
2017-06-06 15:02:16 -07:00
Brad Davis
171d3212fe
Merge pull request #10623 from jherico/qml_engine_singleton
...
Migrate to single QML engine
2017-06-06 15:00:43 -07:00
Zach Pomerantz
2b99f299c8
testing
2017-06-06 17:54:52 -04:00
Dante Ruiz
8d6e4bf28c
Merge branch 'master' of github.com:highfidelity/hifi into controller-ui
2017-06-06 21:09:19 +01:00
Stephen Birarda
0ccd0d3fd6
Merge pull request #10621 from highfidelity/stable
...
Merge Stable back into Master
2017-06-06 10:39:03 -07:00
NeetBhagat
c3621d7c32
Resolved two issues:
...
1) While in HMD mode -> open Tablet -> Click Desktop. Desktop mode will be on.
2) Menu sync problem while switching modes.
2017-06-06 22:31:14 +05:30
Dante Ruiz
038ffe920a
fixing merge conflicts
2017-06-06 16:42:08 +01:00
NeetBhagat
ae9a928740
Merge branch 'master' into 21255
...
# Conflicts:
# interface/src/Application.cpp
2017-06-06 19:06:50 +05:30
Bradley Austin Davis
995fe11c05
Migrate to single QML engine
2017-06-05 15:14:44 -07:00
Brad Hefta-Gaub
51e00b9de9
Merge pull request #10614 from samcake/brown
...
Introduce a stencil mask pass in the rendering to optimize HMD
2017-06-05 14:14:11 -07:00
humbletim
7cab0363a9
standalone 21180 branch with just the C++ changes
2017-06-05 15:57:54 -04:00
Seth Alves
3ab67cf27e
fix forward gaze in HMD while not looking at anyone
2017-06-05 11:44:27 -07:00
Zach Fox
87fca16e0d
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-06-05 10:48:12 -07:00
Chris Collins
6cc6cd3bf6
Merge pull request #10604 from highfidelity/RC-42
...
Beta Release 42 - Includes up to Developer Release 6626
2017-06-05 09:13:19 -07:00
Ryan Huffman
52c60b35df
Add startup_sent_to user activity event
2017-06-02 17:57:40 -07:00
Seth Alves
1b719ee654
Merge branch 'master' of github.com:highfidelity/hifi into head-controller
2017-06-02 16:31:23 -07:00
Dante Ruiz
f0f10f74c6
inpput configutration stub
2017-06-03 00:30:00 +01:00
manapa01
8e1577d3d3
Merge pull request #10596 from manapa01/Snapshot-Sound
...
Snapshot sound
2017-06-02 16:07:05 -07:00
Seth Alves
3359a0a794
work on fixing some head to eye offsets. MyHead::getHmdOrientation to MyHead::getHeadOrientation
2017-06-02 15:29:20 -07:00
samcake
0a3c1712eb
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-06-02 14:35:05 -07:00
Patrick Manalich
76901f5bf9
Final Application.cpp change
2017-06-02 14:08:56 -07:00
Seth Alves
c40a76f320
Merge branch 'master' of github.com:highfidelity/hifi into head-controller
2017-06-02 13:58:00 -07:00
Seth Alves
9088e288e0
don't worry about head controller being enabled, just check to see if head pose is valid
2017-06-02 13:57:53 -07:00
Ryan Huffman
c0bca73ec7
Merge pull request #10606 from huffman/feat/startup-went-to-event
...
Add startup_sent_to user activity event
2017-06-02 13:49:41 -07:00
