1151 commits

Author	SHA1	Message	Date
Stephen Birarda	8a331e29a2	Merge pull request #11455 from utkarshgautamnyu/feat/JS-Baker ... Feat/JS-Baker	2017-10-12 16:16:02 -05:00
utkarshgautamnyu	75aa3a73ad	changed pointer args to references in JSBaker:bakeJS()	2017-10-12 12:08:44 -07:00
utkarshgautamnyu	da8b2d2137	Update JSBakerTest.cpp	2017-09-29 13:33:07 -07:00
utkarshgautamnyu	cae1560708	Update JSBakerTest.cpp	2017-09-28 13:25:08 -07:00
utkarshgautamnyu	16a75d20dc	Update JSBakerTest.cpp	2017-09-28 11:58:07 -07:00
utkarshgautamnyu	305719da24	Update JSBakerTest.h	2017-09-28 11:47:39 -07:00
utkarshgautamnyu	463afd6be5	made updates to fix building	2017-09-28 11:12:26 -07:00
utkarshgautamnyu	290e3d307c	Create JSBakerTest.cpp	2017-09-27 18:06:35 -07:00
utkarshgautamnyu	354fa12d36	Create JSBakerTest.h	2017-09-27 18:05:28 -07:00
utkarshgautamnyu	e4c25c0aa1	Create CMakeLists	2017-09-27 18:04:08 -07:00
samcake	f16c552978	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-09-26 17:18:05 -07:00
Bradley Austin Davis	e42068f681	Merge branch 'master' into android_new	2017-09-26 14:31:29 -07:00
samcake	11c55755d5	Removing unused call	2017-09-25 15:10:40 -07:00
Brad Davis	549cb77902	Fix dimensions of rendered web entities	2017-09-21 20:59:01 -07:00
Bradley Austin Davis	b93e91b9f3	New android toolchain	2017-09-19 13:45:12 -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
Sam Cake	7f9c98a922	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-05-22 22:54:43 -07:00
Andrew Meadows	7b879a7964	Model has a Rig rather than a RigPointer	2017-05-19 13:24:16 -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
samcake	4514da2a09	Merge branch 'master' of https://github.com/highfidelity/hifi into ambient	2017-05-01 16:49:35 -07:00
Anthony J. Thibault	58de67ba11	Fix tests/controllers/src/main.cpp clang/gcc warnings	2017-04-28 14:12:00 -07:00
Atlante45	8269e01474	Fix atp-get compile error	2017-04-26 10:49:23 -07:00
Ryan Huffman	472c888529	Fix handling of failed ktx downloads	2017-04-26 10:48:24 -07:00
Atlante45	33f58f99d1	CR	2017-04-25 16:09:31 -07:00
Atlante45	fc1b920341	Add ability to disable texture compression	2017-04-25 15:56:23 -07:00
Atlante45	ad16a935e9	Texture::create returns shared pointer	2017-04-25 15:56:23 -07:00
Atlante45	d9a7615cc8	Add compression support for skyboxes	2017-04-25 15:56:23 -07:00
Atlante45	a450f52427	Start to setup image library	2017-04-25 15:56:22 -07:00
samcake	8e73fa3eb4	Separating the task classes in their own folder, and easing the declaration	2017-04-21 18:16:07 -07:00
Seth Alves	17b83dd64c	Merge branch 'master' of github.com:highfidelity/hifi into bullet-constraints-1	2017-04-21 17:19:47 -07:00
samcake	63fe579022	simply removing the SceneContext from the engine/task run call since we never used it and can unify into the RenderContext instead'	2017-04-18 17:05:40 -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
samcake	a2b2e3e169	Revert "Revert "Don't hold KTX files open for longer than transfers require""	2017-03-28 14:45:04 -07:00
samcake	08e1a2ba4c	Revert "Don't hold KTX files open for longer than transfers require"	2017-03-28 14:06:09 -07:00
samcake	e42cb52bd1	Merge pull request #10020 from jherico/ktx_refactor ... Don't hold KTX files open for longer than transfers require	2017-03-28 14:06:02 -07:00
Bradley Austin Davis	f764cd614b	Don't hold KTX files open for longer than transfers require	2017-03-27 13:33:00 -07:00
samcake	25d39d2430	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-03-27 09:50:44 -07:00
Seth Alves	7455dcc2db	Merge pull request #9985 from jherico/cmake_threads ... Force thread linkage	2017-03-26 07:27:07 -08:00
samcake	a0488cfb91	Merge branch 'master' of https://github.com/highfidelity/hifi into brown	2017-03-24 09:41:09 -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
samcake	618344fe98	Fixing the bug regarding the numMIps allocated by GLBackend and breaking the HalfRezDepthTexture	2017-03-23 18:10:09 -07:00
Brad Davis	5a5eb6e168	Still trying to fix build error	2017-03-23 14:09:34 -07:00
Triplelexx	216f20ed2c	rename fronts to forwards	2017-03-22 19:03:39 +00:00
Brad Davis	8782fe1d93	Merge branch 'master' into smarter_textures ... Conflicts: libraries/model-networking/src/model-networking/TextureCache.cpp	2017-03-06 15:29:41 -08:00
Ken Cooke	818425707b	update unit tests	2017-03-04 16:14:31 -08:00
Bradley Austin Davis	9051c84b6d	Fix warnings	2017-03-03 14:16:27 -08:00
Bradley Austin Davis	5b1cd5443d	Fix KTX includes	2017-03-03 11:13:11 -08:00