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
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
Zach Pomerantz
defc3c1c4f
Merge branch 'master' of github.com:highfidelity/hifi into fix/audio-bg-join
2017-05-08 19:55:10 -04:00
Zach Pomerantz
929079df97
add launch.tester to user_actions
2017-05-08 19:33:09 -04:00
Vladyslav Stelmakhovskyi
d0111ac0bb
Merge branch 'master' into audio-source-sync
2017-05-08 20:09:34 +02:00
Sam Cake
d3724116d9
Using the items to pick the key light!
2017-05-08 00:20:20 -07:00
Zach Pomerantz
ca7cd61c64
Merge branch 'master' of github.com:highfidelity/hifi into fix/audio-bg-join
2017-05-05 13:04:01 -04:00
Andrew Meadows
e21bd7a67a
help avatar walk up steps
2017-05-05 09:35:49 -07:00
Vladyslav Stelmakhovskyi
e395a51c60
Merge with master
2017-05-05 07:05:16 +02:00
samcake
df2c5b8c23
adding the notification for keyLight changes modifying the KeyLIghtPayoad
2017-05-04 18:28:12 -07:00
Brad Davis
9def788956
Merge pull request #10314 from jherico/avatars-renderer
...
Migrate Avatar rendering code to library
2017-05-04 14:23:49 -07:00
Brad Davis
2d0bbf70ae
Migrate core avatar rendering functionality to library
2017-05-04 14:08:59 -07:00
Vladyslav Stelmakhovskyi
ba5a371da1
Decrease CPU usage in tabletUI periodical updates
2017-05-04 22:54:41 +02:00
Zach Pomerantz
ad8d3e5490
continue idling while minimized
2017-05-02 20:05:55 -04:00
Vladyslav Stelmakhovskyi
e789b69a8e
Merge branch 'master' into audio-source-sync
2017-05-02 20:57:01 +02:00
Brad Davis
425405f72d
Merge pull request #10245 from AndrewMeadows/avatar-renderer-002
...
more cleanup in preparation for moving Avatar class to lib
2017-05-02 10:37:22 -07:00
Seth Alves
a75544a9fb
Merge pull request #10319 from hyperlogic/feature/head-standard-action
...
Head, Hips and Chest IK can now be controlled from Controller inputs
2017-05-01 13:03:23 -07:00
Brad Davis
40e4e2f307
Merge pull request #10327 from jherico/face_tracker_refactor
...
Remove Faceshift
2017-05-01 12:14:55 -07:00
Vladyslav Stelmakhovskyi
dde363ef3d
Merge branch 'master' into audio-source-sync
2017-05-01 18:42:53 +02:00
Vladyslav Stelmakhovskyi
28447cde0b
Get rid of QML errors in HMD mode. Sync Audio menu in Tablet/HMD without recreating menu items
2017-05-01 18:41:38 +02:00
Brad Davis
2b43a1989f
Moving face and eye trackers out of interface
2017-04-28 23:28:17 -07:00
Brad Davis
5e1bc0d908
Remove faceshift
2017-04-28 16:34:54 -07:00
Stephen Birarda
c518aa55be
Merge pull request #10312 from birarda/upload-new-models-to-entity
...
add an entity file replacement via domain-server content page
2017-04-28 16:06:05 -07:00
Anthony J. Thibault
108cd80bb5
Merge branch 'master' into feature/head-standard-action
2017-04-28 10:41:29 -07:00
Stephen Birarda
9bc0609b1e
address code review comments
2017-04-28 10:17:48 -07:00
Anthony J. Thibault
2120e63e3a
Merge branch 'master' into feature/head-standard-action
2017-04-27 17:51:13 -07:00
Stephen Birarda
038ac745c8
clear domain octree details if ES killed
2017-04-27 17:47:18 -07:00
Zach Fox
3ce81844da
Snapshot JS interface for better Settings handling
2017-04-27 14:01:08 -07:00
Zach Fox
16b4af8a9d
Rearchitecture
2017-04-27 14:01:06 -07:00
Andrew Meadows
75b563d598
restore rendering of avatar receive stats
2017-04-27 13:16:50 -07:00
Andrew Meadows
442080dec7
remove unused RenderArgs::_cameraMode hack
2017-04-27 13:16:50 -07:00
Andrew Meadows
72f5860538
restore RecordingScriptingInterface to Application
2017-04-27 13:16:50 -07:00
Andrew Meadows
65682a914d
remove cufty AvatarManager LocalLights feature
2017-04-27 13:11:57 -07:00
ZappoMan
c0df82ff69
Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL
2017-04-26 18:49:24 -07:00
ZappoMan
834a447d62
remove debugging code
2017-04-26 18:36:44 -07:00
anshuman64
d146431e9b
Merge pull request #10268 from druiz17/input-recorder
...
Input recorder/ input playback system for all input actions
2017-04-26 16:20:20 -07:00
Ryan Huffman
8ba56a96df
Merge pull request #10240 from zzmp/fix/hmd-tutorial
...
Condition tutorial on active HMD
2017-04-26 14:00:02 -07:00
Anthony J. Thibault
ef43ff4b99
Add default pose matrices to InputCalibrationData structure
2017-04-26 11:55:24 -07:00
ZappoMan
5dd6daaad7
send identity on nodeActivated not nodeAdded
2017-04-26 11:42:38 -07:00
Dante Ruiz
d8e6e8e7d0
Merge branch 'master' of github.com:highfidelity/hifi into input-recorder
2017-04-26 16:53:02 +01:00
ZappoMan
65801cbb4d
Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL
2017-04-25 18:21:17 -07:00
ZappoMan
5164aa4056
hacking
2017-04-25 18:21:09 -07:00
ZappoMan
90cdeb9582
Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL
2017-04-25 16:09:59 -07:00
Atlante45
33f58f99d1
CR
2017-04-25 16:09:31 -07:00
Dante Ruiz
5a9cf554e7
Merge branch 'master' of github.com:highfidelity/hifi into input-recorder
2017-04-25 23:57:48 +01:00
Atlante45
a450f52427
Start to setup image library
2017-04-25 15:56:22 -07:00
Brad Hefta-Gaub
1962a49f3b
Merge pull request #10225 from sethalves/bullet-constraints-1
...
Bullet constraints + far-grab bootstrap fix
2017-04-25 13:36:47 -07:00
Zach Pomerantz
d2bfcce3f7
Merge pull request #10242 from zzmp/fix/display-log
...
Send changed_display_mode after it changes
2017-04-25 16:36:12 -04:00
Seth Alves
0cd2863df4
start on routing HMD position and rotation through controller interface
...
(cherry picked from commit bca5241bae7674ff7e41c037d84bb78e5152046a)
2017-04-25 11:01:52 -07:00
ZappoMan
aa955ee360
Merge branch 'master' of https://github.com/highfidelity/hifi into retrySkeletonURL
2017-04-24 17:36:30 -07:00
ZappoMan
c9aad6b762
new approach to the tpose fix, as well as other improvements
2017-04-24 17:36:05 -07:00
Zach Pomerantz
4a26785eda
cleanup Audio bg threads in cleanupBeforeQuit
2017-04-24 18:21:27 -04:00
Zach Pomerantz
cd2665fc55
standardize Audio bg thread joins
2017-04-24 18:10:50 -04:00
Dante Ruiz
f69691afd5
Merge branch 'master' of github.com:highfidelity/hifi into input-recorder
2017-04-24 19:57:48 +01:00
Dante Ruiz
d057dfebf0
got input recording to work
2017-04-24 19:57:38 +01:00
Seth Alves
17b83dd64c
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1
2017-04-21 17:19:47 -07:00
Ken Cooke
a5ed3007b3
Merge pull request #10248 from vladest/notify-sound-inject
...
Notify sound inject
2017-04-21 09:26:36 -07:00
Dante Ruiz
641a7390ba
Merge branch 'master' of github.com:highfidelity/hifi into input-recorder
2017-04-21 16:46:55 +01:00
Vladyslav Stelmakhovskyi
2665ede06f
Audio injector cleanup
2017-04-20 21:32:14 +02:00
Vladyslav Stelmakhovskyi
b2533b6106
Code nitpick. Pointer cleanup on exit
2017-04-20 21:12:57 +02:00
Zach Pomerantz
b77917b8d1
Merge pull request #10241 from zzmp/fix/display-fail
...
Update Display menu on unsuccesful selection
2017-04-20 12:04:51 -04:00
Vladyslav Stelmakhovskyi
06406ef7de
Merge branch 'master' into notify-sound-inject
2017-04-20 17:46:08 +02:00
Vladyslav Stelmakhovskyi
023d03d9f8
Implemented snap sound using sound injector
2017-04-20 17:43:16 +02:00
Seth Alves
f7378abb08
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1
2017-04-20 02:40:10 -07:00
Zach Fox
50456f71ed
Merge pull request #10142 from Triplelexx/21258
...
21258 - Don't render (or heavily use GPU) when window in minimized
2017-04-19 16:26:49 -07:00
Dante Ruiz
d4c8d06575
Merge branch 'master' of github.com:highfidelity/hifi into input-recorder
2017-04-19 20:42:11 +01:00
Dante Ruiz
07f674eabe
exprting compressed file
2017-04-19 20:41:56 +01:00
Zach Pomerantz
e0cb809f58
add hmd:bool to changed_display_mode
2017-04-18 18:48:28 -04:00
Zach Pomerantz
858a1db38b
only log changed_display_mode on successful change
2017-04-18 18:48:23 -04:00
Zach Pomerantz
c7a7fa90ec
update Display menu on unsuccesful selection
2017-04-18 18:47:57 -04:00
Zach Pomerantz
a310acd37f
check HMD usage for tutorial teleport
2017-04-18 18:46:53 -04:00
Dante Ruiz
f8ec49eb96
Merge branch 'master' of github.com:highfidelity/hifi into input-recorder
2017-04-18 21:53:37 +01:00
Dante Ruiz
5cd4007aaa
got input recording working
2017-04-18 21:53:23 +01:00
Seth Alves
0807e036e8
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1
2017-04-18 11:59:23 -07:00
Andrew Meadows
da55c96c4c
protect against crash on invalid scene on shutdown
2017-04-18 11:52:22 -07:00
Andrew Meadows
5a458c9923
remove last qApp usage from Avatar class
2017-04-18 11:52:21 -07:00
Andrew Meadows
685a01482c
remove Camera argument from Avatar::render()
2017-04-18 11:52:21 -07:00
Andrew Meadows
9cddbbc42a
more interface-only spaghetti out of Avatar
2017-04-18 11:52:21 -07:00
Andrew Meadows
1137bd1436
pull qApp spaghetti out of Avatar class
...
some ends of spaghetti get pushed into AvatarManger class
split Camera class into Camera base and FancyCamera derivation
Application::getCamera() returns Camera by refence instead of pointer
2017-04-18 11:52:21 -07:00
Zach Fox
7505b82189
Merge pull request #10046 from Triplelexx/21224
...
21224 - Allow people to save avatar bookmarks
2017-04-18 11:10:50 -07:00
Zach Fox
9c4e367245
Merge pull request #10213 from zfox23/fixGoToFocus
...
FB 4156; Fix GoTo text field focus; other GoTo tweaks
2017-04-17 12:13:41 -07:00
Zach Fox
e6edce5352
Entirely remove addressBarToggle()
2017-04-17 12:13:01 -07:00
Seth Alves
371118a6c0
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1
2017-04-14 16:26:30 -07:00
Sam Gateau
3519a72f8a
Merge pull request #10190 from samcake/ambient-bis
...
Introducing a tool to debug the current Zone Stack
2017-04-14 13:28:59 -07:00
Seth Alves
d17d12446b
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1
2017-04-14 12:49:03 -07:00
Thijs Wenker
6f58e91d76
Merge pull request #10121 from birarda/bug/recording-cache
...
cleanup Agent RSI handling, make loadRecording async
2017-04-14 21:35:51 +02:00
Seth Alves
0dab94fada
Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-0
2017-04-12 16:34:46 -07:00
Zach Fox
75f1168b19
Clearer function names
2017-04-12 14:45:57 -07:00
Zach Fox
e296383b1b
Checkpoint!
2017-04-12 14:45:56 -07:00
Seth Alves
74c0a70cb0
rename base action classes to dynamics, start on constraints
2017-04-11 20:39:13 -07:00
Zach Fox
6569de697d
Merge pull request #10187 from zfox23/fix/getAvatar_Fix
...
Fix FB3999; Fix crashes caused by getAvatar() design bug
2017-04-11 11:17:48 -07:00
samcake
79bcf95792
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis
2017-04-11 10:00:34 -07:00
Seth Alves
bf16309917
Merge pull request #10146 from AndrewMeadows/avoid-invisible-avatars-002
...
avoid invisible avatars redux
2017-04-11 07:07:03 -07:00
Stephen Birarda
84a5807ff1
return ScriptAvatarData raw pointer from getAvatar
2017-04-10 22:15:45 -07:00
Stephen Birarda
42a406e90a
add ScriptAvatar for std::shared_ptr<Avatar> passing to scripts
2017-04-10 22:15:45 -07:00
samcake
16e6f0900d
Merge branch 'master' of https://github.com/highfidelity/hifi into ambient-bis
2017-04-10 10:12:23 -07:00
Sam Cake
b65448bcbe
Trying to improve the Job/Task classes and testing it with the ZoneRenderer
2017-04-09 11:08:35 -07:00
Chris Collins
8e12f62cbb
Merge pull request #10153 from druiz17/goto-fix
...
Ability to toggle goto with the crt-l and enter keys
2017-04-07 16:36:41 -07:00
Seth Alves
03065ee6c8
Merge pull request #9938 from kunalgosar/jsRenderBug
...
Stop WebEntities Running Files and Commands
2017-04-07 13:44:03 -07:00
Andrew Meadows
92495d9622
delete in proper order on shutdown
2017-04-07 11:10:48 -07:00
Triplelexx
27a404d0ea
remove extra lines
2017-04-07 07:09:18 +01:00
Triplelexx
279997d905
change display plugin to deactivate when window minimized
2017-04-07 06:49:28 +01:00
Dante Ruiz
52fd446d4d
toggle goto in tablet
2017-04-06 22:27:37 +01:00
Triplelexx
1b2887d5b1
change paintGL to return if window is minimized
2017-04-06 17:06:06 +01:00
samcake
1a9005ed8b
Avoid unexpected changes
2017-04-05 13:57:40 -07:00
samcake
6122155880
Renaming the PendingCHanges class to Transaction
2017-04-05 13:10:31 -07:00
kunalgosar
8749428ede
dont assume no query tags
2017-04-04 13:51:34 -07:00
Kunal Gosar
e5c075f107
fix typo and namespace
2017-04-04 11:54:58 -07:00
kunalgosar
8e4229b211
dont redirect people from webentity
2017-04-04 11:54:58 -07:00
kunalgosar
9d0667cb31
add url tag to web entities
2017-04-04 11:54:58 -07:00
kunalgosar
a0f0879087
added file type filter and interceptor
2017-04-04 11:54:21 -07:00
Stephen Birarda
c7a28a527a
cleanup Agent recording handling, make loadRecording async
2017-04-04 10:56:25 -07:00
Lexx
af95741a7e
Merge branch 'master' into 21224
2017-04-04 18:24:49 +01:00
Triplelexx
b4b5d4fe9b
resolve merge conflict
2017-04-04 18:15:12 +01:00
Triplelexx
01b13d7032
fix crash when pressing "Bookmark Avatar" button
...
also modified LocationBookmarks for consistency
2017-04-04 18:05:00 +01:00
Seth Alves
fbf2014f04
Merge pull request #10102 from vladest/tablet-ui-goto
...
Put current address to location instead of inputfield
2017-04-03 16:09:58 -07:00
Andrew Meadows
66ff551a7c
Merge pull request #10080 from ZappoMan/footActions
...
add foot IK targets as actions, map Kinect feet to foot targets
2017-04-03 12:06:14 -07:00
Seth Alves
43e1cec8a3
merge from upstream
2017-04-03 06:28:59 -07:00
Dante Ruiz
b10f491c6e
Merge branch 'master' of github.com:highfidelity/hifi into tablet-webView2.0
2017-04-01 00:58:37 +01:00
Dante Ruiz
d1bf3e4bf2
fixed webview mobile view
2017-04-01 00:58:09 +01:00
Chris Collins
b36f688a5a
Merge pull request #10089 from sethalves/tablet-ui-use-stylus-by-default
...
use tablet-ui stylus as default, rather than avatar finger
2017-03-31 15:34:37 -07:00
Seth Alves
54c66aff07
use tablet-ui stylus as default, rather than avatar finger
2017-03-31 13:18:40 -07:00
Vladyslav Stelmakhovskyi
7558765042
Script log now back to HUD
2017-03-31 14:20:15 +02:00
ZappoMan
53c439ffba
add foot IK targets as actions
2017-03-30 19:11:16 -07:00
Ryan Huffman
150dcd7dec
Merge remote-tracking branch 'upstream/master' into stable-merge
2017-03-30 14:22:27 -07:00
Triplelexx
aa9a2532a9
fix for displaying "Bookmark Avatar" dialog in tablet ui
2017-03-30 13:54:33 +01:00
Triplelexx
50e35a220b
Merge remote-tracking branch 'upstream/master' into 21224
2017-03-30 01:25:27 +01:00
Seth Alves
371df35013
remove code related to tablet being a model rather than an overlay. start on landscape mode
2017-03-29 14:16:14 -07:00
Delamare2112
2f6add3398
Expose LimitlessSpeechRecognition to scripts
2017-03-29 12:56:08 -07:00
Dante Ruiz
65be71fa69
min diff
2017-03-28 00:05:02 +01:00
Dante Ruiz
7434cc5644
force vto to false on start up
2017-03-28 00:02:02 +01:00
Triplelexx
dc64065668
Merge remote-tracking branch 'upstream/master' into 21224
...
update
2017-03-26 22:20:24 +01:00
Triplelexx
bda1d54209
create AvatarBookmarks
...
derive AvatarBookMarks and LocationBookmarks from Bookmarks, first pass
at integration, QML issues noted
2017-03-24 22:58:36 +00:00
Dante Ruiz
6178a86a46
Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-help
2017-03-24 23:56:33 +01:00
Seth Alves
902e3d41d6
merge from upstream
2017-03-24 08:20:35 -07:00
Brad Hefta-Gaub
9a38b36f59
Merge pull request #9970 from Triplelexx/21223
...
21223 - Quat functions have naming inconsistencies
2017-03-24 08:12:11 -07:00
Seth Alves
ff3fc244d1
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-23 09:50:53 -07:00
Dante Ruiz
e708c6478e
Merge branch 'tablet-popup' into tablet-help
2017-03-23 17:35:45 +01:00
Dante Ruiz
af97c7275e
Use loadQMlSource if no stack is aviable
2017-03-23 17:03:24 +01:00
Brad Davis
85c80f3be8
Merge remote-tracking branch 'upstream/master' into smarter_textures
...
Conflicts:
libraries/gpu/src/gpu/Texture.cpp
2017-03-22 14:25:23 -07:00
Dante Ruiz
3a89654111
saving work
2017-03-22 19:14:53 +01:00
Triplelexx
b7980569cc
change all references of IDENTITY_FRONT to IDENTITY_FORWARD
2017-03-21 22:13:33 +00:00
Seth Alves
91cac892d2
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-21 14:04:58 -07:00
Chris Collins
4c789c44aa
Merge pull request #9922 from birarda/bug/stuck-ess
...
fix a couple of ESS issues during ES/ESS restart
2017-03-21 12:44:53 -07:00
Seth Alves
cc4ddd1387
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-21 08:43:35 -08:00
Chris Collins
ea13151d55
Merge pull request #9945 from mnafees/21233
...
21233: Remove Scripts Editor option from Edit menu and all related files
2017-03-21 08:01:36 -07:00
Vladyslav Stelmakhovskyi
fb0adae0b1
Scripts debug window in Tablet UI
2017-03-21 15:04:38 +01:00
Brad Davis
e482eac437
Merge remote-tracking branch 'upstream/master' into smarter_textures
2017-03-20 16:22:13 -07:00
Vladyslav Stelmakhovskyi
cedc3cf8b6
Fix naming. Move variable instantiation within scope
2017-03-20 23:43:01 +01:00
Stephen Birarda
a4d72c4e67
make AudioScriptingInterface a Dependency
2017-03-20 13:40:15 -07:00
Vladyslav Stelmakhovskyi
13cd500c2e
Make runningscripts able to open even if there is no scripts running
2017-03-20 20:46:37 +01:00
Brad Hefta-Gaub
bc5d7d8698
Merge pull request #9851 from AndrewMeadows/simulation-ownership-2
...
zero velocity of deactivated dynamic entities
2017-03-20 10:20:11 -07:00
Brad Hefta-Gaub
af790d8474
Merge pull request #9875 from birarda/bug/spin-strafe
...
fix double snap turn strafing
2017-03-20 10:08:05 -07:00
Chris Collins
af2748410d
Merge pull request #9932 from Triplelexx/21231
...
21231 - Remove About Interface from File menu
2017-03-20 09:55:57 -07:00
Chris Collins
509057c6d8
Merge pull request #9941 from Triplelexx/21232
...
21232 - Remove Mini Mirror from View menu
2017-03-20 09:55:37 -07:00
Seth Alves
424af2255b
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-19 21:17:30 -08:00
Mohammed Nafees
3612b9fccc
Remove Edit > Scripts Editor and all related source files
2017-03-20 00:25:50 -04:00
Triplelexx
8e086a8fc8
fix build error
2017-03-18 03:51:55 +00:00
Triplelexx
a9b1a38665
remove Mini Mirror from View menu
...
Avatar inputs only contains the audio meter now.
2017-03-18 00:53:13 +00:00
Brad Hefta-Gaub
a75acd139b
Merge pull request #9885 from sethalves/model-scripting
...
Model scripting
2017-03-17 13:13:17 -07:00
Triplelexx
eba6c8de5e
remove About Interface from File menu
2017-03-17 17:37:19 +00:00
Atlante45
698791295a
Expose DriveKeys enum to JS
2017-03-16 20:03:27 -07:00
Atlante45
7517f224a8
Add MyAvatar drive keys capture capability
2017-03-16 15:44:17 -07:00
Seth Alves
693aee0628
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting
2017-03-15 16:54:40 -07:00
Vladyslav Stelmakhovskyi
856e15060d
Implemented Domain Connection statistics for Tablet UI
2017-03-15 21:05:13 +01:00
Seth Alves
b66ff19595
prefer-avatar-finger-over-stylus setting now defaults to true
2017-03-15 09:51:30 -08:00
Anthony Thibault
495deba771
Merge pull request #9877 from hyperlogic/bug-fix/debug-draw-races
...
Fixes for race conditions in DebugDraw
2017-03-15 10:38:26 -07:00
Seth Alves
c53b0dff93
Merge pull request #9891 from druiz17/tablet-xbox-fix
...
Allow the user to bring up the tablet when a message is open
2017-03-15 08:43:28 -08:00
Seth Alves
563d59bda9
Merge pull request #9886 from vladest/tablet-ui-entity-statistics
...
Tablet ui entity statistics
2017-03-15 08:40:52 -08:00
Seth Alves
b5919d89a5
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-03-15 08:26:10 -08:00
Dante Ruiz
45829574c2
Allow the user to bring up the tablet when a message is open in the tablet
2017-03-15 00:02:42 +01:00
samcake
e0f0cc2102
Fix the unsupported ktx format, it was coming from the BUmp map case
2017-03-14 15:49:44 -07:00
Stephen Birarda
1fe02477b0
fix LX behaviour in snap/advanced/basic
2017-03-14 14:21:21 -07:00
Seth Alves
e8a9ff867d
merge from upstream
2017-03-13 17:57:01 -07:00
Brad Davis
eab91d061d
Merge pull request #9868 from zzmp/ktx/local-not-roaming
...
Use Local for WIN32 FileCache
2017-03-13 15:52:11 -07:00
Anthony J. Thibault
efc7fbacb1
Bug fix for potential crash when getting DebugDraw::instance
...
(cherry picked from commit b0ad9a8110
2017-03-13 15:23:10 -07:00
Zach Pomerantz
808973d7d2
use QStandardPaths instead of hardcoded paths
2017-03-13 17:26:42 -04:00
Vladyslav Stelmakhovskyi
9e9c64021c
Merge branch 'tablet-ui' into tablet-ui-entity-statistics
2017-03-13 19:54:40 +01:00
Andrew Meadows
546f32431d
Merge pull request #9862 from ZappoMan/fadeInWhenOpeningNoiseGate
...
Various noise gate, scope, and audio stats improvements
2017-03-13 11:52:16 -07:00
Seth Alves
ffd4d1488c
Merge pull request #9866 from vladest/tablet-ui-lodtools
...
Fixed slider groove size calculation. Added LOD Tools to Tablet UI
2017-03-13 08:59:06 -08:00
Vladyslav Stelmakhovskyi
49055cfa5c
Some statistics showed
2017-03-13 16:31:29 +01:00
Seth Alves
b3003acb97
Merge pull request #9856 from druiz17/tablet-imporove-dialogs
...
Bring of menu window if tablet is closed on desktop
2017-03-12 12:20:29 -08:00
Vladyslav Stelmakhovskyi
81bc56f124
Fixed slider groove size calculation. Added LOD Tools to Tablet UI
2017-03-11 14:44:33 +01:00
Brad Hefta-Gaub
aa65f03509
fix mac warning and remove accidentally added whitespace
2017-03-10 18:14:00 -08:00
Brad Hefta-Gaub
7eb4b8f5f7
expose AudioScope to QML
2017-03-10 17:38:13 -08:00
Brad Hefta-Gaub
eaea718de1
add various scriping interfaces for managing the audio scope and detecting noise gate transitions
2017-03-10 17:08:19 -08:00
Anthony J. Thibault
07e10ae862
Merge branch 'tablet-ui' into feature/can-touch-this
2017-03-10 17:05:26 -08:00
Dante Ruiz
8a973dae3c
fixed bring menu dialogs in tablet
2017-03-10 23:21:29 +00:00
Dante Ruiz
9b3810814e
fiexed putting menu items on the hud when tablet not open when on desktop screen
2017-03-10 18:40:18 +00:00
Andrew Meadows
8ddcae2a15
restore transform of deactivated entities
2017-03-09 17:26:53 -08:00
Andrew Meadows
d4abdcb6c8
comments, namechange, and temporary debug code
2017-03-09 17:26:53 -08:00
Anthony J. Thibault
d8f04d90a7
Merge branch 'master' into feature/can-touch-this
2017-03-09 14:24:10 -08:00
druiz17
0069569e96
Merge branch 'tablet-ui' into 21197
2017-03-09 09:31:15 -08:00
druiz17
8750982567
Merge pull request #9785 from druiz17/menuFix
...
More dialog porting to tablet
2017-03-09 09:29:31 -08:00
Seth Alves
ae48dae96f
get rid of toggleTabletUI lockout period
2017-03-08 15:29:46 -08:00
David Rowe
950f91965d
Merge branch 'tablet-ui-edit-js' into 21197
2017-03-08 17:35:58 +13:00
Brad Hefta-Gaub
8ae6f2727d
add support for double click messages to overlays and entities
2017-03-07 17:52:55 -08:00
Vladyslav Stelmakhovskyi
a02807fb26
Merge branch 'menuFix' into menuFix_AssetServer
2017-03-07 21:07:53 +01:00
Anthony J. Thibault
b0ad9a8110
Bug fix for potential crash when getting DebugDraw::instance
2017-03-07 10:03:38 -08:00
Seth Alves
f594689fa8
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-03-07 09:24:50 -08:00
Dante Ruiz
10ce732e91
Merge branch 'master' into menuFix
2017-03-07 16:15:54 +00:00
David Rowe
51739f2f99
Remove Developer > Network > Bandwith Details dialog
2017-03-07 15:02:26 +13:00
Vladyslav Stelmakhovskyi
6d9e7de6dc
Implemented AssetBrowser in Tablet view
2017-03-06 21:45:55 +01:00
David Rowe
09ecb12510
Merge branch 'tablet-ui-edit-js' into 21197
...
# Conflicts:
# interface/src/ui/overlays/Web3DOverlay.cpp
2017-03-07 08:59:40 +13:00
Seth Alves
08e2e421e4
Merge branch '21199' of github.com:ctrlaltdavid/hifi into tablet-ui-edit-js
2017-03-06 11:08:27 -08:00
Seth Alves
4b02e550db
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-03-06 11:07:12 -08:00
Andrew Meadows
6ea6477c73
Merge pull request #9683 from jherico/cache_flush
...
Clear caches on domain switch
2017-03-06 11:05:44 -08:00
Seth Alves
93246b24b0
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-03-06 08:54:49 -08:00
Dante Ruiz
d5948079c7
Merge branch 'master' of github.com:highfidelity/hifi into menuFix
2017-03-06 16:29:37 +00:00
Anthony J. Thibault
e56f02d94f
Changed default for preferFingerOverStylus to false.
2017-03-03 14:12:04 -08:00
Anthony J. Thibault
45febe8565
Merge branch 'master' into feature/fingers-on-tablet
2017-03-03 09:04:43 -08:00
Dante Ruiz
f867f4e739
Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix
2017-03-03 15:40:41 +00:00
David Rowe
9384dfd89c
Merge branch 'tablet-ui-edit-js' into 21197
2017-03-03 18:05:18 +13:00
David Rowe
854292b193
Merge branch 'tablet-ui-edit-js' into 21199
2017-03-03 17:51:12 +13:00
Seth Alves
3b581a8dfe
merge from upstream
2017-03-02 16:35:44 -08:00
Seth Alves
10cb7aab06
Merge pull request #9684 from Menithal/parent-hotkey
...
WL#20856 Added Parenting Hotkeys to Edit.js Among Visual tweaks
2017-03-02 16:30:43 -08:00
David Rowe
b592205f7e
Fix OSX warning
2017-03-02 18:45:42 +13:00
Anthony J. Thibault
4f03c06a94
Added General Preference to control stylus vs finger usage
...
By default the finger is preferred over the stylus.
2017-03-01 18:07:53 -08:00
David Rowe
e445fe551f
Fix showing wrong version of dialog in desktop mode
2017-03-02 15:00:38 +13:00
David Rowe
b9869264ba
Display avatar settings dialog in tablet
2017-03-02 13:16:23 +13:00
Seth Alves
c2085ebb6e
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-02-28 13:33:51 -08:00
Dante Ruiz
d5714bfa6e
Merge branch 'master' into menuFix
2017-02-28 16:55:44 +00:00
Seth Alves
117be16c31
pull from upstream
2017-02-27 16:48:23 -08:00
Seth Alves
8110921abf
git rid of _mouseToOverlays until I remember why I thought I needed it
2017-02-27 11:11:04 -08:00
Ryan Huffman
5b59939195
Merge pull request #9602 from huffman/feat/shortbow-entity-server
...
Add shortbow to marketplace scripts
2017-02-27 11:09:52 -08:00
Dante Ruiz
19110ecfee
Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix
2017-02-27 16:00:08 +00:00
Seth Alves
34c5d480c4
Merge branch 'tablet-ui-tablet-is-overlay' of github.com:sethalves/hifi into tablet-ui-edit-js
2017-02-27 06:35:50 -08:00
Seth Alves
1864975c51
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-tablet-is-overlay
2017-02-27 06:35:22 -08:00
Seth Alves
a2f527b28a
Merge branch 'tablet-ui-tablet-is-overlay' of github.com:sethalves/hifi into tablet-ui-edit-js
2017-02-25 08:44:03 -08:00
Seth Alves
36bcaa8d0f
delete tablet overlays when switching domains
2017-02-25 08:43:06 -08:00
kunalgosar
d6c1f1c99a
Fixed Wed Entity not leaving Focus
2017-02-24 18:18:48 -08:00
Dante Ruiz
73c337efd0
Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix
2017-02-25 00:42:22 +00:00
Dante Ruiz
835b23832f
some modal clean up
2017-02-25 00:40:38 +00:00
Seth Alves
70060eb464
in 2d mode, clicks on tablet don't get used for other things
...
Conflicts:
scripts/system/libraries/entitySelectionTool.js
2017-02-24 11:37:04 -08:00
Seth Alves
e43c4c17f5
in 2d mode, clicks on tablet don't get used for other things
2017-02-23 21:27:25 -08:00
Seth Alves
ce717d04e9
merge in tablet-as-overlay code
2017-02-23 18:40:20 -08:00
Seth Alves
37004e4347
steps toward making mouse work on tablet
2017-02-23 08:11:31 -08:00
Dante Ruiz
93ae93a45a
Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix
2017-02-23 15:43:24 +00:00
Seth Alves
41ef7b8dbb
add setting to control if tablet is an entity or overlay
2017-02-22 21:13:42 -08:00
Dante Ruiz
3ba605bf23
saving work
2017-02-23 00:28:30 +00:00
Seth Alves
84b93826d0
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-02-22 09:30:16 -08:00
Seth Alves
1d446064be
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js
2017-02-22 08:23:36 -08:00
Seth Alves
3b181eb803
code review
2017-02-21 13:56:28 -08:00
Dante Ruiz
f58a018c64
fixing merge conflicts
2017-02-21 15:46:41 +00:00
Seth Alves
43f47c1106
merge from upstream
2017-02-20 12:45:39 -08:00
Menithal
d9f86612de
Fixed view toggle, Added new Notifications
...
- View Toggle now only toggles if no other modifiers are pressed
- More notification, and cases for notification
- Parenting to existing parent
- Unparenting when there is no parent
- Unparenting single entities
2017-02-19 20:18:11 +02:00
Seth Alves
ea03f41b57
Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid
2017-02-18 10:32:11 -08:00
Chris Collins
ec07969c0b
Merge pull request #9703 from kunalgosar/logDisplayMode
...
Logging HMD/Desktop Transitions
2017-02-17 17:07:02 -08:00
Seth Alves
def669364b
Merge branch 'master' of github.com:highfidelity/hifi into overlays-uuid
2017-02-17 15:45:19 -08:00
Seth Alves
d7bb6f105b
make tablet part IDs available through qApp
2017-02-17 15:43:20 -08:00
Dante Ruiz
3f8ea4ac54
fixed merge conflict
2017-02-17 23:33:39 +00:00
kunalgosar
b8b5927351
Logging display mode changes
2017-02-17 13:21:01 -08:00
Dante Ruiz
dedd85d296
saving work
2017-02-17 18:47:59 +00:00
Seth Alves
4c1f5c1dc8
Merge branch 'overlays-uuid' of github.com:sethalves/hifi into tablet-ui-edit-js
2017-02-17 09:58:58 -08:00
Dante Ruiz
80551cf0dd
Merge branch 'tablet-ui-edit-js' of github.com:sethalves/hifi into menuFix
2017-02-17 15:50:27 +00:00
Dante Ruiz
3189b44612
refreshing with master
2017-02-17 15:50:08 +00:00
Seth Alves
05c135b9d8
uuid keys for overlays appears to work
2017-02-16 21:22:23 -08:00
Seth Alves
c1e41311fc
working toward using uuids for overlay IDs
2017-02-16 17:18:09 -08:00
Dante Ruiz
628b97bfc6
fixed merge issues
2017-02-17 00:08:31 +00:00
Dante Ruiz
afd56bbbbe
fixed qml font path issue for desktop and tablet
2017-02-17 00:01:12 +00:00
Anthony J. Thibault
8ccca86dee
Settings for Tablet Becomes Toolbar
2017-02-16 15:57:36 -08:00
Seth Alves
21b0e45b0f
don't show keyboard in edit.js unless HMD is being worn
2017-02-16 09:56:50 -08:00
Dante Ruiz
7ad8a389f6
refreshing with master
2017-02-16 08:13:17 -08:00
Dante Ruiz
2a97ebb076
updating branch with master
2017-02-16 08:11:50 -08:00
Dante Ruiz
896f9d7181
refreshing with master
2017-02-16 15:58:26 +00:00
Brad Davis
127a014b46
Clear caches on domain switch
2017-02-15 15:21:08 -08:00
Dante Ruiz
485592751f
fixing merge changes
2017-02-15 15:38:22 +00:00
Dante Ruiz
22baab1359
updating branch with master
2017-02-15 15:24:08 +00:00
Anthony J. Thibault
5e25d073f3
WIP commit
2017-02-14 15:36:01 -08:00
David Rowe
625f5efdf8
Merge branch 'master' into 21164
...
# Conflicts:
# scripts/system/audio.js
2017-02-15 10:00:52 +13:00
Seth Alves
ba025d44e0
Merge pull request #9642 from AndrewMeadows/beware-humbletim
...
fix performance problem for invalid "avatarEntityData"
2017-02-14 06:33:48 -08:00
Atlante45
512bb4765f
Add entity clicks capture capabilities
2017-02-13 11:34:30 -08:00
David Rowe
a08347936e
Make clicking the tablet mic icon or audio bar toggle the mute state
2017-02-11 15:11:27 +13:00
Andrew Meadows
ee702f945f
cleanup around when to send identityPacket
2017-02-10 13:14:20 -08:00
Atlante45
3a30de79aa
CR
2017-02-09 13:04:43 -08:00
Atlante45
43d2501993
Add HMD friendly window for the ESS log
2017-02-09 13:04:43 -08:00
Atlante45
191121888c
Add log window to the ESS log
2017-02-09 13:04:43 -08:00
Atlante45
2962dd6dc2
Factor LogDialog
2017-02-09 13:04:43 -08:00
Seth Alves
9881dd261a
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting
2017-02-03 12:57:14 -08:00
Ryan Huffman
0cc137d26b
Remove unintentionally added fps + download profiling
2017-02-03 10:14:34 -08:00
Ryan Huffman
537f639d16
Revert "Update scriptengine update rate to match displayPlugin target framerate"
...
This reverts commit d5effc89776b0b2480db364f21384a245bdcd4f0.
2017-02-03 10:14:33 -08:00
Ryan Huffman
97719cd128
Update scriptengine update rate to match displayPlugin target framerate
2017-02-03 10:01:02 -08:00
Ryan Huffman
ce9f8bed1b
Remove duplicate fps/downloads PROFILE_COUNTER
2017-02-03 09:41:48 -08:00
Ryan Huffman
e181c2a16e
Add script_udpate_rate to trace
2017-02-03 09:19:03 -08:00
Ryan Huffman
f2638637f7
Add thread names to traces
2017-02-03 09:18:58 -08:00
Anthony J. Thibault
b44e5b5a1f
tablet-ui: preferences for tablet ui scaling
...
One for the tablet in HMD mode, one for desktop mode.
The default desktop mode scaling factor is now 75%, which should
reduce the size of the for users with low resolution monitors,
while still being somewhat readable.
2017-02-02 14:05:07 -08:00
Seth Alves
24510ee3fe
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting
2017-02-01 18:42:56 -08:00
Anthony J. Thibault
2760065ee1
Bug fix for previous commit
2017-02-01 13:51:31 -08:00
Anthony J. Thibault
9be6fe2192
tablet-ui: Fix for keyboard focus box still being visible sometimes
2017-02-01 13:44:12 -08:00
Anthony J. Thibault
ca79397ee8
tablet-ui: Fix for keyboard focus
...
Don't allow clicks on non-web entities from stealing focus away from web overlays.
2017-02-01 11:22:17 -08:00
Seth Alves
5131d1edf2
Merge branch 'master' of github.com:highfidelity/hifi into model-scripting
2017-01-31 09:22:16 -08:00
Seth Alves
7c2957cfa7
merge from upstream
2017-01-31 08:57:36 -08:00
Andrew Meadows
0809149a8c
harvest collision events before disowning
2017-01-30 13:21:23 -08:00
Seth Alves
541692c5ca
start on scripting interface to allow saving polyvox meshes to obj files
2017-01-28 15:38:18 -08:00
Seth Alves
fa61bbe2a6
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-26 18:21:39 -08:00
ZappoMan
3c3dcbbbaa
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-26 08:20:03 -08:00
Seth Alves
c317ba8054
merge from upstream
2017-01-25 15:57:53 -08:00
Atlante45
f540c94113
Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr
2017-01-25 13:06:49 -08:00
Anthony J. Thibault
584a9a3c98
UI navigation work with game pads
...
The tablet UI can be long lived, unlike the previous VRMenu.
So instead of using a dynamic mapping that was only enabled when the VRMenu was shown, standard_navigation.json.
standard_navigation is always active. Also, standard_navigation.json has been changed.
Left and Right click and stick events never become UINav events. Only Dpad A, B, X, Y, LB and RB are mapped to UINav events.
2017-01-23 15:22:49 -08:00
ZappoMan
29fff2e556
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-23 13:09:59 -08:00
Ryan Huffman
9b1cd52fb4
Add the ability to get the context that a script is running in
2017-01-23 08:58:01 -08:00
Atlante45
04e81c5db7
Fix interface build
2017-01-20 10:53:57 -08:00
Stephen Birarda
25bd6fa2c1
move recording interface to Agent/Application only
2017-01-20 10:27:08 -08:00
Seth Alves
c492319be2
merge from upstream
2017-01-20 10:14:11 -08:00
David Kelly
d9fbf832e2
Some initial analytics for PAL usage
2017-01-19 11:35:17 -08:00
Seth Alves
eb25e1c12d
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-19 09:41:49 -08:00
Brad Davis
1ef4ac9a6c
Additional trace details for GPU timing, frame data updates
2017-01-18 16:19:32 -08:00
Ryan Huffman
8137c59ef7
Add support for sending requests to entity script server
2017-01-18 11:15:29 -08:00
Dante Ruiz
baff07b0f9
controller with menus finally work
2017-01-18 07:41:25 -08:00
Dante Ruiz
9a61b6030b
tabletFocus update
2017-01-18 07:40:15 -08:00
Dante Ruiz
d3fa7651c9
some what working d-pad
2017-01-18 07:40:15 -08:00
dante ruiz
865a78a8c8
saving work
2017-01-18 07:40:14 -08:00
Seth Alves
b57803057d
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-18 06:38:44 -08:00
Stephen Birarda
1e04aebb8d
add --fast-hearbeat command line switch for 1s stats
2017-01-17 11:25:40 -08:00
Seth Alves
6bace4f451
merge from upstream
2017-01-17 09:29:30 -08:00
Seth Alves
f900629cdb
Merge pull request #9390 from sethalves/load-models-in-keyhole
...
fix physics not starting up when a model is close behind
2017-01-16 18:06:23 -08:00
Stephen Birarda
1993e358d6
Merge pull request #9318 from birarda/ovr-platform-entitlement
...
handle OVR Platform entitlement checks
2017-01-16 11:16:31 -08:00
Seth Alves
bd67715cd2
don't early-exit from the loop that checks for loaded collision hulls because the check is what causes the hulls to be constructed
2017-01-16 08:54:56 -08:00
Chris Collins
2557c797af
Merge pull request #9300 from zzmp/graphics/forward-opaque
...
Add opaques/skinned to forward rendering path
2017-01-16 08:48:18 -08:00
ZappoMan
c884b276e2
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-14 22:15:22 -08:00
Seth Alves
9de8144f0d
merge from upstream
2017-01-13 10:17:03 -08:00
Seth Alves
f9a36d68ad
Merge pull request #9363 from ctrlaltdavid/21127
...
Make Clara.io downloads convert textures to PNG
2017-01-13 10:14:43 -08:00
Seth Alves
481cc47f79
Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui
2017-01-13 09:28:18 -08:00
Seth Alves
208c4686c4
merge from upstream
2017-01-12 15:44:27 -08:00
Brad Davis
659badd8bf
Change minimum threadpool size 1
2017-01-12 14:43:31 -08:00
samcake
b9e8f7ee14
Merge pull request #9359 from jherico/cached_qml_surfaces
...
Eagerly cache QML surfaces for Web3D overlays
2017-01-12 14:28:35 -08:00
Brad Davis
2de83d42bc
Add process and system CPU usage to traces
2017-01-12 09:19:08 -08:00
David Rowe
8cd7e1b377
Improve user messages
2017-01-12 15:48:25 +13:00
Brad Davis
f235a52a6d
Eagerly cache QML surfaces for Web3D overlays to prevent stutter on loading the tablet
2017-01-11 14:21:29 -08:00
ZappoMan
5b76eaaf52
Merge branch 'master' of https://github.com/highfidelity/hifi into tuneAvatarInfo
2017-01-11 10:22:14 -08:00
Seth Alves
bacc796730
Merge branch 'master' of github.com:highfidelity/hifi into update-tablet-ui-again
2017-01-11 09:54:26 -08:00
