28065 commits

Author	SHA1	Message	Date
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
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
John Conklin II	52a05680e7	Merge pull request #12895 from vladest/menu-updates ... Menu Cleanup and Reorganization	2018-05-22 13:21:08 -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
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
Simon Walton	e4130dbf39	Merge remote-tracking branch 'upstream/master' into half-baked-model	2018-05-18 17:48:52 -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
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
Sam Gondelman	74840d2130	Merge pull request #12935 from gcalero/android_new_login ... Android new login	2018-05-17 15:53:25 -07:00
David Rowe	33ba559bb4	Show all OverlayWebWindows properties and functions together	2018-05-18 08:02:02 +12:00
David Rowe	2669a39e0f	Deprecate Agent API items that shouldn't be exposed in the API	2018-05-18 07:32:25 +12:00
Clement	da08d747dc	Merge branch 'stable' of https://github.com/highfidelity/hifi into new-master	2018-05-17 12:10:08 -07:00
Gabriel Calero	8741c5e6a4	Make haptic pulse duration configurable in VirtualPadDevice	2018-05-17 11:37:13 -03:00
David Rowe	6db4dd8673	Merge branch 'master' into 21872-b ... # Conflicts: # interface/src/ui/Snapshot.h	2018-05-17 20:11:14 +12:00
David Rowe	145d73aa76	OverlayWebWindow JSDoc fixes	2018-05-17 19:18:00 +12:00
John Conklin II	4ce4afe0b1	Merge pull request #13180 from Cristo86/android_no_joystick_fix ... Fix Joystick/Control not showing up in Samsung after typing address (Android)	2018-05-16 15:41:24 -07:00
samcake	adc8a07d3c	Merge branch 'RC67.2' of https://github.com/highfidelity/hifi into rc67.2-taaOn	2018-05-16 13:14:14 -07:00
samcake	21e069c90c	Adding a toggle button to the developer/Render menu to be able to disable taa and fall back to Fxaa	2018-05-16 13:09:55 -07:00
Sam Gateau	523d57d948	Merge pull request #13162 from AndrewMeadows/avatar-collisions ... avatars collide again	2018-05-16 09:25:05 -07:00
Cristian Luis Duarte	b5e8adfc39	Use availableSize() to get screen size instead of size() as it returns a wrong screen size on some Samsung devices (misplacing controls that are relative to screen size)	2018-05-16 12:53:39 -03:00
Gabriel Calero	5afc9c6df3	Merge remote-tracking branch 'upstream/master' into android_new_login	2018-05-16 12:45:17 -03:00