68014 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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	e4048c8f23	remove extra comments	2018-05-23 15:12:21 -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
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
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
Dante Ruiz	9df79462ad	fix snapshot	2018-05-22 09:06:10 -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
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
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	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
Sam Gateau	e1690a28e1	Merging with master	2018-05-20 23:04:11 -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
Simon Walton	e4130dbf39	Merge remote-tracking branch 'upstream/master' into half-baked-model	2018-05-18 17:48:52 -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
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
Gabriel Calero	054e6041af	Code review changes	2018-05-18 19:43:41 -03:00
David Rowe	431c95cba9	Move Shapes app from hifi to hifi-content	2018-05-19 10:37:36 +12: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
Gabriel Calero	85cff19020	Use domain thumbnail for the last visited location	2018-05-18 18:32:04 -03: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