28086 commits

Author	SHA1	Message	Date
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
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
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
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
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
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
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
Liv Erickson	29b11b9101	some fixes to server cloneables	2018-05-18 17:12:41 -07:00
Dante Ruiz	3b59af3ed7	Merge branch 'master' of github.com:highfidelity/hifi into menu-updates	2018-05-18 16:42:31 -07:00
Sam Gateau	8ae253019c	Merge pull request #13201 from samcake/brown ... Fix Flickery Procedural Shader	2018-05-18 16:11:21 -07:00
Sam Gateau	026cae09f7	Merge pull request #13200 from Cristo86/gles_ishazeenabled_error_fix ... Fix isHazeEnabled() checks with 0.0 to fix GLES compiler error	2018-05-18 15:44:24 -07:00
SamGondelman	484bda0f3c	check for null texture	2018-05-18 15:34:07 -07:00
Sam Gateau	07f1ab8c98	Merge pull request #13194 from SamGondelman/resolution ... Fix Scale Resolution option	2018-05-18 15:23:01 -07:00
Brad Davis	fb101cf036	Fix logspam from texture transfer code	2018-05-18 14:51:26 -07:00
samcake	0e66ca1dfd	Fixing the procedural shader flickering key lighting, this is due to the LightingMOdel binding slot not assigned	2018-05-18 13:25:08 -07:00
Cristian Luis Duarte	c7edf72f71	Check isHazeEnabled() vs 0.0 to compile on GLES	2018-05-18 15:59:24 -03:00
Simon Walton	7f2a90cdb9	Address couple of reviewer issues	2018-05-18 11:20:45 -07:00
Dante Ruiz	027d1ed50b	making requested changes	2018-05-18 11:07:11 -07:00
Liv Erickson	de05388ebf	Merge branch 'master' of github.com:highfidelity/hifi into clone-server	2018-05-18 10:42:26 -07:00
Brad Davis	3356486f27	Fix populated texture size tracking	2018-05-18 09:23:54 -07:00
Brad Davis	91f1d93d4e	Fix flicker while transferring texture data	2018-05-18 09:23:54 -07:00
Brad Davis	ae07036f20	Add ideal resource texture memory stat	2018-05-18 09:23:53 -07:00
Brad Davis	fb81cf927a	Faster texture transfers	2018-05-18 09:21:02 -07:00
Liv	40ff3f966f	Merge pull request #13165 from ctrlaltdavid/21872-b ... JSDoc stubs for various APIs	2018-05-18 09:11:55 -07:00
SamGondelman	c57c15f22c	fix resolution option	2018-05-17 16:58:35 -07:00
Dante Ruiz	48404d811c	fix case sensitive comparison	2018-05-17 16:34:52 -07:00
David Back	4e14eb37e3	update comment	2018-05-17 16:34:19 -07:00