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 |
|
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 |
|
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 |
|
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 |
|
Brad Davis
|
fece438602
|
Cleanup and refactoring
|
2017-06-15 18:58:56 -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 |
|
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 |
|