30678 commits

Author	SHA1	Message	Date
Jeff Clinton	bb27acf934	Merge pull request #14530 from SamGondelman/NOverlays4 ... Case 20134: Grid Entities	2019-01-02 09:12:34 -08:00
Jeff Clinton	032178673a	Merge pull request #14634 from SamGondelman/NOverlays5 ... Case 20200: Update EntityScriptingInterface to not find local entities (#2)	2019-01-02 09:00:56 -08:00
Adam Smith	52980559b8	Merge pull request #14491 from SamGondelman/v3 ... Case 20080: v3 + v4 procedurals and misc shader fixes	2018-12-28 15:17:50 -08:00
Adam Smith	0d27cb65ca	Merge pull request #14576 from sabrina-shanman/hfm_prep_graphics ... (case 20297) Move graphics preparation from Serializers to runtime preparation step	2018-12-27 15:46:21 -08:00
Brad Hefta-Gaub	440f517b88	Merge pull request #14602 from samcake/punk ... Case 20303 : Cleaning up the render view tasks and jobs for better 2ndary camera	2018-12-27 15:43:17 -08:00
SamGondelman	87947a7165	try to fix grid color issue	2018-12-25 02:17:37 -05:00
SamGondelman	a25c9395b3	glsl initializer lists are 4.2	2018-12-25 00:46:42 -05:00
SamGondelman	8dae2502ee	fix overlay picking	2018-12-22 02:21:29 -05:00
SamGondelman	64b461274b	remove new API ... (cherry picked from commit 5eccaad135)	2018-12-22 01:45:56 -05:00
SamGondelman	43bc184254	different entity flags for domain/avatar ... (cherry picked from commit 7054188f21)	2018-12-22 00:55:27 -05:00
SamGondelman	b5a2642b6a	updated entityscriptinginterface API and related functions ... (cherry picked from commit 6aac596698)	2018-12-22 00:55:10 -05:00
Adam Smith	a9f59fae71	Merge pull request #14631 from highfidelity/revert-14547-NOverlays5 ... Revert "Case 20200: Update EntityScriptingInterface to not find local entities"	2018-12-21 10:32:59 -08:00
Adam Smith	3c89d51994	Merge pull request #14626 from luiscuenca/gltfEmbeddedBinCrashFix ... Case 20391: Fix crash when importing a glTF model that contains embedded buffers	2018-12-20 16:55:37 -08:00
Sam Gondelman	097d2d9503	Revert "Case 20200: Update EntityScriptingInterface to not find local entities"	2018-12-20 16:53:33 -08:00
SamGondelman	835615fbbd	separate out v3 and v4	2018-12-20 16:33:13 -08:00
SamGondelman	9fc7813e24	Merge remote-tracking branch 'upstream/master' into v3	2018-12-20 16:05:06 -08:00
SamGondelman	bb030660bd	Merge remote-tracking branch 'upstream/master' into NOverlays4	2018-12-20 13:26:23 -08:00
sam gateau	26c9d7a94e	Merge branch 'master' of github.com:highfidelity/hifi into punk	2018-12-20 13:22:19 -08:00
Shannon Romano	21ec4e0c53	Merge pull request #14524 from SamGondelman/NOverlays3 ... Case 20132, Case 16928: First class Image Entities	2018-12-20 21:20:49 +00:00
sam gateau	49df69e609	Merge branch 'master' of github.com:highfidelity/hifi into punk	2018-12-20 13:17:02 -08:00
sam gateau	7e1f75e0f3	Fixing the debug of shadow frustum for real	2018-12-20 13:16:41 -08:00
luiscuenca	52bfaafd91	Fix crash on glTF import when the file contains embedded buffers	2018-12-20 13:25:19 -07:00
Shannon Romano	b6d1607acd	Merge pull request #14547 from SamGondelman/NOverlays5 ... Case 20200: Update EntityScriptingInterface to not find local entities	2018-12-20 19:10:22 +00:00
sam gateau	21577ba311	fixing warnings and the debug of shadows	2018-12-20 09:27:15 -08:00
Jeff Clinton	3d4311b7d4	Merge pull request #14613 from zfox23/MS20253_eventBridge ... MS20253: Only emit screenChanged once screen has changed	2018-12-20 08:58:53 -08:00
Sam Gateau	8fba8062c3	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-12-19 20:01:48 -08:00
Sam Gateau	80a55e2ae9	Compiling	2018-12-19 20:01:14 -08:00
sam gateau	253a71a20c	updating some code and probably broken in this version	2018-12-19 18:22:01 -08:00
SamGondelman	bf704c2d0d	remove gl_DepthRange	2018-12-19 16:21:12 -08:00
Sam Gondelman	e890fc6980	Merge branch 'master' into NOverlays3	2018-12-19 11:37:10 -08:00
Adam Smith	828672343a	Merge pull request #14523 from SamGondelman/NOverlays2 ... Case 20131: Cleanup some Entity Properties	2018-12-19 11:33:24 -08:00
Zach Fox	7fee0fc1e4	Fix MS20253: Only emit screenChanged once screen has changed	2018-12-19 09:50:52 -08:00
sam gateau	9c436bc28c	Merge branch 'master' of github.com:highfidelity/hifi into punk	2018-12-19 09:31:41 -08:00
Jeff Clinton	16c7619aa7	Merge pull request #14608 from SamGondelman/zone ... Case 19080: Fix zone with invalid script not loading	2018-12-19 08:49:33 -08:00
Jeff Clinton	16e3914cd7	Merge pull request #14598 from amantley/ripOutCruft ... Fix for Camera-perspective-is-off-in-first-person-view, master branch	2018-12-18 17:15:58 -08:00
sam gateau	b8d96d98b8	fixing warnings from the build	2018-12-18 16:25:24 -08:00
sam gateau	5b50b0332d	more fixes	2018-12-18 15:30:45 -08:00
sam gateau	265b1591d6	Merge branch 'master' of github.com:highfidelity/hifi into punk	2018-12-18 14:43:12 -08:00
sam gateau	2f18555ee0	removing comments and dead code, rewiring the debug	2018-12-18 14:42:45 -08:00
SamGondelman	7231116e43	fix zone with invalid script not loading	2018-12-18 13:04:56 -08:00
Jeff Clinton	889f110357	Merge pull request #13925 from sethalves/fix-polyvox-texture-and-single-setter ... fix a bug that broke Entities.setVoxel(). Fix polyvox textures	2018-12-18 12:15:07 -08:00
Sam Gateau	d0d771ce1e	Merge branch 'master' of https://github.com/highfidelity/hifi into punk	2018-12-17 18:48:07 -08:00
sam gateau	237fb4dc4c	Shadows are completely working with settings on both pipeline	2018-12-17 17:34:47 -08:00
amantley	42a17980cb	fixed mac build conflict, unused variable	2018-12-17 16:21:22 -08:00
Adam Smith	14ab53571f	Merge pull request #14564 from sabrina-shanman/hfm_prep ... (case 20274) Create the HFM Preparation Step	2018-12-17 15:17:19 -08:00
amantley	3e1beb2dca	removed white space and stray semi colon	2018-12-17 15:05:51 -08:00
amantley	defdc9fbcb	removed humanIK joint name code from fbx serializer	2018-12-17 10:56:53 -08:00
amantley	6e5c52972a	removed member declarations in hfm.h and debug print statements	2018-12-17 10:42:08 -08:00
Sam Gateau	318bf20ede	Shadow is working correctly in both pipelines	2018-12-17 00:27:07 -08:00
Angus Antley	77fa4e7d13	took out the unnecessary hfm.jointindex code	2018-12-16 17:29:16 -08:00