3577 commits

Author	SHA1	Message	Date
Sam Gateau	df0660f823	Merge branch 'master' of https://github.com/highfidelity/hifi into android-gles	2018-01-13 01:00:41 -08:00
Anthony J. Thibault	7753b8a0b5	Merge branch 'master' into feature/dual-quat	2018-01-11 17:31:29 -08:00
Brad Davis	001edcd71b	Allow creation of empty files with storage API	2018-01-11 08:06:52 -08:00
Brad Davis	97593bc4d8	Fixing compiled resource access	2018-01-10 17:18:12 -08:00
Brad Davis	2c35242af1	Merge remote-tracking branch 'upstream/master' into android_nov	2018-01-10 13:40:12 -08:00
Brad Davis	7a7aee770c	Switching to binary resources	2018-01-10 13:39:56 -08:00
Brad Davis	bd5af2b493	Working on android avatar rendering	2018-01-09 11:40:32 -08:00
Anthony J. Thibault	fbea22e0f0	Renamed imag component to dual, using the correct nomenclature ... Also removed incomplete test from unit tests.	2018-01-08 18:21:23 -08:00
Brad Davis	a2c2e7d9ff	Fixes to load cubemap	2018-01-08 14:43:54 -08:00
Anthony J. Thibault	d08f94a74d	Code review feedback ... * Removed AnimPose::fuzzyEqual * Fixed DualQuaternion ctor	2018-01-08 13:36:23 -08:00
Anthony J. Thibault	59b843781e	Merge branch 'master' into feature/dual-quat	2018-01-08 13:18:42 -08:00
Gabriel Calero	7fbd23f36b	Merge branch 'android_render_pr' of https://github.com/gcalero/hifi into android_render_pr	2018-01-08 17:38:28 -03:00
Gabriel Calero	6050737e7c	Resolving comments in PR	2018-01-08 17:36:08 -03:00
Bradley Austin Davis	68cd768a65	Merge branch 'android' into android_render_pr	2018-01-08 12:49:52 -05:00
Nissim Hadar	8e793e790a	Deleted unused include file.	2018-01-07 14:11:26 -08:00
Brad Hefta-Gaub	6a3609093d	Merge pull request #12051 from dback2/polyobjimportfixes ... Poly obj import fixes	2018-01-05 13:33:29 -08:00
David Back	7558b00467	better fix for model scale floor, remove abs	2018-01-04 17:49:39 -08:00
David Back	6b9658f8cf	merge	2018-01-04 16:41:58 -08:00
Anthony J. Thibault	bcd813ac62	Optimizations and cleanup	2018-01-04 16:15:44 -08:00
Anthony J. Thibault	e86fd4f992	Removed SKIN_COMP define, re-enabled cauterization	2018-01-04 16:15:42 -08:00
Anthony J. Thibault	5bb0b06061	WIP: Dual Quaternion compensation for spinning the right way.	2018-01-04 16:15:39 -08:00
Anthony J. Thibault	8bdddf7211	Full Dual Quaternion support	2018-01-04 16:15:38 -08:00
Anthony J. Thibault	565875e823	WIP first attempt at dual quat skinning	2018-01-04 16:09:02 -08:00
Gabriel Calero	32494a8e24	Set QMLEngine base path for android	2018-01-03 22:13:31 -03:00
Gabriel Calero	fc62b2d34a	Fix ktx_cache path for android. Load the least js scripts for android	2018-01-03 16:42:18 -03:00
Gabriel Calero	78f2a8c566	Copy scripts from android assets at startup	2018-01-03 16:40:14 -03:00
Gabriel Calero	468fc89c3e	Use forward pipeline for android	2018-01-03 16:38:23 -03:00
RebeccaStankus	89138c9bd8	More filter choices, search will clear	2018-01-03 11:35:46 -08:00
RebeccaStankus	efdba3b6e6	Merge branch 'master' of https://github.com/highfidelity/hifi into log-filter2	2018-01-02 08:59:42 -08:00
Seth Alves	4bbce011a4	Merge pull request #11918 from sethalves/scale-wearables-with-avatar-3 ... avatar-entities which are children of an avatar will scale with the avatar	2017-12-29 09:12:17 -08:00
David Back	24981a560f	fix scaling threshold	2017-12-28 11:56:39 -08:00
RebeccaStankus	296f0a323a	saving for Wednesday	2017-12-26 15:56:05 -08:00
Stephen Birarda	e3cbfd92a0	Merge remote-tracking branch 'upstream/stable' into 61-1-merge-back	2017-12-22 15:48:04 -08:00
Seth Alves	897b96d092	Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3	2017-12-22 07:36:26 -08:00
Stephen Birarda	05b45f2e7e	adjust example and add clarifying comments to PrioritySortUtil	2017-12-21 15:40:08 -08:00
Brad Davis	9f7b6f543d	Merge remote-tracking branch 'upstream/master' into HEAD	2017-12-18 11:17:07 -08:00
Andrew Meadows	cfd2097f36	Merge pull request #11965 from AndrewMeadows/expose-physics-perf-stats-to-js ... Cleanup names of debug stats and trace contexts.	2017-12-18 10:02:42 -08:00
Zach Fox	3764445272	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-13 14:12:08 -08:00
Sam Gateau	a75010fb94	Merge pull request #11938 from Zvork/csm ... Cascaded Shadow Maps and bug fix	2017-12-14 00:32:43 +07:00
Andrew Meadows	87fa919ac8	save files to Documents by default	2017-12-12 14:11:25 -08:00
David Rowe	578c42b4ea	Merge branch 'master' into 21624	2017-12-13 09:41:09 +13:00
MiladNazeri	16e16501cd	Merge pull request #11791 from ctrlaltdavid/21602 ... JSDoc updates	2017-12-12 12:18:02 -08:00
David Rowe	58fa8b9fbf	Miscellaneous fixes	2017-12-12 10:49:05 +13:00
Seth Alves	2cd64ccd2c	merge from upstream	2017-12-11 10:14:30 -08:00
Zach Fox	b81cdf49ef	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-11 09:52:32 -08:00
Olivier Prat	a679dc6705	Merge branch 'master' of git://github.com/highfidelity/hifi into csm	2017-12-11 08:48:48 +01:00
Sam Gateau	429d54d65d	Merge branch 'master' of https://github.com/highfidelity/hifi into light	2017-12-10 09:53:22 -08:00
divya	e187852df1	Merge pull request #11941 from huffman/feat/atp-baking-process ... Move asset server baking to a separate process	2017-12-09 20:48:14 -08:00
Ryan Huffman	e3d00c4aa5	Remove unnecessary logging from PathUtils	2017-12-08 17:48:10 -08:00
Ryan Huffman	982607eedf	Remove unused variable from PathUtils	2017-12-08 15:40:33 -08:00