2278 commits

Author	SHA1	Message	Date
MiladNazeri	e054f16c46	Merge pull request #12526 from ctrlaltdavid/21709 ... Entities API JSDoc	2018-03-12 14:40:09 -07:00
Andrew Meadows	2750f3ee71	remove unused cruft and avoid useless work	2018-03-09 08:35:18 -08:00
David Rowe	b461a422c6	Merge branch 'master' into 21709	2018-03-09 14:18:42 +13:00
NissimHadar	fda32e4aa4	Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork	2018-03-08 12:16:36 -08:00
Sam Gondelman	f51a35455a	Merge pull request #12515 from SamGondelman/scriptableMaterials ... Material reflection	2018-03-07 14:29:31 -08:00
David Rowe	a62b6b7150	Merge branch 'master' into 21709	2018-03-07 17:34:53 +13:00
NissimHadar	000b08f7c0	Merge branch 'master' of github.com:highfidelity/hifi into shadowControlsOffZvork	2018-03-02 08:07:01 -08:00
NissimHadar	0f2cf8ea85	Re-implemented shadow controls.	2018-03-01 14:24:20 -08:00
David Rowe	a782b6779a	Merge branch 'master' into 21709 ... # Conflicts: # interface/src/ui/overlays/Overlays.h # interface/src/ui/overlays/Shape3DOverlay.cpp # libraries/entities/src/EntityItemProperties.cpp # libraries/entities/src/EntityScriptingInterface.h	2018-02-28 12:42:05 +13: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
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
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
Anthony J. Thibault	f5fcaae283	Merge branch 'master' into bug-fix/entity-mat-avatar-dual-quaternions	2018-02-26 10:55:44 -08:00
Brad Davis	5aa15b5422	Fixing build warnings	2018-02-26 10:17:07 -08: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
humbletim	6ea4b660b7	CR feedback; remove ok bool pointer and all metadata; cleanup	2018-02-23 07:47:39 -05:00
Anthony J. Thibault	0469eafbe4	Switch between dualQuats and matrix skinning based on model entity scale factor.	2018-02-22 18:35:16 -08:00
Brad Davis	aeb29db37d	Merge remote-tracking branch 'upstream/stable' into android_stable	2018-02-22 17:35:00 -08:00
humbletim	ec4f9fdc11	fix displayName	2018-02-22 08:31:05 -05:00
humbletim	4fd3d9bf7b	cleanup; formalize data structures	2018-02-22 08:18:38 -05:00
humbletim	e4a2a589a5	CR fedback and cleanup	2018-02-22 07:56:09 -05:00
humbletim	72fca7e57e	Merge remote-tracking branch 'samuel/scriptableMaterials' into Leopoly_Phase1_010_graphics-scripting-merge	2018-02-22 05:18:05 -05:00
humbletim	be8d79f53f	CR fedback and cleanup	2018-02-22 05:15:01 -05:00
Nissim Hadar	bf4ba07b72	Added parameters to canCastShadow - still sucks.	2018-02-21 12:36:34 -08:00
SamGondelman	4c6169ec78	merge and a little cleanup	2018-02-20 15:45:34 -08:00
humbletim	5791ca4c51	interim checkin	2018-02-20 12:22:04 -05:00
Nissim Hadar	b2a06cdb98	Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork ... # Conflicts: # libraries/entities/src/EntityItemProperties.cpp # libraries/entities/src/ShapeEntityItem.h # libraries/networking/src/udt/PacketHeaders.cpp # libraries/networking/src/udt/PacketHeaders.h	2018-02-19 13:05:57 -08:00
Nissim Hadar	9921217807	Shapes casting shadows OK.	2018-02-19 12:32:11 -08:00
Nissim Hadar	6a9bbaf0a5	WIP - clean-up.	2018-02-19 12:00:30 -08:00
David Rowe	9e37230aa1	Miscellaneous code tidying	2018-02-19 12:21:56 +13:00
Nissim Hadar	dc3b03c9bc	Added shadows to shapes - still sucks...	2018-02-16 18:37:47 -08:00
Nissim Hadar	4c1f22f84e	Models and Avatar cast shadows (box doesn't, yet).	2018-02-16 14:01:33 -08:00
Nissim Hadar	194c7f4101	WIP - for review.	2018-02-16 09:28:15 -08:00
SamGondelman	b189433855	merge	2018-02-15 15:50:36 -08:00
SamGondelman	2d754edf74	CR	2018-02-15 15:48:41 -08:00
humbletim	145a0df082	interim checkin	2018-02-15 14:14:07 -05:00
Sam Gondelman	15cdfef16a	Merge branch 'master' into decals	2018-02-14 17:33:01 -08:00
Nissim Hadar	054b2bf3e2	Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork ... # Conflicts: # libraries/networking/src/udt/PacketHeaders.cpp # scripts/system/html/js/entityProperties.js	2018-02-14 17:10:07 -08:00
SamGondelman	324eefc914	remove fresnel, add unlit, fix overlays, cleanup	2018-02-14 17:02:07 -08:00
Bradley Austin Davis	33690e09b7	Merge pull request #12399 from samcake/blue ... Introducing group culling to avoid the avatar model to be partially culled	2018-02-14 15:38:52 -08:00
John Conklin II	63f752e76f	Merge pull request #12366 from sethalves/fix-children-of-animated-entity-joints ... fix -- get children of animated entity joints to follow along, again	2018-02-14 11:12:45 -08:00
samcake	1d3ae1b187	Work in progress to get the render items beeing tagged correctly for groupCulled	2018-02-13 17:50:01 -08:00
SamGondelman	4500ed17e7	merge from master	2018-02-13 13:58:39 -08:00
Andrew Meadows	8231a56b22	pull task out of render and into its own lib	2018-02-13 08:56:11 -08:00
Nissim Hadar	34aab4a9c8	Merge branch 'master' of https://github.com/highfidelity/hifi into shadowControlsOffZvork ... # Conflicts: # libraries/entities-renderer/src/RenderableZoneEntityItem.cpp	2018-02-12 17:50:39 -08:00