2876 commits

Author	SHA1	Message	Date
Brad Hefta-Gaub	d6ad389dab	Merge pull request #11611 from AndrewMeadows/faster-update-renderables ... Faster renderables update	2017-10-20 13:43:08 -07:00
Andrew Meadows	c79bf3bc04	cleanup WANT_DETAILED_PROFILING	2017-10-19 14:31:50 -07:00
Nissim	fe286aff83	Andrew's corrections (per coding standard).	2017-10-18 08:42:07 -07:00
Andrew Meadows	339edc67c8	ifdef out more per-frame-per-entity profiling	2017-10-16 17:27:53 -07:00
Andrew Meadows	fb1c075a12	fix animating entities	2017-10-16 15:55:25 -07:00
Nissim Hadar	9c9dfc7211	Replace light blend with glare.	2017-10-13 13:36:46 -07:00
Nissim Hadar	30fdf9d08e	Merge branch 'master' into hazeZone	2017-10-11 22:12:52 -07:00
Andrew Meadows	d9ba75ca72	fix warning about implicit cast from 64 to 32 bits	2017-10-11 06:07:07 -07:00
Andrew Meadows	886422cbef	remove unused variable	2017-10-10 17:07:17 -07:00
Andrew Meadows	4bf99fe9d2	remove unused variable	2017-10-10 17:05:54 -07:00
Andrew Meadows	026195223a	more correct use of BufferView in GeometryCache	2017-10-10 17:02:26 -07:00
Sam Gateau	f143c28625	Merge pull request #11542 from SamGondelman/bubbleBoy ... Move HUD and HUD overlay rendering out of display plugin	2017-10-10 14:26:20 -07:00
Nissim Hadar	3070778b39	Fixed typo in comment.	2017-10-10 10:20:04 -07:00
Nissim Hadar	71f567f15a	Merge branch 'master' into hazeZone	2017-10-09 17:28:10 -07:00
Nissim Hadar	7d5a887f43	Refactoring.	2017-10-09 17:25:19 -07:00
Bradley Austin Davis	c92588685b	Merge pull request #11533 from SamGondelman/modelMaster ... Fix model loading for real this time	2017-10-08 10:23:13 -07:00
Nissim Hadar	e02876f1ea	Zone position/direction sent to haze uniform.	2017-10-06 17:24:20 -07:00
SamGondelman	b4a3ab9204	fix debugDeferredLighting	2017-10-06 15:46:10 -07:00
SamGondelman	7e6d5d9d98	merge with master	2017-10-06 14:57:08 -07:00
Nissim Hadar	8fad23aefd	Keylight working.	2017-10-06 12:49:43 -07:00
Nissim Hadar	47a6f2d7c9	Initial work on adding keylight direction.	2017-10-06 12:01:15 -07:00
Nissim Hadar	9918757061	Initial work on adding keylight direction.	2017-10-06 11:43:57 -07:00
Nissim Hadar	320c888ce4	Added checkbox to allow separate control of keylight attenuation.	2017-10-05 20:31:45 -07:00
SamGondelman	a6b7578c3c	start fixing asynch issue, fixes model loading!	2017-10-05 12:30:00 -07:00
Nissim Hadar	794cb961d5	Merge branch 'master' into hazeZone	2017-10-04 23:03:59 -07:00
Nissim Hadar	ad03301df8	WIP - implementing range+altitude mode.	2017-10-04 23:03:21 -07:00
Nissim Hadar	6dcd8b7b57	Haze Range works.	2017-10-04 21:47:20 -07:00
Nissim Hadar	97f775f6f1	Clean-up.	2017-10-04 21:36:42 -07:00
SamGondelman	3a6e84e681	trying to fix model issue	2017-10-04 17:26:12 -07:00
SamGondelman	477dfdff1e	wip hud layering and fix crashes	2017-10-04 11:45:21 -07:00
Nissim Hadar	48e5b9d1bc	Haze enable/disable from UI works.	2017-10-03 17:42:04 -07:00
SamGondelman	fa838e4715	merge from master	2017-10-03 15:53:33 -07:00
Nissim Hadar	1cf7f5a732	For testing.	2017-10-03 09:54:44 -07:00
Sam Gateau	acb99592ee	fixing th e bug on exit due to the debug anim draw of the avatars	2017-10-02 21:31:30 -07:00
Nissim Hadar	cdbf067a24	Rename (haze)getParametersBuffer to getHazeParametersBuffer. ... Add corrections from Sam	2017-10-02 16:54:02 -07:00
Nissim Hadar	ca4c5969d9	Clean-up.	2017-10-02 14:36:45 -07:00
Nissim Hadar	29d5e772d4	Removed "..Is.." from various methods.	2017-10-02 12:42:46 -07:00
Nissim Hadar	48fb7522c0	Removed blank line	2017-10-02 11:42:04 -07:00
Nissim Hadar	20a42d6fbd	Fixed model name string	2017-10-02 10:11:34 -07:00
Nissim Hadar	97756146b1	Attempt to add qml configuration	2017-10-02 09:09:36 -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	5a7fed022c	Merging haze branch.	2017-09-30 00:04:28 -07:00
Nissim Hadar	f26345a3f0	Working on adding zone to haze.	2017-09-29 15:15:49 -07:00
SamGondelman	b59ec07171	move hud rendering to render thread, still need to separate out hud overlays	2017-09-29 09:49:08 -07:00
Nissim Hadar	0acf4b9de9	Working on adding zone to haze.	2017-09-28 23:53:53 -07:00
samcake	b1daae0150	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-09-28 09:16:02 -07:00
Nissim Hadar	9d0cf16c20	Fixed Ubuntu warnings.	2017-09-27 19:33:04 -07:00
Nissim Hadar	784f928433	After merge.	2017-09-27 18:46:55 -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