Commit graph

21208 commits

Author SHA1 Message Date
Seth Alves
82a787a753 use alt+h for mirror-mode 2017-07-24 16:04:11 -07:00
Andrew Meadows
8c55476c65 fix motor direction when walking upside down
also maintain worldUp and remove unnecessary cruft
2017-07-24 16:00:13 -07:00
Andrew Meadows
f598b1f1f5 fix spelling typo in comment 2017-07-24 16:00:13 -07:00
Andrew Meadows
29be9aee65 move nextAttitude() from AvatarData to MyAvatar 2017-07-24 16:00:13 -07:00
Andrew Meadows
f0871c6878 avoid unnecessary and expensive gets 2017-07-24 16:00:13 -07:00
Seth Alves
e53badf88b use alt+f for 1st person camera and alt+o for 3rd 2017-07-24 15:56:37 -07:00
Cain Kilgore
84609f27e3 Final Change - They're now Radio Boxes. 2017-07-24 23:53:03 +01:00
Seth Alves
afc7eaff8d Merge branch 'bug-camera-mode-mods' of github.com:druiz17/hifi into bug-camera-mode-mods 2017-07-24 15:21:37 -07:00
Cain Kilgore
9c152ddc6f Ticking left will keep it on left, not right 2017-07-24 22:30:43 +01:00
humbletim
de6975b227 add missing cursor-*.pngs 2017-07-24 17:16:13 -04:00
Andrew Meadows
a44b33ab11 Merge pull request #11023 from jherico/audio_deadlock
Fix for audio deadlock & audio device selection
2017-07-24 14:03:29 -07:00
Cain Kilgore
9ff7891c88 Fixed reference error, Gustavo should build now. 2017-07-24 19:56:02 +01:00
Cain Kilgore
64ba159adf Updating Small Reference 2017-07-24 19:12:14 +01:00
Cain Kilgore
fd2264f7c9 removed duplicate 2017-07-24 19:05:49 +01:00
Cain Kilgore
e6fd85f45a Some code cleanup 2017-07-24 19:02:40 +01:00
Cain Kilgore
42742ba1f9 Changed the Return to a String "left/right" instead. 2017-07-24 18:31:16 +01:00
Brad Hefta-Gaub
0ba8d43522 Merge pull request #10994 from vladest/avatar_default_speeds
Change default mouse speeds for avatar
2017-07-24 10:13:27 -07:00
Stephen Birarda
26be7e1a01 Merge pull request #10999 from birarda/bug/html-path-on-mac-build
fix create tab load on OS X
2017-07-24 10:12:40 -07:00
Chris Collins
ceb218f4cc Merge pull request #10798 from humbletim/add-persistent-console-history
Save JS "Console..." history across sessions
2017-07-24 09:24:04 -07:00
Cain Kilgore
a4cf27402d Tabs and Cleanup of Code 2017-07-24 06:27:14 +01:00
Cain Kilgore
630922dd95 Dominant Hands Branch Initial Commit
Adds a new option in the Avatar Basics section of the Avatar Settings.

API Accessible Functions:
MyAvatar.getUseAlternativeHand()
MyAvatar.setUseAlternativeHand()

Defaults to false (Right Hand). Will return True if set to Left Hand.
2017-07-24 06:18:24 +01:00
humbletim
300b926464 only call QList::constFirst when history list isn't empty 2017-07-23 14:12:52 -04:00
Dante Ruiz
06b4c53d28 only desktop mode 2017-07-22 00:15:26 +01:00
vladest
615a3c52e4 Ooops.. 2017-07-21 21:26:33 +02:00
Brad Davis
5b5e94700e Additional audio fixes 2017-07-21 09:52:44 -07:00
Brad Davis
d1c2218a31 Temporary patch for deadlock 2017-07-21 09:52:36 -07:00
vladest
33a8ab2d58 Adjusted according discussion in PR 2017-07-21 18:18:23 +02:00
vladest
b13cbd5bde Merge branch 'master' into avatar_default_speeds 2017-07-21 17:45:11 +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
Andrew Meadows
a8dac0cb79 don't send constant updates for grabbed objects 2017-07-20 15:45:50 -07:00
David Rowe
091b666d7e Fix noise reduction checkbox not always working 2017-07-20 12:06:19 +12: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
vladest
4b94d24c29 Change default mouse speeds for avatar 2017-07-18 23:51:19 +02: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
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
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
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
1P-Cusack
2cd10fd459 Move 'index point' logic into json config file. 2017-07-12 11:08:50 -04: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