Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-07-24 13:24:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
58329 commits 25 branches 0 tags 1.1 GiB
Commit graph

18455 commits

Author SHA1 Message Date
Brad Hefta-Gaub
9b3be6d164 Merge pull request #10808 from humbletim/21400 
WL 21400 -- Setting that lets you switch from cursor to reticle
 2017-07-27 13:16:58 -07:00
SamGondelman
e3288a9004 fix flicker, scissor warning, and handControllerGrab sphere size 2017-07-27 11:17:30 -07:00
Anthony J. Thibault
bcb4cc32d2 another clang error fix 2017-07-27 10:26:10 -07:00
Anthony J. Thibault
778c8bf9a7 clang build error fix 2017-07-27 10:08:35 -07:00
Anthony J. Thibault
8f5c41af2d changed _controllerPoseMap from unordered_map to map 2017-07-27 09:44:37 -07:00
Anthony J. Thibault
78c6564174 Merge branch 'master' into feature/secondary-pose-support 2017-07-27 09:09:32 -07:00
Sam Gondelman
fcaa39b245 Merge branch 'master' into sharks 2017-07-26 18:18:09 -07:00
SamGondelman
5e4a83dad9 defaultRenderStates, handControllerGrab.js, fix teleport.js a little 2017-07-26 17:58:39 -07:00
Zach Fox
8a7561d61b IT'S WORKING SOB SOB SOB 2017-07-26 16:35:55 -07:00
Zach Fox
39cb0bc357 WHYYYY DOESN'T THIS WORK 2017-07-26 16:14:35 -07:00
Seth Alves
9c9cfad4c4 use ctrl rather than alt to activate camera-mode shortcuts 2017-07-26 15:56:08 -07:00
Seth Alves
71023bcb1b Merge branch 'master' of github.com:highfidelity/hifi into bug-camera-mode-mods 2017-07-26 15:54:57 -07:00
Zach Fox
3a05219c59 Closer still 2017-07-26 14:10:41 -07:00
burtsloane
d4ae298a8d Merge branch 'master' into midi 2017-07-26 13:59:07 -07:00
Burt Sloane
4f7243e444 Merge branch 'master' of https://github.com/burtsloane/hifi into midi 2017-07-26 13:30:57 -07:00
Zach Fox
65c28ca821 Bugfixes 2017-07-26 13:17:51 -07:00
Zach Fox
62f6c10b2b Renaming things; bugfixes; improvements 2017-07-26 12:45:10 -07:00
Zach Fox
24ddbb4b22 Silly bug preventing the whole thing from working 2017-07-26 12:08:55 -07:00
Zach Fox
9147bc21d0 Getting there. 2017-07-26 11:41:27 -07:00
Liv
be860d6c87 small string fix 2017-07-26 10:20:29 -07:00
Liv
63d637c4db Add line to move user back to origin to be near new content 2017-07-26 10:02:21 -07:00
Liv
57b27a7bb7 change packet type to be sourced, change from packet list to single packet 2017-07-25 20:17:20 -07:00
Zach Fox
9020607ccf First pass 2017-07-25 17:54:46 -07:00
Zach Fox
7702bfceaa Big cleanup and preparation; Actually fix desktop tablet 2017-07-25 16:12:32 -07:00
SamGondelman
3a8ad8b631 switch to QUuids 2017-07-25 15:11:44 -07:00
SamGondelman
658acd91f2 experimenting with drawHUDLayer depth testing 2017-07-25 14:17:39 -07:00
SamGondelman
0117950546 can edit drawHUDLayer property 2017-07-25 12:57:52 -07:00
Liv
9458e4a1eb Merge branch 'master' of https://github.com/highfidelity/hifi into feat/domain-setup 2017-07-25 11:32:13 -07:00
Liv
2377e4a5db fix message formatting 2017-07-25 11:32:02 -07:00
Liv
89a1c7a697 code cleanup 2017-07-25 11:24:57 -07:00
Zach Fox
c71dca5b4b Missed a magic number 2017-07-25 11:15:44 -07:00
Zach Fox
256b7efdd2 Handle the case when the camera is inside the bounding box of an entity 2017-07-25 11:06:54 -07:00
SamGondelman
3149c3e16c warnings 2017-07-25 10:16:50 -07:00
Zach Fox
40038ce54b Merge branch 'master' of https://github.com/highfidelity/hifi into context-overlays 2017-07-25 09:33:07 -07:00
Andrew Meadows
9d1fba3a3b Merge pull request #10821 from ctrlaltdavid/21418 
Don't execute body of controllers' plugin update methods if not enabled
 2017-07-25 08:51:17 -07:00
Ryan Huffman
9421e6ebb6 Merge pull request #11029 from cain-kilgore/dominant-hands 
WL 21453 - Add a "Dominant Hand" setting
 2017-07-25 08:01:31 -07:00
SamGondelman
3c8b964cc9 replace setHandLasers with drawHUDLayer overlay property 2017-07-24 18:16:40 -07:00
Liv
32ddffd9c8 Move logic for confirmation into Application.cpp for handling files directly 2017-07-24 18:09:32 -07:00
Cain Kilgore
280a7a7e42 Fixing Styling, added Preference to Tablet, Moved Location to Avatar Tuning 2017-07-25 01:48:55 +01:00
Seth Alves
766c6f48c3 third person camera is alt+G rather than alt+O 2017-07-24 17:43:01 -07:00
Anthony J. Thibault
33a1d6e225 Merge branch 'master' into feature/secondary-pose-support 2017-07-24 17:27:33 -07:00
Anthony J. Thibault
9f6641ed10 Shoulder puck calibration work in progress 
* AnimInverseKinematics: debug draw for secondary targets
* AnimInverseKienmatics: better clean up of ik target debug draw
* GeometryUtil: added findPlaneFromPoints()
* ViveControllerManager: external dependency on eigen
* ViveControllerManager: record history of left/right hand controllers
* ViveControllerManager: use history to determine user shoulder location for better calibration
* ViveControllerManager: pass defaultToReferenceMat by const ref to calibrate functions.
* CMake: added external depenency to eigen linear algebra library.
 2017-07-24 17:22:48 -07:00
