68048 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Bradley Austin Davis	3beb77694f	Cached shader binaries and uniform data for shaders	2018-05-24 12:42:33 -07:00
Sam Gateau	1614758dbb	Merge pull request #13109 from AndrewMeadows/upgrade-bullet-2.88 ... upgrade from Bullet-2.83 to Bullet-2.88	2018-05-24 12:11:20 -07:00
Andrew Meadows	288efb1f93	remove cuft	2018-05-24 11:30:12 -07:00
Andrew Meadows	885c7bc97d	bump protocol for extra byte in collisionMask	2018-05-24 11:28:52 -07:00
Andrew Meadows	d42375e4fe	finish uint8_t to uint16_t conversion	2018-05-24 11:28:52 -07:00
Andrew Meadows	14f776cfb7	upgrade android bullet dependency to 2.88	2018-05-24 11:28:52 -07:00
Andrew Meadows	7e03b8b33c	one more try to eliminate windows compile warnings	2018-05-24 11:28:52 -07:00
Andrew Meadows	da7dc487cc	remove windows build warnings in Bullet lib	2018-05-24 11:28:52 -07:00
Andrew Meadows	31dd59d212	double bits in collision groups	2018-05-24 11:28:52 -07:00
Andrew Meadows	1112609ae7	upgrade to Bullet-2.88	2018-05-24 11:28:52 -07:00
John Conklin II	373660acbc	Merge pull request #13034 from AndrewMeadows/upgrade-to-glm-0.9.8.5 ... upgrade to glm-0.9.8.5	2018-05-24 11:04:06 -07:00
Andrew Meadows	30b2eb0740	update android glm dependency to 0.9.8.5	2018-05-23 14:52:28 -07:00
Andrew Meadows	d95371ae79	HACK: bypass android's baseUrl inflexibility	2018-05-23 14:52:28 -07:00
Andrew Meadows	1c0f6818a3	apply orenh1's patch to make GLM-0.9.8.5 compile on updated linux	2018-05-23 14:52:28 -07:00
Andrew Meadows	aedb5cc746	upgrade to glm-0.9.8.5	2018-05-23 14:52:28 -07:00
John Conklin II	3e665fb616	Merge pull request #13179 from dback2/cloneables ... Server-Managed Cloneables + Cloneable Properties	2018-05-23 12:40:27 -07:00
Liv Erickson	56493346c1	fix permissions check	2018-05-22 15:41:48 -07:00
John Conklin II	52a05680e7	Merge pull request #12895 from vladest/menu-updates ... Menu Cleanup and Reorganization	2018-05-22 13:21:08 -07:00
Liv Erickson	0ebd13b3e6	cannot edit origin from client / fix ICE issue	2018-05-22 13:17:23 -07:00
Liv Erickson	7efcc135e4	reorder flags	2018-05-22 11:03:41 -07:00
Dante Ruiz	c4f39841f5	fix another menu name changes that broke snapshot	2018-05-22 10:46:20 -07:00
Sam Gateau	937955dd45	Merge pull request #13191 from jherico/feature/unit_testing ... More unit testing work	2018-05-22 10:00:24 -07:00
Liv Erickson	e273a0c1a6	fix define properties	2018-05-22 09:10:50 -07:00
Dante Ruiz	9df79462ad	fix snapshot	2018-05-22 09:06:10 -07:00
Liv Erickson	27c2bb9046	add properties group where missing	2018-05-21 17:39:08 -07:00
Liv Erickson	a1e7f648bc	add debug properties	2018-05-21 17:14:36 -07:00
Liv Erickson	e76829bb1d	change to DEFINE_PROPERTY_REF	2018-05-21 16:51:23 -07:00
Liv Erickson	604b3cac1c	check for null entities in grab, add conversion for old userdata cloneable	2018-05-21 16:19:43 -07:00
Sam Gateau	87989268bf	Merge pull request #13182 from jherico/feature/batch_pooling ... Use pooled gpu batches	2018-05-21 15:47:55 -07:00
Sam Gateau	a1c948c0f0	Merge pull request #13127 from SimonWalton-HiFi/half-baked-model ... Incorrectly baked model crashes Interface	2018-05-21 15:30:42 -07:00
Dante Ruiz	5fb08d0d9c	fix speech api not showing up	2018-05-21 14:21:21 -07:00
Brad Davis	9c26b2c1d3	Use pooled gpu batches	2018-05-21 13:53:44 -07:00
Simon Walton	c205a856a7	Split canned FBX header in two; only check first part on read	2018-05-21 13:29:08 -07:00
John Conklin II	61eccabb56	Merge pull request #13208 from jherico/fix/texture_warnings ... Fixing populated / allocated tracking for textures	2018-05-21 13:27:56 -07:00
Sam Gondelman	6e7282bbb8	Merge pull request #13183 from Cristo86/android_search_mobile_domains ... Filter domains by tag 'mobile' in Search (Android)	2018-05-21 13:16:46 -07:00
Brad Davis	6daffba18e	Fixing populated / allocated tracking for textures	2018-05-21 11:51:05 -07:00
John Conklin II	168edb1cde	Merge pull request #13192 from druiz17/fix-spaming-set-host ... fix case sensitive comparison in AddressManager::setHost	2018-05-21 11:16:18 -07:00
Dante Ruiz	249d22b4b4	Merge branch 'master' of github.com:highfidelity/hifi into menu-updates	2018-05-21 10:31:24 -07:00
Sam Gateau	3d4964559d	Merge pull request #13202 from jherico/fix/texture_warnings ... Fix logspam from texture transfer code	2018-05-21 10:20:40 -07:00
John Conklin II	b4b0906f31	Merge pull request #13122 from druiz17/fix-highlight-when-pointing-at-sky ... remove highlight on entity when point to the sky	2018-05-21 10:16:09 -07:00
John Conklin II	88163424f0	Merge pull request #13164 from SimonWalton-HiFi/entities-relaying ... Move down OctreeQueryNode::_viewMutex to OctreeQuery	2018-05-21 10:14:41 -07:00
Anthony Thibault	4f69ae253d	Merge pull request #12906 from Triplelexx/21794_move_inspect ... WorkList #21794: Modify inspect.js to work with Avatars as well as entities	2018-05-21 09:40:42 -07:00
Sam Gondelman	45beb686a0	Merge pull request #13204 from SamGondelman/hudCrash ... Protect against null hudTexture	2018-05-21 09:31:08 -07:00
Sam Gondelman	6eb6a5b767	Merge pull request #13197 from gcalero/your_last_location ... Add "Your Last Location" to Android Home	2018-05-21 09:28:56 -07:00
Thijs Wenker	7f4e9a0089	style	2018-05-21 06:17:08 +02:00
Thijs Wenker	f4df75d016	CR feedback	2018-05-21 06:04:05 +02:00
Livi Erickson	70bbac5c83	update with lastEditedCheck	2018-05-20 18:49:41 -07:00
Livi Erickson	9f7b383757	address CR feedback	2018-05-20 18:22:17 -07:00
Livi Erickson	9c0084209b	fix style error, start lifetime properly for cloned entities	2018-05-20 16:41:14 -07:00
druiz17	bd3a9865bf	moving control speech to developer menu	2018-05-19 18:27:28 -07:00