Commit graph

21099 commits

Author SHA1 Message Date
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
NeetBhagat
ff51fa7199 Resolved review comments. 2017-07-18 10:42:01 +05:30
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
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
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
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
Howard Stearns
17fcfad957 Merge pull request #10875 from highfidelity/spectator-camera
Spectator Camera
2017-07-13 13:57:18 -07: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
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
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
Dante Ruiz
12206cf711 Merge branch 'master' of github.com:highfidelity/hifi into tablet-modal-fixes 2017-07-12 16:56:25 +01: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