1087 commits

Author	SHA1	Message	Date
Brad Davis	549cb77902	Fix dimensions of rendered web entities	2017-09-21 20:59:01 -07:00
Brad Davis	e817d3ced4	Threaded rendering & entity rendering refactor	2017-08-24 13:34:34 -07:00
Sam Gateau	79f3be1efe	Merge pull request #11021 from Zvork/fade2 ... Fade dissolve effect JUST AVATARS	2017-08-10 13:48:30 -07:00
Seth Alves	186035dc5d	adjust various things that cause a crash-on-exit on Linux	2017-08-06 11:57:55 -07:00
Brad Davis	86e3489167	Updates from Threaded Rendering project	2017-08-04 15:22:14 -07:00
Olivier Prat	490aad2a06	Merged from master	2017-07-31 12:00:35 +02:00
burtsloane	d4ae298a8d	Merge branch 'master' into midi	2017-07-26 13:59:07 -07:00
Burt Sloane	a960ea5ccb	Linux build	2017-07-26 13:32:23 -07:00
Burt Sloane	246a5c9fa4	1 more	2017-07-26 08:59:48 -07:00
Burt Sloane	d2975c79c9	add midi to 3 CMakeLists.txt for linking	2017-07-26 08:41:26 -07:00
Olivier Prat	2f9885870b	First merge with Sam's fader branch with custom pipeline support in shape plumber	2017-07-12 17:29:21 +02:00
Sam Gateau	49779754ff	Remove unecessary shaders and apply the custom shader pipeline to polyvox	2017-07-12 15:50:06 +02:00
Olivier Prat	06d69d04c3	TransitionStage + FadeJob compiling but not linked to entity events	2017-07-07 18:22:11 +02:00
Olivier Prat	4256a1f2a7	Preparing for merge with stage. DOESN'T COMPILE!	2017-07-07 15:16:20 +02:00
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
Seth Alves	a053a1da4b	more HIFI_MEMORY_DEBUGGING fixes	2017-06-22 13:50:46 -07:00
Seth Alves	7ff576ef18	add memory-debugging macro to some cmake files	2017-06-22 10:07:39 -07:00
Brad Davis	e3fb42eefd	Fix crash when cache File lifetime exceeds cache lifetime	2017-06-20 14:38:51 -07:00
Brad Davis	ed6620fc51	Merge pull request #10718 from jherico/frame_thread ... Cleanup and refactoring	2017-06-19 13:31:44 -07:00
Brad Davis	1d4b443113	Prevent cache ejection of textures in use	2017-06-19 09:51:11 -07:00
Brad Davis	fece438602	Cleanup and refactoring	2017-06-15 18:58:56 -07:00
Anthony Thibault	e3c342aa77	Merge pull request #10595 from hyperlogic/feature/spine-spline ... Spline IK target support	2017-06-08 18:09:55 -07:00
Anthony J. Thibault	606c6415ae	Merge branch 'master' into feature/spine-spline	2017-06-07 10:53:46 -07:00
Bradley Austin Davis	fc6a278217	Fixing dangling thread issues, consolidating thread management	2017-06-06 15:02:16 -07:00
Clément Brisset	67970182aa	Merge pull request #10579 from AndrewMeadows/fix-generateBasisVectors ... Fix generateBasisVectors() helper	2017-06-05 14:47:18 -07:00
Andrew Meadows	205e5d7309	add unit tests and fix final bugs	2017-06-05 08:54:05 -07:00
Andrew Meadows	347104204e	fix StorageTests on linux	2017-06-05 08:54:05 -07:00
samcake	0a3c1712eb	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-06-02 14:35:05 -07:00
Sam Cake	f9aa400b95	Refining the stencil configuration and triggering only in hmd mode	2017-06-02 00:22:38 -07:00
Brad Davis	b9f9cddea0	Add versioning support to the KTX cache	2017-06-01 17:16:24 -07:00
Brad Davis	3fdad14ca4	Merge pull request #10571 from jherico/ktx_tests ... FileCache refactoring and test, plus KTX unit tests	2017-06-01 16:09:14 -07:00
Sam Cake	0372deebff	Last warnings?	2017-05-31 22:09:30 -07:00
Brad Davis	a77491ccb1	FileCache refactoring and tests	2017-05-31 13:45:59 -07:00
Anthony J. Thibault	fc12d7547a	Addition of CubicHermiteSpline helper classes.	2017-05-30 14:25:29 -07:00
Brad Davis	765bd3890e	Improving test code for KTX library	2017-05-30 10:47:49 -07:00
samcake	882df7391b	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-26 16:47:49 -07:00
Sam Gateau	5b0d2f32b4	Merge pull request #10458 from jherico/ktx_validation ... Add KTX validation routines	2017-05-25 16:02:23 -07:00
Brad Davis	aa5aba428a	PR feedback	2017-05-25 15:03:39 -07:00
samcake	044110e4f3	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-05-24 15:40:40 -07:00
Brad Davis	191b633081	Refactor KTX defines and validation	2017-05-24 11:15:34 -07:00
Brad Davis	077e56a96f	Add KTX validation routines	2017-05-24 09:44:56 -07:00
samcake	e7b808cbc1	Merging with upstream	2017-05-23 12:12:31 -07:00