28289 commits

Author	SHA1	Message	Date
samcake	55ec0d3e84	Fixing the merge conflicts and repairing the regulation values	2018-05-24 17:25:00 -07:00
samcake	559d436dfa	Fixing the merge conflicts	2018-05-24 16:57:10 -07:00
John Conklin II	caee987d96	Merge pull request #13210 from SamGondelman/macSkybox ... Mac: render unsupported BPTC textures as uncompressed	2018-05-24 14:52:11 -07:00
John Conklin II	36d2baab60	Merge pull request #13214 from SamGondelman/primCrash ... Fix crash in GL45Backend::do_drawIndexedInstanced	2018-05-24 13:33:06 -07:00
John Conklin II	04bf8f851f	Merge pull request #13219 from samcake/one ... Bringing Evolution to the Job Engine Task library developed in the workload project to master	2018-05-24 13:30:16 -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	31dd59d212	double bits in collision groups	2018-05-24 11:28:52 -07:00
samcake	c29b93b986	Merging with latest master and bringin low hanging fruits from Andrews pr	2018-05-23 17:49:10 -07:00
samcake	40370f860a	Merge branch 'workload' of https://github.com/highfidelity/hifi into workload	2018-05-23 17:26:08 -07:00
samcake	c66b592b3a	MOVe the feedINput functions at the right spot	2018-05-23 17:04:00 -07:00
samcake	7ed39f4052	Adjusting the syntax to have linux compiling maybe	2018-05-23 16:16:57 -07:00
samcake	cf58f31f3e	Renaming the render::Engine to render::RenderEngine so the instancied Engine class coming from the task namesapce from which it derives, is just named 'Engine'	2018-05-23 15:08:48 -07:00
Andrew Meadows	d50da2babc	Merge 'master' into 'workload'	2018-05-23 14:51:05 -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
samcake	55945b5454	Remove deprecated and commented code	2018-05-23 12:36:20 -07:00
samcake	b06356b0fd	Remove deprecated and commented code	2018-05-23 11:58:25 -07:00
samcake	4985207b45	Merge branch 'master' of https://github.com/highfidelity/hifi into one	2018-05-22 17:40:54 -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
SamGondelman	9dfc61a452	possible fix for gl crash	2018-05-22 12:51:32 -07:00
Liv Erickson	7efcc135e4	reorder flags	2018-05-22 11:03:41 -07:00
Liv Erickson	e273a0c1a6	fix define properties	2018-05-22 09:10:50 -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
samcake	2dc28a504c	Merge branch 'master' of https://github.com/highfidelity/hifi into one	2018-05-21 15:52:42 -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
SamGondelman	45289dea09	on mac, render unsupported bptc textures (skyboxes) as uncompressed	2018-05-21 14:27:18 -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
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
samcake	03271d6818	Merge branch 'master' of https://github.com/highfidelity/hifi into one	2018-05-21 10:38:44 -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	88163424f0	Merge pull request #13164 from SimonWalton-HiFi/entities-relaying ... Move down OctreeQueryNode::_viewMutex to OctreeQuery	2018-05-21 10:14:41 -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 Gateau	e1690a28e1	Merging with master	2018-05-20 23:04:11 -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
Liv Erickson	6c8d68afc6	add extra cleanup in delete messages and simulation, as a fall back	2018-05-18 18:18:42 -07:00
Simon Walton	e4130dbf39	Merge remote-tracking branch 'upstream/master' into half-baked-model	2018-05-18 17:48:52 -07:00