68309 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Sam Gateau	b771253467	Merge pull request #13225 from AndrewMeadows/workload ... workload: merge from master	2018-05-23 16:16:11 -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
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
druiz17	f2807e38f9	fix goto shortcut	2018-05-19 17:36:46 -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
Liv Erickson	29b11b9101	some fixes to server cloneables	2018-05-18 17:12:41 -07:00
Dante Ruiz	8a2b54c2b7	fixing mistakes	2018-05-18 17:09:41 -07:00
tapalisa	1a06278b17	Merge pull request #13203 from ctrlaltdavid/21876-a ... Move Shapes app from hifi to hifi-content	2018-05-18 16:52:30 -07:00
Liv	0927cadf10	Merge pull request #13093 from RebeccaStankus/edit-bug-14671 ... moved checkEditPermissionsAndUpdate function to higher scope	2018-05-18 16:44:53 -07:00
Liv	99960b3024	Merge pull request #13085 from ctrlaltdavid/21863 ... Fix intermittent ability to select particle and light entities	2018-05-18 16:44:11 -07:00
Dante Ruiz	3b59af3ed7	Merge branch 'master' of github.com:highfidelity/hifi into menu-updates	2018-05-18 16:42:31 -07:00
Dante Ruiz	60dd7e49ab	making requested changes	2018-05-18 16:41:39 -07:00
Sam Gateau	8ae253019c	Merge pull request #13201 from samcake/brown ... Fix Flickery Procedural Shader	2018-05-18 16:11:21 -07:00