298 commits

Author	SHA1	Message	Date
amantley	c9db426ce4	Merge remote-tracking branch 'upstream/master' into animSplineIK	2019-02-21 14:36:13 -08:00
amantley	6323f49f26	changed the define variable to HIFI_USE_OPTIMIZED_IK	2019-02-21 14:36:05 -08:00
Angus Antley	b6bc467f4b	added HIFI_USE_Q_OS_ANDROID to cmake lists and to MySkeletonModel	2019-02-21 06:42:55 -08:00
amantley	f8a74efdc2	fixed build errors from jenkins	2019-02-20 17:59:45 -08:00
Brad Davis	00ed86d1cf	fixing typo	2019-02-15 14:34:40 -08:00
Brad Davis	4409e59682	Add per-android-app preprocessor macros	2019-02-15 14:11:26 -08:00
Brad Davis	e534270f9a	Merge remote-tracking branch 'upstream/master' into feature/quest_custom_plugins	2019-02-11 15:41:32 -08:00
Sam Gateau	466da1bd05	Merge pull request #14783 from NissimHadar/20816-installOnAndroid ... Case 20816: install on android (Mac and Windows installers)	2019-02-07 17:02:40 -08:00
Brad Davis	d3301803d3	Support custom display / input plugin lists and small tweaks	2019-02-07 15:15:26 -08:00
NissimHadar	cc3a74b7a0	Merge branch 'master' of github.com:highfidelity/hifi into 20816-installOnAndroid	2019-02-05 09:01:46 -08:00
Brad Davis	fed9e27a66	Expose current android app name to source code	2019-01-30 16:23:21 -08:00
NissimHadar	a2bae0b329	Fixing merge issues.	2019-01-25 18:15:26 -08:00
Brad Davis	81a7fa17bf	PR feedback	2019-01-25 11:14:40 -08:00
Brad Davis	61ea0de742	Update build files based on move	2019-01-15 15:16:14 -08:00
Brad Davis	2691c39d66	PR feedback	2018-11-08 12:47:53 -08:00
Brad Davis	8c4f0ec774	Vcpkg migration	2018-11-08 12:28:06 -08:00
Bradley Austin Davis	95d160a170	Working on mac GL issues	2018-10-26 11:23:29 -07:00
Anthony Thibault	2bc99d3894	CMP0074 Warning: Proper check for cmake versions 4.x and higher	2018-10-19 15:17:29 -07:00
Anthony Thibault	c19194fed5	Squelch cmake warning CMP0074 without requiring an update to cmake 3.12.	2018-10-15 16:12:28 -07:00
Roxanne Skelly	f8409b3977	dd server-console to client build	2018-10-01 11:29:55 -07:00
Brad Davis	ae8f841912	Shader refactoring for explicit bindings	2018-08-03 14:58:11 -07:00
Brad Davis	e81d2809c1	Fix unit testing setup	2018-05-17 15:05:40 -07:00
Brad Davis	f206456cdd	Restoring manual tests to solution, removing dead tests	2018-05-09 13:20:47 -07:00
Stephen Birarda	b52a877d8d	optionally grab serverless tutorial, on for installers	2018-03-26 14:32:11 -07:00
John Conklin II	283aff71ec	Merge pull request #12612 from jherico/gl_common ... Break out common GL and GLES code into a single shared library	2018-03-21 11:28:24 -07:00
Stephen Birarda	1405c8fcb3	add a client only option to cmake	2018-03-20 14:20:58 -07:00
Stephen Birarda	283eccd043	remove unneeded ANDROID block, revert removed line in NSIS	2018-03-15 16:21:49 -07:00
Stephen Birarda	f8df90e36d	disable the sixense plugin by default	2018-03-15 13:53:10 -07:00
Brad Davis	6fe75a3ca4	Breaking out common gpu-gl code	2018-03-09 16:39:47 -08:00
Bradley Austin Davis	52af45a355	Create scribe only build mode	2018-02-07 09:47:51 -08:00
Brad Davis	d10d7026c5	Force Qt to use ANGLE when in GLES mode on Windows	2018-01-15 13:42:41 -08:00
Brad Davis	58d4d193f7	Add command line disabling of QML and KTX cache	2018-01-13 12:22:00 -08:00
Brad Davis	22d133c71f	Allow GLES client on desktop builds	2018-01-11 23:31:34 -08:00
Brad Davis	6cff86b0f3	Fix polyvox archive, correct build errors, add additional libraries	2017-12-12 18:29:36 -08:00
Bradley Austin Davis	9df9cf7a47	Adding more libs, ifdefs for android incompatible code	2017-12-11 13:18:23 -08:00
Seth Alves	66191a5419	Merge pull request #11291 from ElderOrb/optional-build-tools ... make building tools (besides 'scribe') optional	2017-10-08 10:02:28 -07:00
Bradley Austin Davis	b93e91b9f3	New android toolchain	2017-09-19 13:45:12 -07:00
beholder	04305155d0	make building tools (besides 'scribe') optional	2017-09-14 23:16:12 +03:00
Brad Davis	9c03fa0369	Cleanup CMake	2017-09-02 16:15:14 -07:00
beholder	a18410ef07	make building tests optional	2017-08-23 00:40:14 +03:00
Stephen Birarda	c7edc98d5c	remove deprecated CMake policy no longer needed	2017-08-09 18:47:50 -07:00
Brad Davis	3a31805dff	Fix warnings in Qt 59 / VS 2017 build	2017-07-20 11:57:12 -07:00
David Rowe	727ba1320a	Add unpublishedScripts content to the JS project	2017-05-21 11:15:51 +12:00
Brad Davis	a8de6eab8c	Organize the files in the JS and QML projects to appear in a folder hierarchy	2017-04-20 14:39:06 -07:00
Brad Davis	8116de7c14	Force thread linkage	2017-03-23 13:45:13 -07:00
Vladyslav Stelmakhovskyi	2d2b2094fd	Adding ability for QML/JS file to be visible in QtCreator. Also changed files will be installed to destination	2017-03-07 10:11:09 +01:00
Brad Davis	ecfe56085d	GLM update and GLI integration	2016-09-09 10:18:15 -07:00
Stephen Birarda	a94fe62b37	use shared libc++ to reduce shared lib size	2016-09-01 10:56:49 -07:00
Stephen Birarda	85ba0f36cf	fix controllers/shared compile for android interface port	2016-08-31 16:34:31 -07:00
Stephen Birarda	47f15f6ad8	use libc++ and clang toolchain	2016-08-31 16:16:40 -07:00