486 commits

Author	SHA1	Message	Date
samcake	ad9bdc884e	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-11-13 11:52:32 -08:00
Nissim Hadar	f629357ded	Removed Keylight attenuation from .js (as well as .html).	2017-11-11 18:58:12 -08:00
Sam Gateau	608093eee5	reverting the change in light direction /oritenation	2017-11-10 02:55:22 -08:00
Nissim Hadar	03d2ca19b9	Moving consts into mode::Haze namespace.	2017-10-31 13:46:58 -07:00
Nissim Hadar	3ddf970be3	Removed haze init variables from the model namespace.	2017-10-30 21:40:14 -07:00
Nissim Hadar	636f7858a3	Removed _degs and _m suffixes.	2017-10-30 19:45:08 -07:00
Nissim Hadar	5fc68cae0d	Converted Haze initialization values to static.	2017-10-30 11:51:19 -07:00
Nissim Hadar	d6b3fa4cb1	Removed references to Haze from Stage.	2017-10-30 10:49:08 -07:00
Nissim Hadar	a5a135c2ba	Fixes for 8672-8674.	2017-10-27 15:39:14 -07:00
Nissim Hadar	66c31caf4b	Refactoring of the haze	2017-10-27 09:08:58 -07:00
Nissim Hadar	c5c996f186	Cleanup.	2017-10-26 09:21:38 -07:00
Nissim Hadar	b820f397fc	Fix zero-divide.	2017-10-26 08:39:22 -07:00
Nissim	5d0deaf946	Code review fixes.	2017-10-20 14:27:27 -07:00
Nissim	0f519da76e	Additional protection for mode.	2017-10-19 17:16:36 -07:00
Nissim	fe286aff83	Andrew's corrections (per coding standard).	2017-10-18 08:42:07 -07:00
Nissim	5a1c4d5a30	Fixed gcc warning.	2017-10-17 11:08:15 -07:00
Nissim	3e228acdb6	Fixed gcc warning.	2017-10-17 10:41:49 -07:00
Nissim	a641d6de66	Variable rename.	2017-10-17 09:18:29 -07:00
Nissim	072ac13120	Fixed gcc warnings.	2017-10-16 17:12:59 -07:00
Nissim	1b42572f99	Merge branch 'hazeZone' of https://github.com/NissimHadar/hifi into hazeZone ... # Conflicts: # scripts/system/html/js/entityProperties.js	2017-10-16 14:29:56 -07:00
Nissim	fd2b0da76d	First version.	2017-10-16 12:20:31 -07:00
Nissim	e51b8047f1	Corrected gcc warning.	2017-10-16 11:00:10 -07:00
Nissim Hadar	9c9dfc7211	Replace light blend with glare.	2017-10-13 13:36:46 -07:00
Nissim Hadar	6697d7c93a	Simplified setHazeColor.	2017-10-13 12:49:38 -07:00
Nissim Hadar	c76229934c	Changed blend-in colour and blend-out colour to colour and glare colour	2017-10-13 12:21:00 -07:00
Nissim Hadar	a21995db24	Added checkbox for altitude effect.	2017-10-11 22:10:58 -07:00
Nissim Hadar	96fd3123e8	Changed haze altitude to ceiling.	2017-10-11 20:36:24 -07:00
Nissim Hadar	7d5a887f43	Refactoring.	2017-10-09 17:25:19 -07:00
Nissim Hadar	e02876f1ea	Zone position/direction sent to haze uniform.	2017-10-06 17:24:20 -07:00
Nissim Hadar	320c888ce4	Added checkbox to allow separate control of keylight attenuation.	2017-10-05 20:31:45 -07:00
Nissim Hadar	395d9cbd6b	WIP - haze colour.	2017-10-05 12:13:37 -07:00
Nissim Hadar	6dcd8b7b57	Haze Range works.	2017-10-04 21:47:20 -07:00
Nissim Hadar	c1f4735468	Replaced HazeMode with uint8_t in transport protocol.	2017-10-03 19:39:34 -07:00
Nissim Hadar	cdbf067a24	Rename (haze)getParametersBuffer to getHazeParametersBuffer. ... Add corrections from Sam	2017-10-02 16:54:02 -07:00
Nissim Hadar	29d5e772d4	Removed "..Is.." from various methods.	2017-10-02 12:42:46 -07:00
Nissim Hadar	93bc3bec52	Removed (unused) _haze.	2017-10-02 12:14:21 -07:00
Nissim Hadar	bdd469cec4	Integrated haze shader into this branch.	2017-10-01 21:52:34 -07:00
Nissim Hadar	ffecf42ebb	Some clean-up.	2017-10-01 21:12:29 -07:00
Nissim Hadar	f26345a3f0	Working on adding zone to haze.	2017-09-29 15:15:49 -07:00
Nissim Hadar	4d8a1db895	Merge branch 'master' into hazeZone ... # Conflicts: # libraries/entities-renderer/src/RenderableModelEntityItem.cpp	2017-09-27 17:50:51 -07:00
Nissim Hadar	55fafeacb1	Implemented HazePropertyGroup and added the haze shader. Shader does not work yet!	2017-09-27 17:43:09 -07:00
Nissim Hadar	eaab056d66	Adding HazeStage	2017-09-27 09:12:57 -07:00
Nissim Hadar	4d501d6510	Adding HazeStage	2017-09-27 08:01:19 -07:00
Bradley Austin Davis	e42068f681	Merge branch 'master' into android_new	2017-09-26 14:31:29 -07:00
Nissim Hadar	27af4685e7	Added range and altitude to UI.	2017-09-25 09:32:52 -07:00
Nissim Hadar	678b4e35b1	Before replacing "Haze Active" checkbox with "Haze Mode" combo.	2017-09-24 14:06:00 -07:00
Nissim Hadar	953ddfdcd3	First version of adding haze to the zone.	2017-09-21 14:54:16 -07:00
Bradley Austin Davis	b93e91b9f3	New android toolchain	2017-09-19 13:45:12 -07:00
SamGondelman	1b85a453ab	working on text3d overlays and entities	2017-09-12 16:49:51 -07:00
Seth Alves	a1107deef1	cleanups	2017-07-23 08:21:50 -07:00