321 commits

Author	SHA1	Message	Date
Brad Davis	db641d25aa	Force rebuild for mac build issue	2019-11-21 07:52:15 -08:00
Brad Davis	543dcc5e8d	Fix mac build, disable unlable GA job	2019-11-20 16:19:40 -08:00
Brad Davis	0331a8e57d	Attempt to fix mac release builds	2019-11-20 15:24:10 -08:00
Maia Hansen	48cdbcf933	Merge pull request #16401 from jherico/github_actions ... DEV-2773: GitHub actions initial work	2019-11-19 11:46:52 -08:00
Brad Davis	d4b3a9ba49	Github actions	2019-11-18 15:20:37 -08:00
Sabrina Shanman	518d6a530a	Merge pull request #16507 from highfidelity/master ... Merge master into instancing	2019-11-18 13:54:33 -08:00
sabrina-shanman	a4c10e2903	Attempt fix for Android build	2019-11-01 10:39:43 -07:00
milad	ea373ac14c	First steps towards a screenshare app	2019-10-30 16:44:42 -07:00
amer cerkic	bae3ebd577	fix android local build	2019-07-24 14:07:58 -07:00
Atlante45	63bd80c65e	Force build with x64 toolchain	2019-07-22 11:29:34 -07:00
Brad Davis	6b34b0971f	Enable KHR_robustness option	2019-06-14 11:09:28 -07:00
Andrew Meadows	528a64c618	hack QT_CMAKE_PREFIX_PATH for Jenkins macos builds	2019-05-18 06:45:25 -07:00
Andrew Meadows	f4d9aa71a4	remove manual symbol stripping	2019-05-16 16:35:49 -07:00
Andrew Meadows	595edb9f6e	more correct QT_VERSION detection	2019-05-16 12:29:37 -07:00
Andrew Meadows	a4d43bbff9	more correct stripping of symbols APPLE and UNIX	2019-05-15 15:54:58 -07:00
Andrew Meadows	abc5a0e7e8	remove symbols for Release build	2019-05-15 14:59:58 -07:00
Andrew Meadows	4cf9673dbb	Merge master into 22007-hifiQtBuildv2	2019-05-15 14:10:30 -07:00
Clement	ad36df0455	Fix build warnings	2019-05-09 13:59:49 -07:00
NissimHadar	bffc0e8a85	Re-ordered commands.	2019-04-22 23:28:43 -07:00
NissimHadar	dd85e224a4	Activate Qt patch.	2019-04-22 20:58:15 -07:00
Clement	e01561185d	Dependencies have correct osx deploy target	2019-04-19 20:19:48 -07:00
NissimHadar	53ea50d1f3	Use set_from_env macro.	2019-04-05 15:45:11 -07:00
NissimHadar	75e1437274	Use optional environment variable for timestamp server URL	2019-04-05 14:55:23 -07:00
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