79 commits

Author	SHA1	Message	Date
Sam Gateau	4c1bf6af47	REmoving comments	2017-07-07 11:38:25 +02:00
Sam Gateau	ca7e782566	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-06-29 10:54:27 +02:00
Thijs Wenker	d5289d357b	I need to setup my code-editor, spaces.	2017-06-29 01:01:59 +02:00
Thijs Wenker	93679f7c3b	move the ResourceManager init back to where it was, to prevent problems	2017-06-29 00:52:51 +02:00
Seth Alves	794495c197	make ResourceManager be owned by DependencyManager	2017-06-28 14:18:14 -07:00
Brad Davis	8130a91b8c	Cleanup entity dependencies	2017-06-27 19:15:49 -07:00
Sam Gateau	75e457ce7c	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-06-26 10:05:04 +02:00
Seth Alves	5af07dfb62	more memory-debugger	2017-06-23 08:16:48 -07:00
samcake	20d8c11e28	ALmost there, getting eback everything to work with the light and background stages in the scene, not in deferredLighting Effect anymore	2017-06-22 17:54:16 -07:00
Brad Davis	fece438602	Cleanup and refactoring	2017-06-15 18:58:56 -07:00
samcake	044110e4f3	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-24 15:40:40 -07:00
samcake	80b6fd65ae	Cleaning up counters and naming schemes...	2017-05-17 18:31:28 -07:00
samcake	bc41be7ec1	Introucing the BackgroundStage to manage the background / skybox in one place	2017-05-09 17:10:05 -07:00
Brad Davis	2d0bbf70ae	Migrate core avatar rendering functionality to library	2017-05-04 14:08:59 -07:00
Atlante45	33f58f99d1	CR	2017-04-25 16:09:31 -07:00
Seth Alves	371118a6c0	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1	2017-04-14 16:26:30 -07:00
Seth Alves	74c0a70cb0	rename base action classes to dynamics, start on constraints	2017-04-11 20:39:13 -07:00
Sam Cake	b65448bcbe	Trying to improve the Job/Task classes and testing it with the ZoneRenderer	2017-04-09 11:08:35 -07:00
samcake	6122155880	Renaming the PendingCHanges class to Transaction	2017-04-05 13:10:31 -07:00
Brad Hefta-Gaub	9a38b36f59	Merge pull request #9970 from Triplelexx/21223 ... 21223 - Quat functions have naming inconsistencies	2017-03-24 08:12:11 -07:00
Triplelexx	216f20ed2c	rename fronts to forwards	2017-03-22 19:03:39 +00:00
Brad Davis	27e8750b9b	Adding new storage backing for gpu::Texture, moving mip format into Storage abstraction	2017-02-19 18:11:56 -08:00
Bradley Austin Davis	7fb7aa87eb	Working on new texture management strategy	2017-02-17 07:53:16 -08:00
Zach Pomerantz	26cfc83e20	Merge branch 'master' into graphics/fetch-cull-sort	2017-01-03 14:04:39 -05:00
Zach Pomerantz	0e9da87549	FetchSortCull->FetchCullSort	2016-12-29 19:27:37 -05:00
Brad Hefta-Gaub	a72f60152b	audit use of QTimer intervals to make sure we're using Qt::PreciseTimer when appropriate	2016-12-29 08:53:37 -08:00
Zach Pomerantz	ca1a14e5b0	add RenderFetchSortCull task	2016-12-23 15:54:22 -05:00
Brad Davis	e58623bcc0	Working on test/trace script interface	2016-12-22 11:46:40 -08:00
Brad Davis	30a9961362	tracing polish	2016-12-16 14:02:27 -08:00
Ryan Huffman	7bb2755913	Add chrome tracing support	2016-12-16 01:14:01 -08:00
Brad Davis	5cbf7588ac	Fixes for building on MSVC 2015 / Qt 5.8	2016-12-02 14:58:09 -08:00
Brad Davis	3b07e31eab	Working on OpenGL debuggability	2016-11-29 13:15:56 -08:00
samcake	d806b088a9	Merge branch 'master' of https://github.com/highfidelity/hifi into hdr	2016-11-23 15:05:52 -08:00
Brad Davis	f2118614da	Fix camera in render perf test	2016-11-23 10:30:52 -08:00
samcake	784a0540ed	Merge branch 'master' of https://github.com/highfidelity/hifi into hdr	2016-11-10 10:05:03 -08:00
Bradley Austin Davis	9e929ca629	Re-enable downsampling for non-sparse textures	2016-11-09 12:09:24 -08:00
samcake	6926cd274c	Merge with upstream	2016-11-02 18:15:08 -07:00
Seth Alves	3ad748cfe2	Merge branch 'master' of github.com:highfidelity/hifi into possible-fix-for-2068	2016-10-28 16:41:39 -07:00
Zach Pomerantz	e2826d311f	fix test interface	2016-10-28 14:57:18 -07:00
Seth Alves	f47aeae2a7	stop passing bare pointers to EntityTreeRenderer all around	2016-10-27 10:10:22 -07:00
Atlante45	bad96d54ea	TCP congestion control first draft	2016-10-18 15:54:25 -07:00
samcake	6f7f949343	Merge branch 'master' of https://github.com/highfidelity/hifi into hdr	2016-10-06 09:35:48 -07:00
Brad Davis	f3f55c9857	Fixing render-perf	2016-10-02 11:44:35 -07:00
Brad Davis	488d191428	Remove all oglplus usage and references	2016-10-02 11:44:34 -07:00
samcake	9b94a025fc	Refining the voxelization of the sphere in the view frustum grid	2016-09-26 18:41:53 -07:00
Brad Davis	2dd93e0586	Disable debug command list	2016-09-23 12:05:14 -07:00
Brad Davis	2886c51a29	Fixing use of widgets in test app	2016-09-23 12:05:08 -07:00
Brad Davis	2de7f62b95	Fixing loop logic	2016-09-23 12:05:07 -07:00
Brad Davis	5dbaa671ca	Add some more debugging in render perf test	2016-09-23 12:05:03 -07:00
Brad Davis	2a058fa419	Add file logging to perf tool	2016-09-23 12:04:59 -07:00