Zach Fox
c22798a8e6 Offset tablet position to left of screen per feedback 2017-07-24 17:16:07 -07:00
Seth Alves
97756e6140 accidently deleted a break 2017-07-24 16:12:03 -07:00
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
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
Zach Fox
223ed5b59a Hack to mod tablet orientation when clicking context overlay 2017-07-24 14:29:06 -07: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
SamGondelman
ee02a0bff4 fix build error 2017-07-24 12:44:54 -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
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
Liv
76cc833747 move domain management into a separate API 2017-07-21 17:44:53 -07:00
Dante Ruiz
06b4c53d28 only desktop mode 2017-07-22 00:15:26 +01:00
Dante Ruiz
7bf3f45e39 finished the locked default scripts 2017-07-21 23:32:25 +01:00
David Kelly
e7c6ba9ae2 unused var 2017-07-21 14:44:45 -07:00
Zach Fox
811be15bbc Another attmept to fix the tablet 2017-07-21 14:02:19 -07:00
David Kelly
8de09affad Merge pull request #11025 from davidkelly/dk/contextOverlayPositioning 
reposition context overlay when far away
 2017-07-21 13:35:57 -07:00
Zach Fox
796292dd4c Fix the tablet 2017-07-21 13:21:13 -07:00
David Kelly
9e31024a0e merged with new stuff too 2017-07-21 13:16:41 -07:00
Zach Fox
a346e5ccf6 New inspect icon 2017-07-21 11:56:06 -07:00
Zach Fox
a800f6c05a No magic numbers; Move (i) based on laser hand; Tablet to Tab key 2017-07-21 11:48:19 -07: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
Zach Fox
7d125f44e4 Set parentID even when overlay already exists 2017-07-21 09:35:49 -07:00
vladest
33a8ab2d58 Adjusted according discussion in PR 2017-07-21 18:18:23 +02:00
Dante Ruiz
e2359f6bb9 changes api call 2017-07-21 17:15:31 +01:00
vladest
b13cbd5bde Merge branch 'master' into avatar_default_speeds 2017-07-21 17:45:11 +02:00
Olivier Prat
7bc7b1eabc Merge branch 'master' of git://github.com/highfidelity/hifi into fade2 2017-07-21 09:27:30 +02: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
SamGondelman
c7f0f03fce expanded RayPick JS API 2017-07-20 13:53:39 -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
SamGondelman
d156680bc8 ignore/include by ID, simplified caching logic 2017-07-20 12:15:06 -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
SamGondelman
bf243d6025 lockEnd, editRenderState, and updated grab.js 2017-07-19 17:45:21 -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
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
SamGondelman
912b417dd4 mouse ray pick 2017-07-19 13:56:18 -07:00
Zach Fox
c866bd814d Make clicks work right 2017-07-19 12:24:20 -07:00
SamGondelman
c6b3f69db0 teleport third eye laser on invalid hand pose 2017-07-19 11:51:31 -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
SamGondelman
55a025b827 initial code review 2017-07-18 12:43:34 -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
SamGondelman
298faa9f0f threading pass 2017-07-18 12:13:16 -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
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
SamGondelman
0c8c6ff5d6 silly me 2017-07-17 15:05:31 -07:00
SamGondelman
7084a0607a fix warnings 2017-07-17 14:26:22 -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
SamGondelman
ae99be0350 added faceAvatar and centerEndY, working on updating teleport.js, style fixes 2017-07-17 13:07:42 -07:00
humbletim
9c610f52ec switch history file format to JSON 2017-07-17 15:34:41 -04:00
Olivier Prat
0123e2936b Merge branch 'master' of git://github.com/highfidelity/hifi into fade 2017-07-17 11:44:10 +02:00
SamGondelman
af12b5a4bf can create static laser pointers, fixed a bug with multiple render states 2017-07-14 18:35:27 -07:00
Zach Fox
e602d3610e Initial commit for HoverOverlayInterface 2017-07-14 17:26:53 -07:00
SamGondelman
8f533636f5 c++ side laserpointer rendering with renderstates 2017-07-14 11:13:40 -07: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
SamGondelman
6f970fd7a0 Merge remote-tracking branch 'upstream/master' into sharks 2017-07-14 09:37:11 -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
SamGondelman
3c719b26b1 working on renderstates 2017-07-13 17:43:44 -07: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
SamGondelman
3a35cd128f fix dirOffset, expose intersection type to JS 2017-07-13 16:09:21 -07: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
SamGondelman
783750a0bc update jointraypicks from joints, dirOffset needs work 2017-07-13 14:47:24 -07: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
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
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
SamGondelman
916a99c670 added JS/C++ RayPickResult, working on RayPickManager::update 2017-07-12 17:12:25 -07: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
SamGondelman
ea65a04f28 expose RayPickMask to JS, move everything to interface/src/raypick to prevent dependency issues, start working on RayPickManager::update (needs testing) 2017-07-12 14:20:39 -07:00
SamGondelman
3ac369d782 framework for LaserPointers and abstracted RayPicking on C++ side, including JS API 2017-07-12 14:20:39 -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