52945 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Dante Ruiz	119a71d0d1	Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-goto	2017-03-24 23:55:18 +01:00
Dante Ruiz	d9046a1982	goto on the tablet	2017-03-24 23:54:54 +01:00
Seth Alves	70c7ba92f7	Merge pull request #10004 from sethalves/tablet-ui ... Tablet ui -- merge from upstream	2017-03-24 14:18:42 -08:00
Seth Alves	f1470e34f9	Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui	2017-03-24 15:17:52 -07:00
Anthony J. Thibault	f7de74109b	Added jsdoc documentation for some of MyAvatar properties and methods	2017-03-24 15:10:26 -07:00
Seth Alves	59da607d07	Merge branch 'master' of github.com:highfidelity/hifi into model-scripting-2	2017-03-24 15:08:23 -07:00
Seth Alves	6e40f03c8e	cleanups	2017-03-24 15:08:13 -07:00
Stephen Birarda	3985354ff4	update graphic for oculus touch help with correct buttons	2017-03-24 13:45:56 -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
Seth Alves	8f7f5efade	new javascript call: Model.newMesh()	2017-03-24 12:51:00 -07:00
Seth Alves	642cf57976	obj-writer now outputs normals	2017-03-24 12:49:58 -07:00
Anthony J. Thibault	7e6ff7c2fb	Scrollbar is visible on marketplace in toolbar mode.	2017-03-24 11:40:10 -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
Anthony J. Thibault	54b11bb6ee	Hide the scrollbar on the marketplace	2017-03-24 11:22:50 -07: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
samcake	13b3809fe3	removing includes if possible	2017-03-24 11:04:52 -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
ZappoMan	52335e20a2	fix typo	2017-03-24 09:59:55 -07:00
ZappoMan	ddd0645453	fix merge issue	2017-03-24 09:59:11 -07:00
ZappoMan	84836d9331	fix typo that broke gun	2017-03-24 09:58:56 -07:00
samcake	a0488cfb91	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-03-24 09:41:09 -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
ZappoMan	bc331af6a0	Merge branch 'master' of https://github.com/highfidelity/hifi into removePropertiesFromRayPick	2017-03-24 08:46:43 -07:00
Seth Alves	154cd444ad	Merge pull request #9993 from sethalves/tablet-ui ... Tablet ui -- merge from upstream	2017-03-24 07:21:00 -08:00
Seth Alves	902e3d41d6	merge from upstream	2017-03-24 08:20:35 -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
Sam Cake	022e91b35d	Clean comments and pixel format used	2017-03-24 00:26:14 -07:00
Sam Cake	83abbaa64a	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-03-23 21:55:30 -07:00
samcake	618344fe98	Fixing the bug regarding the numMIps allocated by GLBackend and breaking the HalfRezDepthTexture	2017-03-23 18:10:09 -07:00
Atlante45	4f8d9b190b	Show green box when model entity has bad url	2017-03-23 17:56:33 -07:00
Stephen Birarda	a798773425	fix polyvox location for MinSizeRel	2017-03-23 17:31:02 -07:00
Stephen Birarda	85dc63a671	fix multi-line strings in VHACD and faceshift externals	2017-03-23 17:26:32 -07:00
Stephen Birarda	22c7d4032b	fix debug config handling of release faceshift lib	2017-03-23 17:13:19 -07:00
Stephen Birarda	6d38b1fe72	handle MinSizeRel configuration in vhacd external	2017-03-23 17:11:30 -07:00
Stephen Birarda	0367f70a39	interpolate CONFIG for polyvox library path	2017-03-23 17:07:51 -07:00
Stephen Birarda	ee521ed369	handle library release path for faceshift MinSizeRel build	2017-03-23 17:06:22 -07:00
Stephen Birarda	5311de1f7b	handle MinSizeRel library discovery for bullet external	2017-03-23 17:05:08 -07:00
Stephen Birarda	e100a7bedb	point VHACD external to correct library for RelWithDebugInfo	2017-03-23 16:54:21 -07:00
Stephen Birarda	670f51af0b	fix reference to RelWithDebugInfo library for polyvox	2017-03-23 16:50:03 -07:00
Stephen Birarda	be34e5a814	fix RelWithDebInfo path for faceshift	2017-03-23 16:46:52 -07:00
Ryan Huffman	56c5f06365	Fix Oculus Touch + Remote not being detected after initial launch	2017-03-23 16:29:08 -07:00
Dante Ruiz	a078121c46	saving work	2017-03-24 00:23:13 +01:00
Stephen Birarda	654ae5032b	simplify the RelWithDebInfo check in bullet ext	2017-03-23 16:11:48 -07:00
Stephen Birarda	b023cb71be	when building RelWithDebInfo check for correct bullet libs	2017-03-23 16:02:39 -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