52442 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Howard Stearns	53d484c318	makes connections!	2017-03-29 13:23:31 -07:00
Howard Stearns	b0c97d3a82	putative connection integration for 2-machine testing	2017-03-29 12:22:26 -07:00
Howard Stearns	c795d2ca3b	Four-way discoverability. (Needs testing.)	2017-03-28 18:31:08 -07:00
howard-stearns	c2a49a582e	send credentials to local metaverse servers, and initial users data ... integration.	2017-03-28 16:44:16 -07:00
howard-stearns	37ab0b57a7	Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into pal-backend-integration	2017-03-28 15:41:46 -07:00
David Kelly	92718b6051	cr feedback	2017-03-28 08:57:27 -07:00
Zach Fox	fce2049630	Trivial removal of commented code	2017-03-27 16:45:03 -07:00
howard-stearns	85347e3269	new location protocol	2017-03-27 15:55:05 -07:00
David Kelly	5c1e085e7b	Merge branch 'PAL_v2' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-27 11:29:18 -07:00
David Kelly	76657a670c	added notifications (faked user name for now), along with switch to avatar entities	2017-03-27 11:28:57 -07:00
Zach Fox	e1a880a5d4	Merge branch 'master' of https://github.com/highfidelity/hifi into PAL_v2	2017-03-27 09:10:12 -07:00
Seth Alves	e5326d146e	Merge pull request #10003 from hyperlogic/feature/my-avatar-jsdoc ... Added jsdoc documentation for some of MyAvatar properties and methods	2017-03-26 07:55:41 -08:00
Seth Alves	90db9af2f9	Merge pull request #9978 from Triplelexx/fix-tablet-users-typo ... fix myVisibility typo	2017-03-26 07:36:11 -08:00
Seth Alves	7455dcc2db	Merge pull request #9985 from jherico/cmake_threads ... Force thread linkage	2017-03-26 07:27:07 -08:00
Seth Alves	66f8e4063d	Merge pull request #9984 from Atlante45/fix/warnings ... Fix warnings	2017-03-26 07:03:33 -08:00
samcake	8b1a0be754	Merge pull request #9997 from jherico/ktx_cache_fix ... Correctly initialize a file cache with the proper key	2017-03-25 09:58:32 -07:00
Zach Fox	e88895935b	Revert "Actually merge from master" ... This reverts commit 056d6fbe4f.	2017-03-24 17:56:48 -07:00
Anthony J. Thibault	f7de74109b	Added jsdoc documentation for some of MyAvatar properties and methods	2017-03-24 15:10:26 -07:00
Brad Davis	82d502ae9f	Correctly initialize a file cache with the proper key	2017-03-24 13:35:37 -07:00
Seth Alves	0d2e0eb9c3	Merge pull request #9994 from sethalves/avoid-deadlock-on-10k-mesh-fbx ... Avoid deadlock on 10k mesh fbx	2017-03-24 12:34:37 -08:00
Brad Hefta-Gaub	9b26e8ee95	Merge pull request #9871 from Triplelexx/21208 ... 21208 - Muted microphone indicator	2017-03-24 13:07:43 -07:00
Ryan Huffman	bb09dd9414	Merge pull request #9988 from huffman/fix/touch-detection-after-launch ... Fix Oculus Touch + Remote not being detected after initial launch	2017-03-24 11:37:57 -07:00
Lexx	fa606446a7	remove cache buster	2017-03-24 18:27:38 +00:00
Seth Alves	aaa78d108b	if a model has too many meshes, give up.	2017-03-24 11:17:24 -07:00
Seth Alves	e1e51614d9	don't hang loop if entity isDead	2017-03-24 11:16:54 -07:00
Clément Brisset	5ff7dbb254	Merge pull request #9991 from Atlante45/fix/entity-bad-url ... Show entity bounding box for bad URLs	2017-03-24 10:56:06 -07:00
Zach Fox	056d6fbe4f	Actually merge from master	2017-03-24 10:10:17 -07:00
Zach Fox	915ace0087	Revert "Merge from Master" ... This reverts commit e48123b5bb.	2017-03-24 10:04:51 -07:00
Brad Hefta-Gaub	1972b140b9	Merge pull request #9976 from mittens/21215 ... Worklist #21215 - Removing Duplicate Status Icons for Submeshes	2017-03-24 08:52:12 -07:00
Brad Hefta-Gaub	9a38b36f59	Merge pull request #9970 from Triplelexx/21223 ... 21223 - Quat functions have naming inconsistencies	2017-03-24 08:12:11 -07:00
Brad Hefta-Gaub	aa1883ba85	Merge pull request #9979 from jherico/crash_fix ... Fix crash in render-perf-test	2017-03-24 08:10:37 -07:00
Atlante45	4f8d9b190b	Show green box when model entity has bad url	2017-03-23 17:56:33 -07:00
Ryan Huffman	56c5f06365	Fix Oculus Touch + Remote not being detected after initial launch	2017-03-23 16:29:08 -07:00
Brad Hefta-Gaub	20bc32fc89	Merge pull request #9980 from birarda/bug/ac-agent-audio ... make sure the AC agent has an AudioScriptingInterface	2017-03-23 15:13:24 -07:00
Brad Davis	5a5eb6e168	Still trying to fix build error	2017-03-23 14:09:34 -07:00
Zach Fox	3f95982f34	Fix bug due to incorrect merge...	2017-03-23 14:00:50 -07:00
Brad Davis	8116de7c14	Force thread linkage	2017-03-23 13:45:13 -07:00
Zach Fox	a231b57472	Merge pull request #9962 from birarda/cmake-with-space ... Fix failing POST_BUILD steps on Windows with spaces in build path	2017-03-23 11:41:38 -07:00
Atlante45	d4353e1d19	Fix warnings	2017-03-23 11:39:42 -07:00
Zach Fox	98ee02f84f	Use OpacityMask instead of hack; fix connectionsTab	2017-03-23 10:49:31 -07:00
Zach Fox	a7623dcac8	Use OpacityMask instead of hack; fix connectionsTab	2017-03-23 10:48:44 -07:00
David Kelly	0edcdde746	better key mapping	2017-03-23 10:40:34 -07:00
David Kelly	a08346719c	one bit of defensive code, plus some temporary logging	2017-03-23 10:29:45 -07:00
Zach Fox	e48123b5bb	Merge from Master	2017-03-23 09:54:14 -07:00
samcake	73227f6598	Merge pull request #9958 from highfidelity/smarter_textures ... New texture streaming system	2017-03-23 09:44:31 -07:00
David Kelly	aa085e577d	more vis work	2017-03-23 09:19:04 -07:00
Stephen Birarda	b53cb5934b	make sure the AC agent has an AudioScriptingInterface	2017-03-22 23:35:29 -07:00
Brad Davis	944255a37b	Fix crash in render-perf-test	2017-03-22 22:44:05 -07:00
Brad Davis	3a40fd886f	Fix comparison between GL stamps and GPU stamps	2017-03-22 18:11:20 -07:00
Brad Davis	4868a1618a	Add initialization to sampler stamp	2017-03-22 18:10:54 -07:00