Sam Gateau
258f1654f2
Merge branch 'master' of https://github.com/highfidelity/hifi into hobbes
2017-07-12 14:14:27 +02:00
Tingjin
80916b62bb
Remove unnecessary code
...
Remove two lines of unnecessary code.
2017-07-11 20:52:28 -07:00
Seth Alves
c52e7e180a
use const AudioInjectorPointer& in some places
2017-07-11 19:42:03 -07:00
Seth Alves
dbd46fc4b8
Merge branch 'master' of github.com:highfidelity/hifi into audio-injector-smart-pointers
2017-07-11 17:48:29 -07:00
Dante Ruiz
bedd0628b9
allowed tablet to toggle when a dialog is open
2017-07-12 00:51:07 +01:00
Zach Fox
d786820670
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-07-11 16:16:37 -07:00
Andrew Meadows
782155e9ea
Merge pull request #10876 from Atlante45/fix/ac-crash
...
Fix AC crash (buffer overflow)
2017-07-11 14:26:08 -07:00
Seth Alves
ead461dca7
Merge branch 'master' of github.com:highfidelity/hifi into audio-injector-smart-pointers
2017-07-11 14:25:12 -07:00
Seth Alves
3670a04d8e
switch bare pointers to AudioInjector objects to be QSharedPointers
2017-07-11 14:24:58 -07:00
Dante Ruiz
2f192fd48a
added scroll fix for qt 5.6
2017-07-11 21:19:06 +01:00
Dante Ruiz
01ca192613
fixed tablet scrolling
2017-07-11 21:16:13 +01:00
Olivier Prat
7552cca316
First alpha version of bubble collision fade events. Missing a lot of information.
2017-07-11 19:26:15 +02:00
NeetBhagat
e08e9d6821
The current scale of avatar should not be more than domain's max_avatar_scale and not less than domain's min_avatar_scale.
2017-07-11 20:42:00 +05:30
Olivier Prat
381e0c64a8
Working avatar fade in / fade out except that it is also triggered on bubble collisions
2017-07-11 16:43:27 +02:00
NeetBhagat
1a47383d4f
Merge branch 'master' into 5783-Restarting-Interface-allows-you-to-have-Avatar-Scale-Too-Big
2017-07-11 19:23:46 +05:30
Sam Gateau
1f2f539507
Merge branch 'orange' of https://github.com/samcake/hifi into hobbes
2017-07-11 10:26:26 +02:00
David Kelly
fcf4bfd59a
spacing issue
2017-07-10 13:25:33 -07:00
David Kelly
b87d69b15d
Insure spectator camera preview is up when reopening tablet
2017-07-10 13:16:08 -07:00
Seth Alves
d957b970dd
Merge pull request #10918 from misslivirose/feat-add-skeleton-changed-signal
...
Add signal for avatar skeleton changing
2017-07-10 11:35:24 -07:00
David Kelly
4843b91f47
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-07-10 09:50:17 -07:00
Andrew Meadows
96b88dccd7
Merge pull request #10913 from samcake/orange
...
Introducing the Stages to the render::Scene, Better scene update phase and getting away from the singleton model
2017-07-10 09:46:09 -07:00
Sam Gateau
746812ff78
Merging with origin orange
2017-07-10 17:25:13 +02:00
NeetBhagat
378e85e9b2
Merge branch 'master' into 5783-Restarting-Interface-allows-you-to-have-Avatar-Scale-Too-Big
2017-07-10 18:29:04 +05:30
NeetBhagat
dd2dbd9b39
Initial Commit to resolve problem :> When Max Avatar scale is set in Sandbox -> setting, take that value as default max value
2017-07-10 18:26:33 +05:30
Sam Gateau
4edea433ce
Rename the _pipeline into _shapePipeline in the render::Args
2017-07-10 12:16:53 +02:00
Brad Davis
8043caa9e9
Merge pull request #10925 from jherico/overlay_performance
...
Fix terrible script performance when rendering load is too high
2017-07-08 14:19:14 -07:00
Brad Davis
cd11f5cfa6
More tweaks for improved script performance
2017-07-07 22:02:56 -07:00
Brad Davis
148eece065
Tweak frame timing to avoid overloading the main thread
2017-07-07 21:00:33 -07:00
Brad Davis
7e9ea596a0
Add more efficient overlay getters, don't use blocking calls
2017-07-07 21:00:31 -07:00
Zach Fox
d0c521d7b4
Add clarifying comment.
2017-07-07 19:19:48 -07:00
Stephen Birarda
420e9233b6
Revert "fix for invisible avatars after radius ignore"
2017-07-07 16:50:28 -07:00
Stephen Birarda
f07ce6d294
Merge pull request #10835 from birarda/bug/invisible-avatars
...
fix for invisible avatars after radius ignore
2017-07-07 16:06:44 -07:00
Zach Fox
e537c494e5
Prevent Image3DOverlays from drifting
2017-07-07 16:04:08 -07:00
Zach Fox
dbb48cd1aa
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-07-07 16:03:04 -07:00
Zach Fox
3d14d3755e
Merge pull request #10898 from 1P-Cusack/21425
...
Add View->Enter First Person Mode in HMD checkbox.
2017-07-07 14:01:36 -07:00
Andrew Meadows
57842ce5a5
Merge pull request #10878 from mnafees/21355
...
CR for Job #21355 - Clean up and remove menu hotkeys
2017-07-07 14:01:21 -07:00
1P-Cusack
77001712ab
Default 'Enter First Person Mode in HMD' to true.
2017-07-07 15:35:32 -04:00
Liv
060e3a9c5a
Add signal for avatar skeleton changing
2017-07-07 11:48:12 -07:00
Olivier Prat
06d69d04c3
TransitionStage + FadeJob compiling but not linked to entity events
2017-07-07 18:22:11 +02:00
Seth Alves
81cc46beb4
Merge pull request #10909 from jherico/overlay_crashes
...
Fixing overlay crashes, for real
2017-07-07 07:11:52 -07:00
Sam Gateau
d15c4ea2d3
Merging with the stage branch
2017-07-07 15:12:40 +02:00
Sam Gateau
156c20d01e
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-07-07 10:58:05 +02:00
NeetBhagat
685b1c2445
Merge branch 'master' into 5783-Restarting-Interface-allows-you-to-have-Avatar-Scale-Too-Big
2017-07-07 11:30:54 +05:30
Brad Davis
f8b76d65ab
Fixing overlay crashes, for real
2017-07-06 18:01:26 -07:00
druiz17
b4182fe7ac
Merge pull request #10899 from druiz17/calibration-update-2.0
...
Updates to the Calibration UI
2017-07-06 14:24:45 -07:00
Clément Brisset
34e3f56002
Merge pull request #10843 from birarda/bug/user-activities-interface-only
...
disable user activity logger in DS/AC/ac-client
2017-07-06 14:01:49 -07:00
LaShonda Hopper
85111131da
[Worklist #21420 ] Resolves issue where domain changes didn't refresh the icon (details below).
...
* Adds a local message/event: "Toolbar-DomainChanged"
** This message is sent by the application via its registered domain handlers:
*** hostnameChanged
*** connectedToDomain
*** disconnectedFromDomain
* edit.js subscribes to the "Toolbar-DomainChanged" event and updates the Create
button icon as long as there's a valid known valid create button.
Item Ticket Link: https://worklist.net/21420
Changes to be committed:
modified: interface/src/Application.cpp
modified: scripts/system/edit.js
2017-07-06 15:27:15 -04:00
Dante Ruiz
9e4b5693c7
fixed merge conflicts
2017-07-06 18:49:46 +01:00
anshuman64
e384f6d1b7
Merge pull request #10866 from druiz17/vive-in-desktop
...
Allowing Vive controllers and trackers to be used in desktop mode
2017-07-06 10:40:56 -07:00
Stephen Birarda
916f57772b
default the UAL off for all targets, enable manually for Interface
2017-07-06 10:21:07 -07:00
Zach Fox
ee86638c4e
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-07-06 09:58:00 -07:00
David Kelly
1ccf0da7d8
Merge pull request #10897 from davidkelly/dk/cacheSwitchFix
...
redo cache switch
2017-07-06 09:53:01 -07:00
Andrew Meadows
4fad9d9b1a
Merge pull request #10858 from jherico/trace_cores
...
Additional threaded tracing of CPU cores
2017-07-06 08:23:21 -07:00
Olivier Prat
018c0489f4
Merged with 21378
2017-07-06 16:53:47 +02:00
Sam Gateau
53ffca796f
Drafting a better SHape plumber to render the items
2017-07-06 16:35:40 +02:00
David Kelly
936c21e849
remove unnecessary cacheDir member
2017-07-06 07:24:58 -07:00
David Rowe
cfd155c198
Merge branch 'master' into 21418
2017-07-06 16:56:10 +12:00
Atlante45
95abbd0ad4
Prevent Interface from trying to send packets bigger than an MTU
2017-07-05 17:08:04 -07:00
David Kelly
4a22fbca1b
redo cache switch
2017-07-05 17:01:31 -07:00
Brad Davis
7f1bc07d04
Trying to fix overlay crashes again
2017-07-05 14:30:01 -07:00
David Kelly
89c05244bf
remove unnecessary extra update() calls
2017-07-05 13:24:31 -07:00
David Kelly
85813ac908
render issue fixes
2017-07-05 11:29:34 -07:00
Dante Ruiz
b86a8b8338
Merge branch 'master' of github.com:highfidelity/hifi into vive-in-desktop
2017-07-05 18:27:33 +01:00
Zach Fox
44cb48b17d
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-07-05 09:59:57 -07:00
NeetBhagat
440b941730
Merge branch 'master' into 5783-Restarting-Interface-allows-you-to-have-Avatar-Scale-Too-Big
2017-07-05 18:47:13 +05:30
Mohammed Nafees
eb354a4333
Cleanup menu shortcut keys
2017-07-05 14:50:48 +05:30
Olivier Prat
5cee2cff9f
Merge branch 'master' of git://github.com/highfidelity/hifi into 21378
2017-07-04 17:48:07 +02:00
Seth Alves
fad686571a
Merge pull request #10874 from jherico/overlay_mutex
...
Restore mutex in overlay interface
2017-07-03 17:25:42 -07:00
Zach Fox
fcc131187d
Merge pull request #10856 from zfox23/spectatorCamera_positionSpeedup
...
Spectator Camera position/orientation update speedup
2017-07-03 16:44:12 -07:00
David Kelly
36467983d8
cr stuff
2017-07-03 16:29:26 -07:00
David Kelly
2a3b4b3bfb
minor cleanup, and adjusted includes per austin's suggestion
2017-07-03 15:54:54 -07:00
David Kelly
99bf100ff8
fix for jitter and not rendering in tablet
2017-07-03 15:19:04 -07:00
Brad Davis
97edbb7f37
Restore mutex in overlay interface
2017-07-03 14:49:57 -07:00
David Kelly
5f015ec77f
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/spectatorCameraPreview
2017-07-03 13:57:25 -07:00
David Kelly
045b009b00
Merge branch 'dk/spectatorCameraPreview' of https://github.com/davidkelly/hifi into dk/spectatorCameraPreview
2017-07-03 13:57:05 -07:00
Brad Davis
6c86c297cb
Don't use a blocking connection for a high-frequency function like editOvleray
2017-07-03 12:40:52 -07:00
1P-Cusack
38baeabbe5
Add View->Enter First Person Mode in HMD checkbox.
...
When checked, changing to an HMD display will switch the user to first
person mode. WL 21425.
2017-07-03 15:21:40 -04:00
Zach Fox
9c96cf811e
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into spectatorCamera_positionSpeedup
2017-07-03 10:33:55 -07:00
Zach Fox
9411c2e732
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-07-03 10:24:02 -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
Olivier Prat
d9a83539b2
Merged with master
2017-07-03 15:32:30 +02:00
David Kelly
073eae39b2
timer now resumes when visible again
2017-06-30 18:44:32 -07:00
Dante Ruiz
6f30cb1825
Merge branch 'master' of github.com:highfidelity/hifi into vive-in-desktop
2017-07-01 00:48:49 +01:00
David Rowe
07697c5083
Merge branch 'master' into 21418
...
# Conflicts:
# interface/resources/qml/hifi/dialogs/GeneralPreferencesDialog.qml
# interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml
Removed stray "Vive Controller Picks" configuration item which no longer exists.
2017-07-01 11:19:00 +12:00
David Kelly
455233dc16
black background when camera is off
2017-06-30 16:08:40 -07:00
Dante Ruiz
577969481d
head puck working
2017-06-30 23:43:12 +01:00
Zach Fox
7851c8002f
Remove unnecessary guard
2017-06-30 15:25:33 -07:00
Zach Fox
36dfff78e2
Emit qDebug() error when trying to change position or orientation while attachedEntityId is defined
2017-06-30 15:13:31 -07:00
Ryan Downe Karpf
ddce264dd9
Merge pull request #10819 from Menithal/21387
...
WL21387 - Avatar Bookmarks now save Attachment Data and scale PR#2
2017-06-30 14:57:04 -07: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
David Kelly
133af0b522
jittery, still not working in tablet
2017-06-30 12:55:11 -07:00
Brad Davis
6fc82bb351
Switch to preprocessor macro for blocking invokes to capture function information
2017-06-30 11:36:24 -07:00
Zach Fox
f765b4136d
Cleanup
2017-06-30 10:12:47 -07:00
Zach Fox
5ceb80b3e7
It's working!
2017-06-30 10:12:46 -07:00
Zach Fox
8d89ea75f5
Initial commit
2017-06-30 10:12:46 -07:00
Brad Davis
8372d73fec
Additional thread safety
2017-06-30 09:15:06 -07:00
NeetBhagat
5ff0bc409b
solve the bug : Avatar scale value should be 3.0 ,if user has set scale value > 3.0 previously .
2017-06-30 15:40:38 +05:30
Brad Davis
b52dd7b822
Don't use blocking connections on the main thread
2017-06-29 20:45:17 -07:00
Menithal
bf0a8e0f91
Updated Comment
2017-06-29 23:18:52 +03:00
Brad Davis
8ec20ef042
Additional tracing of CPU cores
2017-06-29 13:16:15 -07:00
David Kelly
02b712716b
testing some rendering issues...
2017-06-29 11:12:10 -07:00
Zach Fox
00966966df
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-06-29 10:13:11 -07:00
Zach Fox
3170bdd08c
Merge pull request #10837 from samcake/flash
...
Fix projection & lighting issues identified with 2nd rendering pipeline
2017-06-29 10:12:03 -07:00
Sam Gateau
ca7e782566
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-29 10:54:27 +02:00
Sam Gateau
b766c256db
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-06-29 10:29:05 +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
howard-stearns
3293b4c898
Merge branch 'master' of https://github.com/highfidelity/hifi into merge-from-master-6-28-2pm
2017-06-28 13:53:32 -07:00
Patrick Manalich
cb52122726
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into spectator-camera_clean-up
2017-06-28 12:40:36 -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
Sam Gateau
93963b3257
Apply the projection and deferred transform fixes found while working on spectator camera
2017-06-28 15:44:17 +02:00
Sam Gateau
37e5454421
Fix lighting issues identified with 2nd rendering pipeline
2017-06-28 15:12:20 +02: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
Menithal
ffd9ee2908
More appeasement of GNU C Compiler warnings
2017-06-28 07:09:15 +03: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
Stephen Birarda
9e822de196
remove local collection of radius ignored nodes
2017-06-27 17:41:07 -07:00
Menithal
24616f150f
Appeasing the Linux gods
2017-06-28 00:37:18 +03:00
Patrick Manalich
6d0b853668
Comment structure changes for compacting
2017-06-27 14:34:01 -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
David Kelly
564d935065
Merge branch 'master' of https://github.com/highfidelity/hifi into dk/cacheSwitch
2017-06-26 13:32:02 -07:00
Menithal
0a0e40e182
Removed Redudant qualification from heade:>r
2017-06-26 23:04:48 +03:00
Menithal
232382e6d0
21387: Fixed issue with av scaling via script
2017-06-26 19:52:11 +03: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
31714675c3
Remove unused Sixense preference and associated methods
2017-06-26 16:14:57 +12:00
David Rowe
bed0e8ef87
Merge branch 'master' into 21396
...
# Conflicts:
# interface/src/avatar/MySkeletonModel.cpp
2017-06-26 12:07:25 +12:00
Menithal
359642eb0e
Refining and allowing for Avatar Scale to be saved as well
2017-06-25 23:55:47 +03:00
Menithal
d43d8ae846
Removed Old Comments
2017-06-25 22:01:14 +03:00
Menithal
f811971a42
Avatar Bookmarking
2017-06-25 21:57:07 +03:00
Seth Alves
9ae390853c
Merge pull request #10814 from jherico/linux_fix_static_plugins
...
Fix static plugin initialization on Linux
2017-06-25 08:17:16 -07:00
anshuman64
8d5bdd2d84
Merge pull request #10730 from hyperlogic/feature/pole-vector
...
Pole vector support for elbow and knee joints
2017-06-24 23:08:22 -07: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
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
David Kelly
bda50af780
this uses qt's test location for AppData/Local, but leaves Roaming alone
2017-06-23 11:06:48 -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 Kelly
04160f2ca1
switch to change ktx_cache directory (only)
2017-06-23 09:19:41 -07:00
humbletim
35f27313ba
persist command history to data folder; fix warning message color
2017-06-23 12:05:44 -04:00
David Kelly
63279f4525
Merge pull request #10790 from davidkelly/dk/scriptsSwitch
...
Command line switch to override default scripts location
2017-06-23 08:53:40 -07:00
druiz17
91ce9235ea
Merge pull request #10747 from zzmp/audio/select-log
...
Log audio selections
2017-06-23 07:54:03 -07:00
Zach Pomerantz
a82cc0ec09
retab
2017-06-23 09:35:48 -04: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
06d1ac8bf7
Merge remote-tracking branch 'upstream/master' into dk/scriptsSwitch
2017-06-22 14:14:54 -07:00
David Kelly
ff5b37c785
new --scripts switch overrides default scripts location
2017-06-22 14:09:05 -07:00
Andrew Meadows
62e862fef0
Merge pull request #10733 from Menithal/21384
...
21384: Added Support to Disabling flight from client side
2017-06-22 13:38:01 -07:00
Anthony J. Thibault
79d9bbe6c5
Merge branch 'master' into feature/pole-vector
2017-06-22 13:37:55 -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
c54a5d8506
Tidying
2017-06-22 23:32:16 +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
Anthony J. Thibault
2dcca2125b
Merge branch 'master' into feature/pole-vector
2017-06-21 15:50:03 -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
Anthony Thibault
a12109ed26
Merge pull request #10761 from hyperlogic/bug-fix/avatar-no-eyes
...
Bug Fixes for Eyeless Avatars
2017-06-21 10:59:55 -07:00
David Kelly
f30b12fca6
still doesn't work, pushing just to save it
2017-06-21 10:28:18 -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
Howard Stearns
ac1d4d9636
Merge branch 'master' of https://github.com/highfidelity/hifi into event-installer-interface-options
2017-06-20 17:57:12 -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
Zach Pomerantz
8e1cf763e3
Merge pull request #10756 from zzmp/audio/input-level
...
Update chrome for the audio input level meter
2017-06-20 15:33:17 -07:00
Zach Pomerantz
7e84f67391
Merge pull request #10744 from zzmp/audio/output-sample
...
Add "Play sample sound" to audio setting
2017-06-20 15:32:57 -07:00
David Kelly
06b59fe13e
still broken, but added initial cut of GLsync stuff
2017-06-20 15:02:05 -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
Zach Pomerantz
f55d842fac
add SoundCache to tablet for PlaySampleSound
2017-06-20 12:16:08 -07:00
Matti Lahtinen
256484cd21
Removed Whitespace
2017-06-20 21:44:32 +03:00
Zach Pomerantz
8436d0cc6b
rm unused AvatarInputs props
2017-06-20 11:43:02 -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
Anthony J. Thibault
29e3af820b
Fix for avatars with no eyes.
...
The calculation of the centerEyeCalibration matrix (and several others) were incorrect.
2017-06-20 10:14: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
Anthony J. Thibault
21c0e45d87
recenter rotation while driving.
...
This should reduce foot sliding in HMD mode.
2017-06-20 09:43:38 -07:00
Dante Ruiz
13dff29bd5
adding calibration screen
2017-06-20 01:19:10 +01:00
Zach Pomerantz
497ee3a522
add Audio.inputLevel
2017-06-19 17:07:43 -07:00
Zach Pomerantz
4bff925506
rm unused bools
2017-06-19 17:01:39 -07:00
Anthony J. Thibault
c236afe68c
Simplify passing data from MySkeletonModel to Rig
2017-06-19 16:54:39 -07:00
Zach Pomerantz
3d80774317
clean up select_audio_device
2017-06-19 15:57:24 -07:00
samcake
653ce89e08
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-19 15:48:46 -07:00
Zach Pomerantz
837f37220a
log selected_audio_device
2017-06-19 15:11:02 -07:00
Zach Pomerantz
5f236bd025
simplify device settings
2017-06-19 15:11:02 -07:00
Zach Pomerantz
5c0e9e7496
improve wording for MyAvatar.qmlPosition doc
2017-06-19 14:52:32 -07:00
David Kelly
b4c75c3f87
working, except tablet issue
2017-06-19 14:41:42 -07:00
Zach Pomerantz
a7e1b75909
stopgap with MyAvatar.qmlPosition
2017-06-19 14:41:01 -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
2e215e6544
Fix build problems
2017-06-19 14:04:51 -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
Matti Lahtinen
82df64d5e7
flyingAllowed to zoneAllowsFlying
2017-06-19 21:44:43 +03:00
Olivier Prat
0211338657
Put back test if not physics enabled in entity items should fade function as it gives too many undesired refades
2017-06-19 20:38:47 +02:00
Seth Alves
39fb94d76d
fix bug that causes hmd avatar eyes to be all the way to the side when there's not another avatar to look at
2017-06-19 11:21:08 -07:00
Zach Fox
08eb07242d
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-06-19 10:31:31 -07:00
samcake
ebc4745df0
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-19 09:27:35 -07:00
Olivier Prat
21276a85ad
Merge branch 'master' of git://github.com/highfidelity/hifi into 21378
2017-06-19 18:20:03 +02:00
Olivier Prat
b6b1875dd3
Disabled check on enabled physics when deciding is fade is adequate
2017-06-19 18:19:54 +02:00
Vladyslav Stelmakhovskyi
59a77c16bd
Cleanup
2017-06-18 20:59:22 +02:00
Matti Lahtinen
600a39c9b2
Fixed Zone overriding Client.
2017-06-18 13:14:01 +03:00
Vladyslav Stelmakhovskyi
f34faa3ee7
Fix backward compatibility with Qt 5.6
2017-06-18 10:54:59 +02:00
Vladyslav Stelmakhovskyi
a1475bc65f
Forgot if statement
2017-06-17 23:02:52 +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
David Kelly
c7e4649ec2
add override to avoid warnings in ubuntu/mac
2017-06-17 13:15:22 -07: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
Zach Fox
416ebaa2e8
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-06-16 10:08:10 -07:00
David Kelly
9b5b99c2b9
not as buggy. Still need ogl work, major cleanup, etc...
2017-06-16 08:59:57 -07:00
David Kelly
6d64261e94
working but often the spectator camera texture is not right.
2017-06-16 08:40:18 -07: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
David Kelly
3d922f5db6
works, sorta, but blinks like crazy, cursor gets f-ed up...
2017-06-15 14:17:43 -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
47e5fb56d3
Show MyAvatar's head in the SpectatorCamera view!
2017-06-15 11:31:20 -07:00
Zach Fox
60549075dd
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-06-15 10:09:07 -07:00
ZappoMan
d352163d77
fix no audio device from previously removed audio device
2017-06-15 09:24:14 -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
druiz17
347f020b04
Merge pull request #10692 from jherico/fix_tablet_crash
...
Fix crash on exit when tablet is open
2017-06-15 08:15:02 -07:00
NeetBhagat
a6b1b17d45
Merge branch 'master' into 21369
2017-06-15 11:04:22 +05:30
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
David Rowe
16bebdd409
Rename identifiers
2017-06-15 09:20:55 +12:00
David Rowe
55e0082792
Code review
2017-06-15 09:10:08 +12:00
Brad Davis
7a6df850c5
Fix crash on exit when tablet is open
2017-06-14 13:22:53 -07:00
Menithal
112f186304
Added minor Comments
2017-06-14 22:24:18 +03:00
Zach Fox
8a217acd2b
Defaults for camera projection parameters
2017-06-14 12:19:38 -07:00
Zach Fox
03c61e2191
vFoV and clipping plane distances now come from config
2017-06-14 11:53:05 -07:00
Zach Fox
ec3b488897
Remove SECONDARY_CAMERA_RENDER_MODE for now
2017-06-14 10:27:08 -07:00
Menithal
a1c2f71f30
Added couple of state getters
...
This allow scripts to check if avatar is flying or if the avatar is in
air (but not flying). Both of these allows one to distinguish if the
avatar is flying or falling or just jumping with Velocity
2017-06-14 20:19:04 +03:00
Menithal
66d43b80e2
Added getters for State if in Air or Flying
2017-06-14 19:53:08 +03:00
Menithal
c92e22fd20
21384: Added Menu Option
2017-06-14 19:05:00 +03:00
Menithal
53fe5736d8
21384: Initial Disable Flying
2017-06-14 18:24:45 +03:00
Zach Pomerantz
969582c23d
clean audio device names
2017-06-14 09:04:22 -04: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
David Rowe
be2bcb1c13
Turn with head roll in HMD when walking or flying
2017-06-14 12:20:46 +12:00
David Rowe
05f19d54f4
Add HMD roll control JavaScript API
2017-06-14 11:55:04 +12: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
79563b7d83
fix header on AudioDevices.h
2017-06-13 14:55:20 -04:00
Zach Pomerantz
9b131ee4af
rm old AudioDevice interface
2017-06-13 14:55:10 -04:00
Zach Pomerantz
4a39798a97
sticky audio selection
2017-06-13 14:38:52 -04:00
Zach Fox
7b6033f7bc
Getting closer to a solution
2017-06-13 11:37:27 -07:00
NeetBhagat
9646eba873
Complete console.trace and added a testcases for all 13 functions.
2017-06-13 23:52:48 +05:30
Zach Fox
4acbb81413
Checkpoint
2017-06-13 10:22:48 -07:00
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
Brad Davis
db8bdbc0a6
Merge pull request #10659 from samcake/orange
...
simple Render Engine refactors coming from the Spectator Cam project
2017-06-12 20:31:07 -07:00
Seth Alves
aeaddd23c7
Merge pull request #10658 from seefo/fb5087
...
Resolved FB5087
2017-06-12 17:25:05 -07:00
Zach Pomerantz
7d3bf75f0b
wip: sticky devices
2017-06-12 18:48:26 -04:00
Zach Pomerantz
b5dab39f83
sticky mic meter / noise reduction
2017-06-12 18:41:32 -04:00
Zach Pomerantz
8dac83d3fe
add reverb to qml Audio
2017-06-12 18:11:08 -04:00
Zach Pomerantz
b37a0239b0
up to reverb (needs cherry-picking)
2017-06-12 18:00:52 -04:00
Dante Ruiz
e4e261287a
Merge branch 'master' of github.com:highfidelity/hifi into controller-ui
2017-06-12 22:01:57 +01:00
Andrew Meadows
321e307c9f
Merge pull request #10609 from 1P-Cusack/21317
...
WL21317 helper functions for getting into avatar coordinate space
2017-06-12 11:18:29 -07:00
seefo
cb5a114145
Fixed Ubuntu warning
2017-06-12 10:47:55 -07: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
Chris Collins
4b6c13bc1f
Merge pull request #10646 from ZappoMan/debugAudioProblems
...
Fix for no-audio on clean install
2017-06-10 11:32:42 -10:00
samcake
bb38938534
Merge branch 'master' of https://github.com/highfidelity/hifi into orange
2017-06-09 14:34:25 -07:00
ZappoMan
6fe20f90a3
add better debugging for audio problems
...
use OS default device if settings have no values
2017-06-09 13:36:12 -07:00
seefo
0343d4e443
Resolved FB5087
2017-06-09 13:33:46 -07:00
Seth Alves
3f425a5f02
Merge pull request #10649 from sethalves/fix-head-puck-broken-eyes
...
Fix head puck broken eyes
2017-06-09 12:50:53 -07:00
Zach Fox
fd50434d86
New camera model; Cleanup; Bashing head :against desk
2017-06-09 11:42:16 -07:00
Zach Fox
5114fd8e1f
Rename correctly?
2017-06-09 11:39:28 -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
Zach Fox
12e5fc20f7
Merge pull request #10653 from samcake/flash
...
Spectator-camera : Provide a way to render the side camera always mono
2017-06-09 11:34:37 -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
seefo
dc02e34782
Resolved FB#5009
2017-06-09 10:23:53 -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
Chris Howe
08d93173f0
Minor code feedback changes, moving test scripts to developer/tests.
2017-06-09 11:07:56 -04:00
NeetBhagat
c5d8268007
Merge branch 'master' of https://github.com/highfidelity/hifi into 21369
2017-06-09 18:04:34 +05:30
samcake
4c8eec4e16
Introducing a way to prevent a frame to render in stereo accross batches
2017-06-08 17:38:26 -07:00
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
howard-stearns
9cf027a68c
pr feedback
2017-06-07 16:44:13 -07:00
howard-stearns
fa74daf875
Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor
2017-06-07 16:43:25 -07:00
howard-stearns
51982b1294
display textures in plugins
2017-06-07 14:39:18 -07:00
Seth Alves
69520ff3db
pull from upstream, code review
2017-06-07 10:28:02 -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
David Kelly
06527ac0a2
Merge pull request #10611 from davidkelly/dk/4873
...
protect _text member of Text3DOverlay with mutex
2017-06-06 16:50:57 -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
d416464b62
add Audio to tablet context
2017-06-06 17:55:19 -04:00
Zach Pomerantz
67288528da
add Audio.context
2017-06-06 17:55:06 -04: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
Chris Howe
8166fec0e0
Minor changes based on code review feedback
...
See https://worklist.net/21317 ,
https://github.com/highfidelity/hifi/pull/10609 and
https://github.com/highfidelity/hifi/pull/10609#pullrequestreview-42090197
2017-06-06 12:11:57 -04:00
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
NeetBhagat
e79fd9c5cb
Merge branch 'master' into 21369
2017-06-06 15:26:40 +05:30
NeetBhagat
0f9cd5d0c7
intial commit hifi: #21369 Implement parts of the JS "console" object
2017-06-06 15:20:08 +05:30
Howard Stearns
3de243b093
Include the radius of the sphere at the avatar's feet.
2017-06-05 18:48:11 -07:00
Seth Alves
20c9228050
Merge branch 'head-controller' of github.com:sethalves/hifi into head-controller
2017-06-05 15:53:23 -07:00
Seth Alves
7a276f027f
fix orientation used for 3d audio
2017-06-05 15:53:01 -07:00
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
Zach Pomerantz
d8815d1dce
prep audio menu
2017-06-05 16:24:00 -04:00
Zach Pomerantz
7cb38d22c3
fix AudioBuffers to work in tablet
2017-06-05 15:06:47 -04:00
Zach Pomerantz
9395de1873
add nop notify signals to Audio(Devices)
2017-06-05 14:57:44 -04:00
Seth Alves
3ab67cf27e
fix forward gaze in HMD while not looking at anyone
2017-06-05 11:44:27 -07:00
howard-stearns
4ccfef9702
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into spectator-camera-prototype
2017-06-05 11:18:40 -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
Seth Alves
27669d44a7
in deriveBodyFromHMDSensor, avoid using invalid head pose
2017-06-05 08:58:40 -07:00
Howard Stearns
ca526e0776
git rid of a lambda
2017-06-05 07:11:25 -07:00
Howard Stearns
05f41fb4f8
cleanup
2017-06-04 08:13:12 -07:00
Howard Stearns
a0ea306aed
cleanup, and include missing allowBackface parameter
2017-06-04 07:55:23 -07:00
Howard Stearns
fd01258c76
cleanup
2017-06-03 16:02:58 -07:00
Howard Stearns
02c46080f7
we don't need to force, but we do need some extra room for confined spaces
2017-06-03 15:43:14 -07:00
Howard Stearns
c48b729527
Merge branch 'master' of https://github.com/highfidelity/hifi into do-not-get-stuck-in-floor
2017-06-02 18:05:20 -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
David Kelly
12cbc206d2
cr feedback
2017-06-02 15:59:15 -07:00
Clément Brisset
c636922a5d
Merge pull request #10590 from huffman/fix/running-marker
...
Update server-console to watch interface via pid rather than marker
2017-06-02 15:57:44 -07:00
David Kelly
9b34abeb40
oops initializer order...
2017-06-02 15:43:29 -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
David Kelly
f9e1f02888
protect _text member of Text3DOverlay with mutex
2017-06-02 14:59:27 -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
ecc697dbe1
remove crash event definition for now
2017-06-02 13:21:45 -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
Chris Collins
34201ea1da
Merge pull request #10599 from jherico/ktx_cache_wipe
...
Add versioning support to the KTX cache
2017-06-02 13:02:18 -07:00
Sam Gateau
8a2837e1f7
Merge branch 'master' of https://github.com/highfidelity/hifi into brown
2017-06-02 11:52:11 -07:00
Brad Davis
1f95daf5c1
Add dev menu option to wipe KTX cache on next launch
2017-06-02 11:19:43 -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
Ryan Huffman
86da91ac8d
Remove the runningMarker timer
2017-06-01 18:19:13 -07:00
Stephen Birarda
6d1bbc389d
use a sleep instead of a yield waiting for close event
2017-06-01 17:57:23 -07:00
