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 |
|
Stephen Birarda
|
d89febac71
|
use a sleep instead of a yield waiting for close event
|
2017-06-02 13:22:02 -07:00 |
|
Stephen Birarda
|
e3d8229abe
|
rename ClosureEventSender to CloseEventSender
|
2017-06-02 13:21:55 -07:00 |
|
Stephen Birarda
|
40dfcb1e6e
|
send quit event during shutdown on thread, with timeout
|
2017-06-02 13:21:37 -07:00 |
|
Stephen Birarda
|
f5d732f332
|
initial version of the ClosureEventSender using std::thread
|
2017-06-02 13:21:28 -07:00 |
|
Sam Gateau
|
8a2837e1f7
|
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
|
2017-06-02 11:52:11 -07:00 |
|
Ryan Huffman
|
0d96f82888
|
Merge pull request #10592 from birarda/close-report
Send a close event to API on shutdown
|
2017-06-02 10:57:41 -07:00 |
|
Patrick Manalich
|
1f478bdf13
|
Repair Application.cpp
|
2017-06-02 10:44:58 -07:00 |
|
Patrick Manalich
|
a705e722f1
|
Ctrl-S sound feature added
|
2017-06-02 10:35:57 -07:00 |
|
Patrick Manalich
|
0c71cf4bda
|
Edit: Snapshot will make sound when initially clicked
|
2017-06-02 10:24:27 -07:00 |
|
Patrick Manalich
|
4e61db8263
|
Snapshot will make sound when initially clicked
|
2017-06-02 10:24:27 -07:00 |
|
Seth Alves
|
d91b3700a7
|
Merge branch 'master' of github.com:highfidelity/hifi into head-controller
|
2017-06-02 10:07:50 -07:00 |
|
Ryan Huffman
|
0fdbf4a342
|
Add startup_sent_to user activity event
|
2017-06-02 09:59:29 -07:00 |
|
Seth Alves
|
bc2311cb35
|
Merge pull request #10561 from AndrewMeadows/sanity-check-physics
fix crash in EntityMotionState::handleDeactivation()
|
2017-06-02 09:55:20 -07:00 |
|
NeetBhagat
|
6228ff19bf
|
Resolve the reviewed comments of @ZappoMan
|
2017-06-02 15:23:21 +05:30 |
|
Sam Cake
|
f9aa400b95
|
Refining the stencil configuration and triggering only in hmd mode
|
2017-06-02 00:22:38 -07:00 |
|
NeetBhagat
|
e08c3453a4
|
Merge branch 'master' into 21255
|
2017-06-02 12:36:07 +05:30 |
|
Stephen Birarda
|
6d1bbc389d
|
use a sleep instead of a yield waiting for close event
|
2017-06-01 17:57:23 -07:00 |
|
Stephen Birarda
|
9fad8d1821
|
rename ClosureEventSender to CloseEventSender
|
2017-06-01 17:52:01 -07:00 |
|
Seth Alves
|
7d21ab88b0
|
add some saftey checks. cleanups
|
2017-06-01 16:14:59 -07:00 |
|
Stephen Birarda
|
0f22b07026
|
move session ID logging later in app startup
|
2017-06-01 16:07:36 -07:00 |
|
Seth Alves
|
ac6135387c
|
display plugins are never head controllers
|
2017-06-01 13:37:16 -07:00 |
|
Stephen Birarda
|
792d938262
|
send quit event during shutdown on thread, with timeout
|
2017-06-01 13:01:24 -07:00 |
|
Seth Alves
|
eb94c48c5b
|
merge from upstream
|
2017-06-01 10:10:11 -07:00 |
|
NeetBhagat
|
d27ad061cb
|
Merge branch 'master' into 21255
|
2017-06-01 12:46:14 +05:30 |
|
NeetBhagat
|
c7c07b28e9
|
Resolve the reviewed comments of @ZappoMan
|
2017-06-01 12:17:13 +05:30 |
|
Stephen Birarda
|
1d9d83b157
|
initial version of the ClosureEventSender using std::thread
|
2017-05-31 19:00:41 -07:00 |
|
Seth Alves
|
e37387f45c
|
sync
|
2017-05-31 14:01:09 -07:00 |
|
NeetBhagat
|
58142817a1
|
Resolve the review comments of @ZappoMan.
|
2017-05-31 19:18:14 +05:30 |
|
Seth Alves
|
ffe844a8e7
|
Merge branch 'master' of github.com:highfidelity/hifi into head-controller
|
2017-05-30 13:42:20 -07:00 |
|
Chris Collins
|
5db0975554
|
Merge pull request #10556 from highfidelity/RC-41
Beta Release 41 - Includes up to Developer Release 6603
|
2017-05-30 12:52:30 -07:00 |
|
Seth Alves
|
250e381ea7
|
Merge pull request #10563 from Atlante45/fix/reset-settings
Fix "retain avatar info"
|
2017-05-30 10:00:55 -07:00 |
|
volansystech
|
e90b1b5a67
|
Resolve the comments of @ZappoMan.
|
2017-05-29 18:21:59 +05:30 |
|
volansystech
|
212627bd5d
|
Merge branch 'master' into 21255
|
2017-05-29 17:51:45 +05:30 |
|
volansystech
|
0920dbc1a8
|
Resolve the comments of @ZappoMan.
|
2017-05-29 15:53:33 +05:30 |
|
Zach Pomerantz
|
4a3f2e1d09
|
use subclass for interface's Audio interface
|
2017-05-28 19:25:37 -04:00 |
|
Zach Pomerantz
|
b2eda7cf22
|
rm AudioDevice interface
|
2017-05-28 19:04:51 -04:00 |
|
Zach Pomerantz
|
03d3666c0c
|
show menu after requesting it
|
2017-05-28 17:34:11 -04:00 |
|
Zach Pomerantz
|
156b3f9738
|
use showDialog instead of toggleMenu
|
2017-05-28 17:10:59 -04:00 |
|
samcake
|
882df7391b
|
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
|
2017-05-26 16:47:49 -07:00 |
|
Atlante45
|
ccc7cb638d
|
Fix "retain avatar info"
|
2017-05-26 14:18:29 -07:00 |
|
Zach Pomerantz
|
637a448c2c
|
abstract toggleMenu
|
2017-05-26 17:12:15 -04:00 |
|
Zach Pomerantz
|
380a16f9dd
|
use SYSTEM_TABLET static
|
2017-05-26 17:11:32 -04:00 |
|
Andrew Meadows
|
fa003b0c14
|
swap order of changes and deactvations
|
2017-05-26 12:29:37 -07:00 |
|
Anthony Thibault
|
84901ba94b
|
Merge pull request #10542 from druiz17/arm-pucks
Added pucks calibration for upper arm/shoulders
|
2017-05-26 11:17:15 -07:00 |
|
Clément Brisset
|
efe72e1b85
|
Merge pull request #10530 from Atlante45/fix/default-scripts
Ensure user never loses its running scripts
|
2017-05-25 18:33:11 -07:00 |
|
Seth Alves
|
af5ba3a90a
|
ask display-plugins if they are head-controllers
|
2017-05-25 15:14:10 -07:00 |
|
Andrew Meadows
|
3bd0c111d7
|
verify empty ShapeManager in Application dtor
|
2017-05-25 13:47:40 -07:00 |
|
Seth Alves
|
3823ece153
|
Merge branch 'master' of github.com:highfidelity/hifi into head-controller
|
2017-05-25 10:57:46 -07:00 |
|
Seth Alves
|
bdbc6ddcc1
|
change some code to look at head-controller position rather than hmd position
|
2017-05-25 10:50:41 -07:00 |
|
volansystech
|
a2851b5bcb
|
Put proper comments and indentation.
|
2017-05-25 18:47:59 +05:30 |
|
volansystech
|
8d51be644d
|
Merge branch 'master' into 21255
|
2017-05-25 17:48:48 +05:30 |
|
volansystech
|
1f24e38585
|
Initial Commit: Switching from Desktop mode to HMD [Oculus Rift] mode automatically when the user wear Oculus Rift.
|
2017-05-25 14:56:06 +05:30 |
|
Sam Cake
|
3eb95d2d19
|
cleaning the commented code
|
2017-05-25 01:16:45 -07:00 |
|
Stephen Birarda
|
f897f3f090
|
send machine fingerprint as uuid without curly braces
|
2017-05-24 19:08:25 -07:00 |
|
Stephen Birarda
|
50285005be
|
add machine fingerprint to the launch event
|
2017-05-24 18:35:57 -07:00 |
|
Stephen Birarda
|
c671817fa3
|
fix cache http request count in stats
|
2017-05-24 17:47:40 -07:00 |
|
Stephen Birarda
|
fefb34512d
|
change asset inbound key to atp
|
2017-05-24 17:44:09 -07:00 |
|
Stephen Birarda
|
c37fd335e1
|
track the number of local socket changes
|
2017-05-24 17:41:52 -07:00 |
|
Stephen Birarda
|
5e61f20df8
|
add more details about pending downloads
|
2017-05-24 17:37:42 -07:00 |
|
Stephen Birarda
|
48c4db1ca4
|
nest the download stats so they are cleaner
|
2017-05-24 17:36:21 -07:00 |
|
samcake
|
575d4abdf7
|
bad include fixed maybe
|
2017-05-24 17:25:21 -07:00 |
|
Stephen Birarda
|
3743cd23b4
|
add detailed download stats for file/http/atp
|
2017-05-24 17:22:38 -07:00 |
|
Stephen Birarda
|
ac55908e42
|
add additional information to stats/launch activities
|
2017-05-24 16:50:06 -07:00 |
|
samcake
|
044110e4f3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
|
2017-05-24 15:40:40 -07:00 |
|
Dante Ruiz
|
8cb9bfcc81
|
fixed merge conflict
|
2017-05-24 19:35:41 +01:00 |
|
Sam Gateau
|
f9c6cecb23
|
Merge pull request #10529 from samcake/ambient
Fix compressed texture size evaluation and Cleaning up the texture counters (number and memory) for better reporting
|
2017-05-24 10:48:21 -07:00 |
|
volansystech
|
0c4cd96bfd
|
Initial Commit : Switch from HMD [Oculus Rift] mode to Desktop mode automatically when user removing Oculus Rift.
|
2017-05-24 12:26:07 +05:30 |
|
Dante Ruiz
|
ac3c9655ec
|
added arms
|
2017-05-24 01:28:08 +01:00 |
|
samcake
|
e7b808cbc1
|
Merging with upstream
|
2017-05-23 12:12:31 -07:00 |
|
Dante Ruiz
|
0cbdeaa1e8
|
Merge branch 'master' of github.com:highfidelity/hifi into arm-pucks
|
2017-05-23 18:26:58 +01:00 |
|
Dante Ruiz
|
54d63f5155
|
Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter
|
2017-05-23 18:19:38 +01:00 |
|
Sam Cake
|
7f9c98a922
|
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
|
2017-05-22 22:54:43 -07:00 |
|
Atlante45
|
10eb353126
|
Ensure user never loses its running scripts
|
2017-05-22 18:55:58 -07:00 |
|
Dante Ruiz
|
d98e7d5bc6
|
adding left and right arm
|
2017-05-23 00:26:12 +01:00 |
|
David Rowe
|
9f83ca518f
|
Merge branch 'master' into 21359
|
2017-05-23 09:18:10 +12:00 |
|
Atlante45
|
2928507e48
|
Fix "Reset Settings" window poping up every time
|
2017-05-21 08:37:17 -07:00 |
|
samcake
|
c5b5aa93b1
|
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
|
2017-05-19 18:13:42 -07:00 |
|
David Rowe
|
768415695d
|
Tidying
|
2017-05-20 12:43:47 +12:00 |
|
Sam Gateau
|
36ac623e66
|
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
|
2017-05-19 13:25:36 -07:00 |
|
Atlante45
|
c2e2682eff
|
Fix "Reset Settings" window poping up every time
|
2017-05-19 10:50:23 -07:00 |
|
howard-stearns
|
242cbdf2df
|
Merge branch 'master' of https://github.com/highfidelity/hifi into update-from-master-1
|
2017-05-18 16:02:45 -07:00 |
|
howard-stearns
|
851911f55a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into update-from-master-1
|
2017-05-18 15:28:40 -07:00 |
|
Zach Fox
|
8efac1e7f1
|
Prevent another GIF from being captured while one is processing
|
2017-05-18 14:30:08 -07:00 |
|
Dante Ruiz
|
984f9e1ba5
|
Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter
|
2017-05-18 21:23:06 +01:00 |
|
Sam Gateau
|
d9ad45bf4a
|
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
|
2017-05-18 09:37:04 -07:00 |
|
samcake
|
2c6e10fbe1
|
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient
|
2017-05-18 09:21:02 -07:00 |
|
Dante Ruiz
|
90ddc16d09
|
add calibration data to filters
|
2017-05-18 17:07:28 +01:00 |
|
samcake
|
80b6fd65ae
|
Cleaning up counters and naming schemes...
|
2017-05-17 18:31:28 -07:00 |
|
Zach Fox
|
d4752926b8
|
First pass - checking performance
|
2017-05-17 13:51:27 -07:00 |
|
Sam Gateau
|
0f250e693d
|
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
|
2017-05-17 09:49:20 -07:00 |
|
Dante Ruiz
|
a18940142e
|
Merge branch 'master' of github.com:highfidelity/hifi into improve-rotation-jitter
|
2017-05-17 16:23:50 +01:00 |
|
Atlante45
|
201f81f20a
|
Don't wait on the sandbox
|
2017-05-16 14:41:57 -07:00 |
|
Dante Ruiz
|
975b1ab077
|
moved low velocity filter in the input system
|
2017-05-16 00:15:06 +01:00 |
|
samcake
|
2df6d0df48
|
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
|
2017-05-15 13:40:56 -07:00 |
|
howard-stearns
|
bca2cf45c0
|
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
|
2017-05-12 15:21:03 -07:00 |
|
Clément Brisset
|
1658ced671
|
Merge pull request #10437 from Atlante45/feat/faster-startup
Use baked default skybox
|
2017-05-12 11:35:51 -07:00 |
|
samcake
|
3393456d91
|
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
|
2017-05-12 10:15:13 -07:00 |
|
samcake
|
39241bec13
|
Prototyping a way to produce a selfie and use the rendering directly
|
2017-05-11 15:58:31 -07:00 |
|
samcake
|
737fdf9dd8
|
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
|
2017-05-10 17:28:07 -07:00 |
|
Atlante45
|
79d53d92a1
|
Use baked default skybox
|
2017-05-10 16:03:02 -07:00 |
|
Vladyslav Stelmakhovskyi
|
2328da3c48
|
Merge branch 'master' into audio-source-sync
|
2017-05-10 21:22:40 +02:00 |
|
Brad Hefta-Gaub
|
f91f42b0c8
|
Merge pull request #10411 from zzmp/feat/tester-flag
Add launch.tester to user_actions
|
2017-05-10 11:58:24 -07:00 |
|
samcake
|
39f6e22da3
|
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
|
2017-05-10 09:48:26 -07:00 |
|
Zach Pomerantz
|
45feee38b2
|
Merge pull request #10269 from zzmp/fix/audio-bg-join
Cleanup Audio background threads on shutdown
|
2017-05-09 17:23:36 -04:00 |
|
samcake
|
c36035d3eb
|
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
|
2017-05-09 10:46:38 -07:00 |
|
Vladyslav Stelmakhovskyi
|
7ab6909c77
|
Merge branch 'master' into audio-source-sync
|
2017-05-09 11:08:08 +02:00 |
|
Andrew Meadows
|
2835a73c6b
|
Merge pull request #10071 from AndrewMeadows/walk-up-steps
avatar can walk up steps
|
2017-05-08 18:17:16 -07:00 |
|