3427 commits

Author	SHA1	Message	Date
Sam Gateau	ceb38dbc97	Merge branch 'workload' of https://github.com/highfidelity/hifi into workload	2018-03-07 18:54:21 -08:00
Sam Gateau	dc122b4ce8	Merge branch 'master' of https://github.com/highfidelity/hifi into master-workload	2018-03-07 18:14:44 -08:00
Sam Gondelman	f51a35455a	Merge pull request #12515 from SamGondelman/scriptableMaterials ... Material reflection	2018-03-07 14:29:31 -08:00
samcake	4a91ac11c9	Adding controls of the regions	2018-03-06 18:19:02 -08:00
Sam Gateau	7e96608699	introducing the first stage of the workload engine to setup view and expand the view definition	2018-03-06 01:35:16 -08:00
samcake	660c4c30e9	Representing the view spheres	2018-03-02 18:22:51 -08:00
samcake	7179a31d17	Merge branch 'workload' of https://github.com/highfidelity/hifi into workload	2018-03-02 17:51:19 -08:00
samcake	cc392944b5	Merge branch 'master' of https://github.com/highfidelity/hifi into master-workload	2018-03-02 17:49:10 -08:00
samcake	fc8f1c1e65	Resolving conflicts	2018-03-02 14:20:33 -08:00
samcake	b8fb97c824	Resolving conflicts	2018-03-02 10:36:55 -08:00
samcake	a40f8cefa2	Merge branch 'master' of https://github.com/highfidelity/hifi into workload	2018-03-02 09:01:16 -08:00
samcake	d4d5f3a7f0	Merge branch 'master' of https://github.com/highfidelity/hifi into master-workload	2018-03-02 08:50:47 -08:00
samcake	5b8e18f15d	Adding the pipeline to render the view spheres	2018-03-01 17:57:44 -08:00
samcake	a227cf1edb	Fixing bad key/pipeline pair	2018-03-01 10:49:58 -08:00
samcake	94fa2ef6a0	Adding debug color of the region	2018-02-28 17:59:59 -08:00
samcake	b1b539e07a	Adding debug color of the region	2018-02-28 17:56:37 -08:00
samcake	dc286544c5	Merging with nissim's pr	2018-02-28 17:54:54 -08:00
samcake	a7542d5b90	fixing the shadow	2018-02-28 17:46:22 -08:00
samcake	d91fb543f3	Fix the ssbo in GL4.5 and represent the workload proxies of the space and expose the workload engine to the JS api	2018-02-28 17:15:40 -08:00
NissimHadar	5d7e6651a7	Use correct pixel shader.	2018-02-28 11:05:02 -08:00
samcake	e6d5f90847	Merge branch 'workload' of https://github.com/highfidelity/hifi into workload	2018-02-28 10:30:14 -08:00
Andrew Meadows	3ca21dda67	Merge hifi/master of into hifi/workload	2018-02-28 10:28:31 -08:00
samcake	31462a87c3	now identifying the issue with ResourceBUffer	2018-02-28 10:13:13 -08:00
NissimHadar	faad930e35	WIP.	2018-02-28 08:44:01 -08:00
NissimHadar	5764a21c4a	WIP.	2018-02-28 08:12:48 -08:00
samcake	3360c5a968	Debugging the ssbo bug	2018-02-27 18:46:12 -08:00
NissimHadar	7cae04883e	WIP.	2018-02-27 17:19:02 -08:00
NissimHadar	f52f146db5	WIP.	2018-02-27 16:28:46 -08:00
NissimHadar	00f3682bbe	NOT WORKING YET.	2018-02-27 14:09:31 -08:00
Brad Davis	136ced98c3	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-27 13:44:00 -08:00
SamGondelman	cc53b338db	Merge remote-tracking branch 'upstream/master' into scriptableMaterials	2018-02-27 13:30:03 -08:00
SamGondelman	0fca56eef0	Revert "Merge pull request #12407 from NissimHadar/shadowControlsOffZvork" ... This reverts commit 3201d2ba21, reversing changes made to c0f20900a0.	2018-02-27 11:33:05 -08:00
SamGondelman	a4b04d9d43	merge	2018-02-27 10:08:30 -08:00
Brad Davis	6254e2b569	PR feedback	2018-02-27 09:11:40 -08:00
Brad Davis	f01c42dcc9	Fixing merged dual-quat pipelines	2018-02-27 08:54:46 -08:00
John Conklin II	48f0cded05	Merge pull request #12440 from humbletim/Leopoly_Phase1_010_graphics-scripting ... Leopoly_Phase1_010 Graphics Scripting	2018-02-27 07:53:25 -08:00
humbletim	d3bae87066	* remove unneeded Q_DECLARE_METATYPEs ... * CR feedback	2018-02-26 19:07:55 -05:00
Brad Davis	b9387f2a21	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-26 13:18:14 -08:00
SamGondelman	6fe2d46d7c	merge	2018-02-26 12:40:14 -08:00
Sam Gondelman	d1d6adf447	Merge pull request #12493 from sethalves/fix-shadows-on-osx-1 ... fix osx shadows	2018-02-26 11:46:43 -08:00
Anthony J. Thibault	f5fcaae283	Merge branch 'master' into bug-fix/entity-mat-avatar-dual-quaternions	2018-02-26 10:55:44 -08:00
Anthony J. Thibault	0404b722e4	Code review feedback	2018-02-26 10:00:32 -08:00
humbletim	3dbe5d79bb	fix windows punctilious warnings	2018-02-26 06:01:16 -05:00
humbletim	f824edd04e	* remove Model_temporary_hack ... * split gpuhelpers and mesh part * fix objwriter * more work on bufferview helpers * cr cleanup	2018-02-26 04:58:22 -05:00
SamGondelman	b56f755034	material reflection	2018-02-23 17:58:46 -08:00
Brad Davis	0550138609	Merge remote-tracking branch 'upstream/master' into android_dev	2018-02-23 12:48:10 -08:00
Seth Alves	59bd05aa55	make shadow-related shader compile on osx	2018-02-23 09:22:34 -08:00
humbletim	058e4d1926	CR feedback; whitespace / remove unnecessary diffs	2018-02-23 09:12:33 -05:00
humbletim	f8fe06213d	CR feedback; whitespace / remove unnecessary diffs	2018-02-23 09:11:23 -05:00
humbletim	6ea4b660b7	CR feedback; remove ok bool pointer and all metadata; cleanup	2018-02-23 07:47:39 -05:00