2113 commits

Author	SHA1	Message	Date
Nissim Hadar	dad3a0d340	Fixed skybox inheritance.	2018-01-02 09:08:05 -08:00
Nissim Hadar	0764e80996	Corrected behaviour of skybox modes.	2017-12-30 18:19:42 -08:00
nissim.hadar	b56c7535d2	Added legacy functionality (for zones that used Background "skybox")	2017-12-30 12:25:58 -08:00
Nissim Hadar	7260b4ff7b	Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance ... # Conflicts: # libraries/entities/src/EntityPropertyFlags.h	2017-12-29 15:16:14 -08:00
Nissim Hadar	87e896ab20	Zone inheritance ready for testing.	2017-12-29 15:13:46 -08:00
Seth Alves	4bbce011a4	Merge pull request #11918 from sethalves/scale-wearables-with-avatar-3 ... avatar-entities which are children of an avatar will scale with the avatar	2017-12-29 09:12:17 -08:00
Nissim Hadar	85a81d6b5b	WIP - skybox inheritance	2017-12-28 18:23:49 -08:00
Nissim Hadar	64644fc980	WIP - skybox inheritance	2017-12-28 14:31:59 -08:00
Nissim Hadar	03cf7710d0	Ambient light inheritance	2017-12-28 09:34:55 -08:00
Nissim Hadar	7f5897e90b	Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance	2017-12-26 11:35:59 -08:00
Nissim Hadar	4ffd896ced	WIP - adding AmbientLightPropertyGroup	2017-12-26 11:15:33 -08:00
Nissim Hadar	0b73e7db3f	WIP - adding AmbientLightPropertyGroup	2017-12-26 09:15:13 -08:00
Brad Hefta-Gaub	3d02955c5d	Merge pull request #12029 from SamGondelman/webOverlay ... Fix >20 web entities crash	2017-12-24 17:10:39 -08:00
Nissim Hadar	affc5d1b86	Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance	2017-12-24 15:27:32 -08:00
Nissim Hadar	3f82e9147b	Change keylight/ambient mode default from "enabled" to "inherit"	2017-12-22 16:30:19 -08:00
John Conklin II	0dd5bbc2d6	Merge pull request #12057 from birarda/61-1-merge-back ... Merge stable back into master after RC61.1	2017-12-22 16:26:08 -08:00
Stephen Birarda	e3cbfd92a0	Merge remote-tracking branch 'upstream/stable' into 61-1-merge-back	2017-12-22 15:48:04 -08:00
Nissim Hadar	8ee5f642a9	Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance ... # Conflicts: # libraries/networking/src/udt/PacketHeaders.cpp # libraries/networking/src/udt/PacketHeaders.h	2017-12-22 15:41:59 -08:00
Seth Alves	96197e66bb	Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3	2017-12-22 15:13:02 -08:00
Sam Gateau	db4f9909c7	Merge pull request #12017 from Zvork/glcolor ... Removed glColor reset hack in MeshPartPayload	2017-12-22 14:25:51 -08:00
Sam Gateau	a2c16ddf6a	Merge pull request #12026 from SamGondelman/burp3 ... Remove _model from ModelMeshPartPayload	2017-12-22 13:50:06 -08:00
Nissim Hadar	e102b8c087	Fixed Ubuntu warning.	2017-12-22 08:35:09 -08:00
Nissim Hadar	502cac2ac7	Keylight inherit/off/on working	2017-12-22 08:05:12 -08:00
Seth Alves	897b96d092	Merge branch 'master' of github.com:highfidelity/hifi into scale-wearables-with-avatar-3	2017-12-22 07:36:26 -08:00
Nissim Hadar	e974cac177	Keylight inheritance mode works.	2017-12-21 19:19:55 -08:00
Stephen Birarda	7bf0cc2f63	cleanup other ref returns of shared pointers from sortables	2017-12-21 15:39:14 -08:00
Nissim Hadar	58c6f8e9c4	Radio buttons now work correctly.	2017-12-20 19:17:18 -08:00
SamGondelman	7a7b1f7089	fix web entity crash	2017-12-20 13:58:58 -08:00
SamGondelman	bd06dc6443	cleaning up modelmeshpartpayload	2017-12-20 11:00:14 -08:00
Zach Fox	297a3df63c	Merge pull request #11815 from zfox23/commerce_QmlWhitelist ... QML Whitelisting + Commerce Integration	2017-12-19 18:07:14 -08:00
Andrew Meadows	bad2c1df76	proper modulus of animation frame	2017-12-19 10:40:17 -08:00
Andrew Meadows	559cb33563	remove incorrect comment	2017-12-19 10:40:17 -08:00
Andrew Meadows	661a63bd0c	fix crash for bad QVector index	2017-12-19 10:40:17 -08:00
Olivier Prat	bd666406f4	Removed glColor reset hack in MeshPartPayload and replaced it by a reset of the color attribute to white in the execution of the setInputFormat command of the various GLBackends	2017-12-19 14:17:17 +01:00
Brad Davis	9f7b6f543d	Merge remote-tracking branch 'upstream/master' into HEAD	2017-12-18 11:17:07 -08:00
Andrew Meadows	cfd2097f36	Merge pull request #11965 from AndrewMeadows/expose-physics-perf-stats-to-js ... Cleanup names of debug stats and trace contexts.	2017-12-18 10:02:42 -08:00
amantley	2817eadb7a	iMerge remote-tracking branch 'origin/character_entity_fixes' into character_entity_fixes ... updating branch with remote	2017-12-13 16:48:33 -08:00
amantley	7c29a1b09a	Merge remote-tracking branch 'origin/master' into character_entity_fixes ... updating branch to master	2017-12-13 16:47:15 -08:00
Zach Fox	3764445272	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-13 14:12:08 -08:00
amantley	29538851b6	Made the changes from the latest code review, except getting rid of the ... while loop.	2017-12-12 09:06:43 -08:00
Andrew Meadows	406bf7898d	cleanup prof stats and trace context names	2017-12-11 11:31:00 -08:00
amantley	65bb896450	Merge remote-tracking branch 'origin/master' into character_entity_fixes	2017-12-11 10:55:54 -08:00
Seth Alves	2cd64ccd2c	merge from upstream	2017-12-11 10:14:30 -08:00
Zach Fox	b81cdf49ef	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-11 09:52:32 -08:00
amantley	7e49ce26d7	Merge remote-tracking branch 'origin/master' into character_entity_fixes ... updating branch to the master	2017-12-11 08:02:33 -08:00
Olivier Prat	a679dc6705	Merge branch 'master' of git://github.com/highfidelity/hifi into csm	2017-12-11 08:48:48 +01:00
Zach Fox	b2bafed2bb	Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist	2017-12-07 11:21:24 -08:00
Ryan Huffman	f3fc5769e8	Move asset baking on asset server to separate process	2017-12-06 11:49:19 -08:00
Olivier Prat	1d8d8335c5	Moved shadow cascade distances computation to shadow, not shadow task	2017-12-06 10:05:39 +01:00
Olivier Prat	0b6dcb2717	Merge branch 'master' of git://github.com/highfidelity/hifi into csm	2017-12-05 09:18:26 +01:00