Commit graph

19910 commits

Author SHA1 Message Date
Dante Ruiz
1b20cc8bd0 more clean up 2016-11-30 18:28:50 +00:00
Dante Ruiz
104cbbff7e clean up 2016-11-30 18:26:06 +00:00
Dante Ruiz
34d24b947e better implementation 2016-11-30 18:03:11 +00:00
Dante Ruiz
daf12047ca removed unnessary comments 2016-11-22 18:55:20 +00:00
Dante Ruiz
2dfb745443 made some chnages 2016-11-22 18:53:03 +00:00
Dante Ruiz
a176c624ab fixed teleport bug 2016-11-21 23:04:07 +00:00
Dante Ruiz
1ba769b0ef teleportBug 2016-11-21 10:38:20 -08:00
Brad Hefta-Gaub
ac6a1088f9 Merge pull request #9099 from ZappoMan/personalSpace
first cut at personal space feature
2016-11-19 16:57:33 -08:00
Brad Hefta-Gaub
fe709f51de personal space feature 2016-11-19 16:30:15 -08:00
Brad Davis
362976645b Fix HMD UI glow lines 2016-11-18 17:42:56 -08:00
Brad Davis
3074be7ad0 Glow line replacement without geometry shader 2016-11-18 17:42:55 -08:00
Chris Collins
e9563ef9af Merge pull request #9095 from birarda/mac-perms
add hardware address based permissions to domain-server
2016-11-18 17:28:11 -08:00
Seth Alves
8ee1fac367 don't try to render until mesh is ready 2016-11-18 16:33:48 -08:00
Seth Alves
b2a28147c0 more time 2016-11-18 15:36:29 -08:00
Seth Alves
47062d29f5 cleanups 2016-11-18 15:27:45 -08:00
Seth Alves
3278478a60 cleanups 2016-11-18 15:26:16 -08:00
Seth Alves
a66a1d392e hack to avoid crash 2016-11-18 15:24:19 -08:00
Seth Alves
f5536a01a7 Merge branch 'master' of github.com:highfidelity/hifi into fix-polyvox-buffer-size 2016-11-18 14:09:44 -08:00
Stephen Birarda
47f82a8046 send the mac address with domain-server check in 2016-11-18 13:50:11 -08:00
Chris Collins
c81b0fc018 Merge pull request #9091 from kencooke/audio-multichannel
Multichannel audio support
2016-11-18 13:32:59 -08:00
Seth Alves
1714d4fe06 fix build 2016-11-18 05:40:57 -08:00
Seth Alves
8530156227 experimenting 2016-11-17 16:06:35 -08:00
Seth Alves
028be0f830 Merge branch 'master' of github.com:highfidelity/hifi into fix-polyvox-buffer-size 2016-11-17 14:14:08 -08:00
Seth Alves
1eb17b9786 fix bug that caused polyvox rendering to mishandle its gpu buffers 2016-11-17 14:11:09 -08:00
Ken Cooke
fd08936fb3 Improved failure logs 2016-11-17 13:42:43 -08:00
Brad Hefta-Gaub
36d8e6d64d Merge pull request #9074 from hyperlogic/bug-fix/web-entity-limit-fix
Bug fix for blank webEntities during long sessions
2016-11-17 13:02:18 -08:00
Brad Hefta-Gaub
91f90400a9 Merge pull request #9088 from sethalves/fix-polyvox-memory-leak
fix polyvox memory leak
2016-11-17 12:23:13 -08:00
Seth Alves
1f9598f295 Merge branch 'master' of github.com:highfidelity/hifi into fix-polyvox-memory-leak 2016-11-17 08:44:52 -08:00
Ken Cooke
ec53c6a030 Add support for mono or multichannel audio output.
At the end of the audio pipeline, optional upmix/downmix to the device channel format.
2016-11-17 06:56:49 -08:00
Brad Hefta-Gaub
22303d8e5b Merge pull request #9086 from jherico/disable_glow_line
Disable glow line temporarily while fixing implementation
2016-11-16 18:16:55 -08:00
Brad Hefta-Gaub
b0c87e9134 Merge pull request #9080 from jherico/buffer_leak
Fix buffer leak in line entity
2016-11-16 18:10:44 -08:00
Seth Alves
697369dece avoid crash on startup 2016-11-16 16:11:17 -08:00
Seth Alves
e83922f9e4 Merge branch 'master' of github.com:highfidelity/hifi into fix-polyvox-memory-leak 2016-11-16 15:39:57 -08:00
Seth Alves
b9326affa3 Merge pull request #9087 from druiz17/parentID
Fix - When avatar's parent is deleted, avatar does not move
2016-11-16 15:30:52 -08:00
Seth Alves
a14ff22df3 update render-land bounds when polyvox moves 2016-11-16 15:10:43 -08:00
Dante Ruiz
66ff81f450 Another function name change 2016-11-16 22:32:15 +00:00
Seth Alves
d097fa7982 fix polyvox memory leak 2016-11-16 14:10:50 -08:00
Dante Ruiz
9c4ae9df5a function name change 2016-11-16 22:09:22 +00:00
Chris Collins
44b2b090df Merge pull request #9010 from samcake/orange
Improve Input Stage Format switching in GL45Backend
2016-11-16 14:00:17 -08:00
Dante Ruiz
ff7c11d48c Fixed avatar parent delete issue 2016-11-16 13:03:34 -08:00
Brad Davis
fa841620ab Disable glow line temporarily while fixing implementation 2016-11-16 12:50:47 -08:00
Ryan Huffman
75eafbb349 Add docs to Paths 2016-11-16 12:11:32 -08:00
Ryan Huffman
179eed5d11 Add Vec2 and Vec3 defiitions to jsdoc 2016-11-16 11:56:42 -08:00
Ryan Huffman
7e9df928f4 Add jsdoc comments to Menu 2016-11-16 10:49:50 -08:00
samcake
b74a1af5ba Merge branch 'master' of https://github.com/highfidelity/hifi into orange 2016-11-16 10:48:30 -08:00
Anthony J. Thibault
066ddad25a Reduced MAX_CONCURRENT_WEB_VIEWS from 100 to 20. 2016-11-16 09:39:55 -08:00
Brad Davis
fda2cde006 Fix buffer leak in line entity 2016-11-15 14:16:54 -08:00
Brad Hefta-Gaub
84573d373b Merge pull request #9070 from huffman/fix/docs
Add jsdoc to Camera
2016-11-15 13:46:16 -08:00
Ken Cooke
b19a44e046 On Windows, set audio format to match the internal mix format.
This works around multichannel bugs in the Qt audio framework.
2016-11-15 10:37:32 -08:00
samcake
80240123b9 Merging with upstream 2016-11-15 10:01:06 -08:00