vladest
b13cbd5bde
Merge branch 'master' into avatar_default_speeds
2017-07-21 17:45:11 +02:00
David Kelly
875d0eb815
Merge branch 'context-overlays' of https://github.com/highfidelity/hifi into context-overlays
2017-07-21 07:20:19 -07:00
David Kelly
6db2e2c6c9
Merge branch 'master' of https://github.com/highfidelity/hifi into context-overlays
2017-07-21 07:18:33 -07:00
Olivier Prat
7bc7b1eabc
Merge branch 'master' of git://github.com/highfidelity/hifi into fade2
2017-07-21 09:27:30 +02:00
Stephen Birarda
7cfdf7d5ae
Merge pull request #11000 from highfidelity/bug/6219
...
made changes to size of content to display 'choose file' button
2017-07-20 17:46:15 -07:00
anshuman64
5f3b68d544
Use ctrl+H instead of alt+H
2017-07-20 17:36:02 -07:00
Dante Ruiz
649b974927
mods for changes camera views
2017-07-21 01:01:23 +01:00
Zach Fox
e68f9499fa
Add hover/unhover handlers to context overlays
2017-07-20 16:51:00 -07:00
Andrew Meadows
a8dac0cb79
don't send constant updates for grabbed objects
2017-07-20 15:45:50 -07:00
Zach Fox
3698fe9b6b
Merge branch 'master' of https://github.com/highfidelity/hifi into context-overlays
2017-07-20 15:10:06 -07:00
David Kelly
c8015e4eb6
cleanup, fixed build issue
2017-07-20 14:52:58 -07:00
David Kelly
c1de09c7f6
whitespace issue
2017-07-20 14:24:16 -07:00
David Kelly
10503c3a16
registration point
2017-07-20 14:18:07 -07:00
Dante Ruiz
3c862c34b2
disable reload default scripts by default
2017-07-20 21:15:00 +01:00
Zach Fox
e18fec140a
Merge branch 'context-overlays' of https://github.com/highfidelity/hifi into contextOverlays_improvements2
2017-07-20 13:03:34 -07:00
Zach Fox
a1a7ab945a
Make dimensions better
2017-07-20 12:58:15 -07:00
Zach Fox
f515a24568
UX improvements
2017-07-20 12:00:13 -07:00
David Kelly
b7be727b4c
turn off ContextOverlay for pal, edit. Improve clicks too
2017-07-20 11:30:55 -07:00
David Kelly
0544c1e561
build issue
2017-07-20 08:18:37 -07:00
David Kelly
110efd63c8
enabled property so we can turn it off during edit, etc...
2017-07-20 08:08:49 -07:00
David Kelly
b236a21adc
no clicks on 'highlight' overlay
2017-07-20 07:28:45 -07:00
David Kelly
0023832938
simple fixes
2017-07-19 17:38:19 -07:00
David Kelly
ebce1ce9de
Merge branch 'context-overlays' of https://github.com/highfidelity/hifi into dk/placeholderHighlighting
2017-07-19 17:13:11 -07:00
Zach Fox
2dce254928
Actually increase target size
2017-07-19 17:11:45 -07:00
David Rowe
091b666d7e
Fix noise reduction checkbox not always working
2017-07-20 12:06:19 +12:00
David Kelly
40ec770bc1
Highlight using simple yellow bounding box
2017-07-19 17:06:17 -07:00
Stephen Birarda
3936ee93f0
use default scripts path in EditTabView to fix load on OS X
2017-07-19 16:34:04 -07:00
utkarshgautamnyu
ce5ff23e70
made changes to size of content to dosplay 'choose file' button
2017-07-19 16:15:34 -07:00
David Kelly
920ac17caf
minor renaming
2017-07-19 15:46:28 -07:00
David Kelly
5f82a76cc9
Merge branch 'context-overlays' of https://github.com/highfidelity/hifi into dk/marketplaceItemsOnly
2017-07-19 15:41:36 -07:00
David Kelly
ecd419e0d3
cr feedback
2017-07-19 15:32:03 -07:00
Zach Fox
4374d4d1e5
Small improvements to overlay
2017-07-19 15:27:48 -07:00
David Kelly
44c9f0e65e
Overlay appears only on marketplace items
2017-07-19 15:13:26 -07:00
David Kelly
f0091f16a1
cr feedback
2017-07-19 14:46:10 -07:00
David Kelly
a8ab115b12
Open marketplace when we know the marketplaceID of an entity
2017-07-19 14:11:14 -07:00
Zach Fox
c866bd814d
Make clicks work right
2017-07-19 12:24:20 -07:00
Zach Fox
f06ec715f2
Quick bugfix
2017-07-19 09:59:44 -07:00
Zach Fox
1d26a268c1
Merge branch 'master' of https://github.com/highfidelity/hifi into HoverOverlay_CubeOverlay
2017-07-19 09:53:51 -07:00
Zach Fox
761d35d633
Getting there!
2017-07-18 17:10:23 -07:00
Zach Fox
8f6af3a1ab
ContextOverlay
2017-07-18 16:28:24 -07:00
Zach Fox
265f978a06
It's working!
2017-07-18 15:57:26 -07:00
vladest
4b94d24c29
Change default mouse speeds for avatar
2017-07-18 23:51:19 +02:00
Zach Fox
084f4d2ab0
Why were Web3DOverlays done this way?
2017-07-18 14:42:59 -07:00
Zach Fox
2b1a0921da
Initial work on clickable overlays
2017-07-18 14:01:16 -07:00
Brad Davis
1aee8f1f4d
Ensure we continue calling idle when minimized
2017-07-18 13:44:58 -07:00
Chris Collins
e99683fdcf
Merge pull request #10985 from jherico/audio_deadlock
...
Trying to resolve QML / Audio deadlocks
2017-07-18 12:40:03 -07:00
Dante Ruiz
976fec66f8
fixed loading script whitespace
2017-07-18 17:59:42 +01:00
Brad Hefta-Gaub
2dfaf7b02a
Merge pull request #10862 from NeetBhagat/5783-Restarting-Interface-allows-you-to-have-Avatar-Scale-Too-Big
...
Case 5783: Restarting Interface allows you to have Avatar Scale Too Big
2017-07-18 08:51:13 -07:00
Brad Hefta-Gaub
d94365cc44
Merge pull request #10979 from zfox23/hoverOverlay_lasers
...
Create/Destroy Hover Overlays using hand controller lasers
2017-07-18 08:44:48 -07:00
Brad Hefta-Gaub
a7e328285e
Merge pull request #10969 from druiz17/bug/addmodel-textbox
...
allow user move the cursor with the mouse for the add model URL textbox
2017-07-18 08:41:08 -07:00
Olivier Prat
d055b1aa8e
Merge branch 'fade' into fadeshape
2017-07-18 14:48:28 +02:00
Olivier Prat
9130c51319
Fixed incorrect removal of ALL avatar fade events. Fade out should now work again when avatar leaves domain
2017-07-18 14:46:49 +02:00
Olivier Prat
2bba6aa816
Revert "Removed all bubble fade event code on avatar side"
...
This reverts commit 4b8545e8b5
2017-07-18 14:07:07 +02:00
Olivier Prat
236270d798
Merge branch 'master' of git://github.com/highfidelity/hifi into fadeshape
2017-07-18 10:47:21 +02:00
Olivier Prat
4b8545e8b5
Removed all bubble fade event code on avatar side
2017-07-18 10:04:08 +02:00
NeetBhagat
ff51fa7199
Resolved review comments.
2017-07-18 10:42:01 +05:30
Brad Davis
d43432bd71
Cleanup dead code, fix startup behavior
2017-07-17 18:54:52 -07:00
Zach Fox
67c8ddfd57
Merge in changes from laser PR
2017-07-17 17:09:40 -07:00
Zach Fox
96f52a9812
First pass at getting overlays to show up on hover
2017-07-17 17:05:16 -07:00
Brad Davis
aab56cf2a9
Trying to resolve QML / Audio deadlocks
2017-07-17 16:21:28 -07:00
utkarshgautamnyu
758ae9825d
Merge pull request #10939 from highfidelity/bug/6118
...
Record total number of ATP/HTTP/File bytes downloaded during session
2017-07-17 13:53:21 -07:00
Zach Fox
974dff36b0
Make hover overlays work for hand controller lasers
2017-07-17 13:16:53 -07:00
Zach Fox
aadf407842
Merge pull request #10978 from zfox23/hoverOverlayInterface
...
New HoverOverlayInterface skeleton
2017-07-17 13:16:32 -07:00
humbletim
9c610f52ec
switch history file format to JSON
2017-07-17 15:34:41 -04:00
1P-Cusack
7319998df9
Move ThumbUp gesture detection into json map file.
2017-07-17 10:58:30 -04:00
Olivier Prat
0123e2936b
Merge branch 'master' of git://github.com/highfidelity/hifi into fade
2017-07-17 11:44:10 +02:00
Zach Fox
e602d3610e
Initial commit for HoverOverlayInterface
2017-07-14 17:26:53 -07:00
Dante Ruiz
93d1725b3c
make cursor position change based on mouse click position
2017-07-14 19:30:35 +01:00
Zach Fox
a9197509d8
Merge pull request #10965 from CainFoool/avatar-scaler
...
WL 21422 - Add a scale slider for avatar size
2017-07-14 10:30:33 -07:00
Andrew Meadows
9584035aa4
Merge pull request #10886 from 1P-Cusack/21420
...
[Worklist #21420 ] Implement Create button disabled state (details below).
2017-07-14 10:06:45 -07:00
Seth Alves
741feb7e54
Merge pull request #10951 from druiz17/tablet-modal-fixes
...
Allow the tablet to be closed when a modal dialog is open.
2017-07-14 09:40:58 -07:00
Cain Kilgore
b7ed3ce659
Prettified the Comment
2017-07-14 17:33:17 +01:00
Cain Kilgore
ee1f371902
Fixed step counted not resetting to 1 properly
2017-07-14 16:29:19 +01:00
Olivier Prat
82da9fb537
Merge branch 'master' of git://github.com/highfidelity/hifi into fade
2017-07-14 17:28:35 +02:00
Anthony J. Thibault
c85e187c61
first stab at secondary target pose support
2017-07-13 18:12:33 -07:00
Cain Kilgore
c60c8c7b13
Missed two tabs..
2017-07-14 00:59:25 +01:00
Cain Kilgore
4f8d958831
Some code cleaning, added comment for reasoning of specifying min and max in the qml
2017-07-14 00:56:42 +01:00
Cain Kilgore
72c3e789e9
More Spaces!
2017-07-13 23:42:20 +01:00
Anthony J. Thibault
fe711ccbe9
Refactored how controller poses are stored in MyAvatar.
2017-07-13 15:01:14 -07:00
Cain Kilgore
d74c834f12
Fixed colour scheming and changed to a reload icon
2017-07-13 22:40:37 +01:00
Cain Kilgore
60300f5d7b
changed to icon (hopefully)
2017-07-13 22:06:44 +01:00
Olivier Prat
b125fba2e1
Removed untested avatar bubble fade code. Made changes as requested by Andrew
2017-07-13 23:04:55 +02:00
Howard Stearns
17fcfad957
Merge pull request #10875 from highfidelity/spectator-camera
...
Spectator Camera
2017-07-13 13:57:18 -07:00
Olivier Prat
b68ec4f933
Merge branch 'master' of git://github.com/highfidelity/hifi into fade
2017-07-13 22:36:52 +02:00
Cain Kilgore
f91a8c0f53
Merge branch 'master' of https://github.com/highfidelity/hifi into avatar-scaler
2017-07-13 21:25:39 +01:00
Cain Kilgore
677b177dce
Build error fix
2017-07-13 20:29:52 +01:00
Cain Kilgore
247e7b8bed
indentation!!!
2017-07-13 19:25:31 +01:00
Cain Kilgore
092725ad1a
a thing
2017-07-13 19:24:30 +01:00
Cain Kilgore
5329c1ce42
Fixed Indentation, removed old debug code
2017-07-13 19:23:28 +01:00
Cain Kilgore
521babb6bd
Avatar Scaler - should be PR Ready.
2017-07-13 19:18:51 +01:00
Dante Ruiz
03fbd2a1e6
fixed another warning
2017-07-13 19:12:34 +01:00
Seth Alves
59d88cb564
Merge pull request #10941 from sethalves/audio-injector-smart-pointers
...
Audio injector smart pointers
2017-07-13 11:00:02 -07:00
Dante Ruiz
b46dc7d389
removed space
2017-07-13 18:42:26 +01:00
Dante Ruiz
3cbfd4c917
Merge branch 'master' of github.com:highfidelity/hifi into tablet-modal-fixes
2017-07-13 18:40:54 +01:00
Dante Ruiz
070db2922d
fixed warning compile error
2017-07-13 18:40:38 +01:00
Anthony J. Thibault
22d8adcb99
Better shoulder/arm puck calibration.
2017-07-13 10:39:48 -07:00
David Kelly
60751f07bd
Merge pull request #10961 from davidkelly/dk/hmdPreviewFix
...
hmd preview fix
2017-07-13 10:32:33 -07:00
Brad Hefta-Gaub
b063c2f45d
Merge pull request #10942 from AndrewMeadows/cleanup-entity-transmission
...
Cleanup OctreeSendThread::packetDistributor()
2017-07-13 09:58:28 -07:00
NeetBhagat
11f8f5cffc
Solve : implicit conversion from ‘float’ to ‘double’ issue
2017-07-13 18:26:52 +05:30
Olivier Prat
edcfecd5d4
Merge branch 'master' of git://github.com/highfidelity/hifi into fade
2017-07-13 11:05:14 +02:00
Olivier Prat
2d2722bfc5
Added async transition query on scene
2017-07-13 11:05:04 +02:00
David Kelly
4b3cf5ee2e
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/hmdPreviewFix
2017-07-12 16:50:51 -07:00
David Kelly
88a449c1af
Fixes hmd preview when resizing
2017-07-12 16:49:26 -07:00
Zach Fox
dc1b4b5324
New icons
2017-07-12 16:48:04 -07:00
Zach Fox
8553277c56
Merge branch 'master' of https://github.com/highfidelity/hifi into spectator-camera
2017-07-12 14:18:50 -07:00
Cain Kilgore
43782a29c7
Avatar Scaler - WIP
2017-07-12 22:04:58 +01:00
Seth Alves
59ad3d50ec
Merge branch 'master' of github.com:highfidelity/hifi into audio-injector-smart-pointers
2017-07-12 12:45:58 -07:00
Seth Alves
ddf2312dc6
code review
2017-07-12 12:45:52 -07:00
Zach Fox
bd4fe416b4
Cleanup; no magic numbers for default cam params
2017-07-12 12:08:36 -07:00
Zach Fox
9fe6fbd811
View frustums are strange.
2017-07-12 11:37:18 -07:00
utkarshgautamnyu
6b969bc39d
added code to record total number of ATP/HTTP/File bytes downloaded during session
...
Update FileResourceRequest.cpp
Update AssetResourceRequest.cpp
Update FileResourceRequest.cpp
Update HTTPResourceRequest.cpp
Update AssetResourceRequest.cpp
Update AssetResourceRequest.cpp
Update FileResourceRequest.cpp
Update AssetResourceRequest.cpp
Update AssetResourceRequest.cpp
Update FileResourceRequest.cpp
Update FileResourceRequest.cpp
Update HTTPResourceRequest.cpp
Update FileResourceRequest.cpp
Update FileResourceRequest.cpp
Update Application.cpp
Update Application.cpp
2017-07-12 11:13:13 -07:00
Andrew Meadows
364600c447
fix rendering of simulation ownership debug icons
2017-07-12 11:12:47 -07:00
Zach Fox
79cf242fc9
Make far clip plane distance equal to main camera's
2017-07-12 10:51:14 -07:00
Stephen Birarda
f6d9a79fb5
Revert "Revert "fix for invisible avatars after radius ignore""
2017-07-12 10:36:53 -07:00
Olivier Prat
0f60cca617
Merged cleaned up fader branch from Sam
2017-07-12 18:09:17 +02:00
Dante Ruiz
12206cf711
Merge branch 'master' of github.com:highfidelity/hifi into tablet-modal-fixes
2017-07-12 16:56:25 +01:00
Sam Gateau
5394ac8672
Cleaning up changes, removing comments and dead code etc...
2017-07-12 17:33:05 +02:00
Olivier Prat
2f9885870b
First merge with Sam's fader branch with custom pipeline support in shape plumber
2017-07-12 17:29:21 +02:00
1P-Cusack
2cd10fd459
Move 'index point' logic into json config file.
2017-07-12 11:08:50 -04:00
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
Zach Fox
ea62ef165c
Fix image container background
2017-07-10 16:13:45 -07:00
Zach Fox
4a74522884
Ensure tablet button shows up; protections for controller mapping
2017-07-10 15:16:16 -07: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
druiz17
78ba2102f4
Merge pull request #10931 from druiz17/fix-goto-hmd-keyboard
...
Fixed goto hmd keyboard not entering text
2017-07-10 12:50:01 -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
1P-Cusack
f5ccf508c9
Fixing braces dropped in merge conflict edit.
2017-07-10 14:11:04 -04:00
Dante Ruiz
89a072cfee
fixed hmd keyboard for goto
2017-07-10 19:05:07 +01:00
David Kelly
1c9c36a8c8
Merge branch 'spectator-camera' of https://github.com/highfidelity/hifi into dk/hmdPreview
2017-07-10 10:22:31 -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
1st Playable
2cafefaff8
Merge branch 'master' into 21362
2017-07-10 12:05:36 -04:00
1P-Cusack
1d333a24c1
Add point and thumb up gestures to the vive.
...
When the thumb is off the touchpad, trigger the 'thumb up' animation.
When on the thumbpad an 75% forward, trigger the 'index point animation'.
WL 21362
2017-07-10 11:51:42 -04: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
druiz17
6e44c95d53
Merge pull request #10906 from druiz17/audio-qml-fix
...
Made the output audio listview dynamically change height base on content size
2017-07-07 16:48:15 -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
Zach Fox
e222753aac
Merge pull request #10911 from zfox23/PAL_adminFix2
...
Set admin status even if QML can't find user in PAL
2017-07-07 10:24:53 -07:00
Olivier Prat
06d69d04c3
TransitionStage + FadeJob compiling but not linked to entity events
2017-07-07 18:22:11 +02:00
Seth Alves
fc8b7c7cc5
Merge pull request #10904 from druiz17/window-root-spam
...
fixed log spamming from windowRoot.qml in toolbar mode
2017-07-07 07:17:08 -07: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
Zach Fox
ee9cdaff90
Set admin status even if QML can't find user in PAL
2017-07-06 23:26:40 -07: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
Zach Fox
1afa2d3775
Spectator camera icon
2017-07-06 16:24:50 -07:00
David Kelly
b41c470064
first cut, still stereo
2017-07-06 15:59:24 -07:00
Dante Ruiz
1ac415aa14
dynamic listview height
2017-07-06 23:50:32 +01: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
Dante Ruiz
b0130896d1
fixed spamming from windowRoot.qml
2017-07-06 22:01:08 +01:00
Dante Ruiz
1fcb3b32d6
fixed letter cap
2017-07-06 20:55:19 +01:00
Seth Alves
0374d24b15
Merge pull request #10901 from druiz17/goto-keyboard-fix
...
Fixed the keyboard not showing up for goto in HMD mode
2017-07-06 12:46:13 -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
2d876377d5
keyboard know disappears when you click of the address line
2017-07-06 20:04:44 +01:00
Dante Ruiz
de5802418f
fixed some keybaord logic
2017-07-06 19:27:48 +01:00
Dante Ruiz
4e3dba1767
goto HMD keyboard fix
2017-07-06 19:12:52 +01: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
Dante Ruiz
6e1f9d275c
chnaged default head offset
2017-07-06 17:54:06 +01:00
David Kelly
1ccf0da7d8
Merge pull request #10897 from davidkelly/dk/cacheSwitchFix
...
redo cache switch
2017-07-06 09:53:01 -07:00
Dante Ruiz
258c21838e
finished calibration-ui updates
2017-07-06 17:32:40 +01: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
LaShonda Hopper
9cae868492
[Worklist #21420 ] Implement Create button disabled state (details below).
...
* The create button icon is set to its disabled resource when the user
enters a domain where they have _neither_ Rez or TempRez permissions.
** If the user has either of the Rez permission levels then the normal edit-i.svg
icon is used and the user is able to create items as before.
* When the user clicks the button in this state, the INSUFFICIENT_PERMISSIONS_ERROR_MSG
is shown and creation menu is not shown.
* The disabled icon, edit-disabled.svg, is based on the edit-i.svg and is set to 33% opacity.
Item Ticket Link: https://worklist.net/21420
Changes to be committed:
new file: interface/resources/icons/tablet-icons/edit-disabled.svg
modified: scripts/system/edit.js
2017-07-06 10:53:46 -04: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
Dante Ruiz
6c15dffb9d
added new glyph
2017-07-06 00:45:59 +01:00
Zach Fox
39bdc20b4f
On checkbox language change
2017-07-05 16:13:36 -07:00
Zach Fox
f6583a1b87
Use correct text color for checkboxes
2017-07-05 14:46:59 -07:00
Zach Fox
0af53bb4a5
Instructions and cool static :)
2017-07-05 14:46:59 -07:00
Zach Fox
aea5779ed6
When a display texture isn't set, show preview instructions
2017-07-05 14:46:58 -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
Chris Collins
1f7d2b283a
Merge pull request #10872 from jherico/fix_laggy_overlays
...
Don't use a blocking connection for a high-frequency script function
2017-07-03 14:58:32 -07:00
Brad Davis
97edbb7f37
Restore mutex in overlay interface
2017-07-03 14:49:57 -07:00
David Kelly
373bd0cc8a
aspect ratio preserved upon blitting, minor qml tweak, warnings fixed
2017-07-03 14:23:23 -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
anshuman64
70b9e9b41e
Merge pull request #10849 from druiz17/calibration-ui-update
...
Updated calibration UI visuals and added UserActivity events.
2017-07-03 12:42:09 -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
Dante Ruiz
063984f573
Merge branch 'master' of github.com:highfidelity/hifi into calibration-ui-update
2017-07-03 16:44:47 +01: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
Dante Ruiz
51792769b5
finished vive in desktop mode
2017-07-01 00:48:36 +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
309a03230c
Merge branch 'calibration-ui-update' into vive-in-desktop
2017-06-30 23:43:59 +01: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
