63351 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Elisa Lupin-Jimenez	a63538c4e9	Merge pull request #12021 from elisa-lj11/poly_api ... Google Poly API	2018-01-02 10:28:17 -08:00
Nissim Hadar	22c5890812	Rebased.	2018-01-02 09:23:38 -08:00
Nissim Hadar	dad3a0d340	Fixed skybox inheritance.	2018-01-02 09:08:05 -08:00
RebeccaStankus	94d19d5e79	Merge branch 'log-filter2' of https://github.com/RebeccaStankus/hifi into log-filter2	2018-01-02 09:02:22 -08:00
RebeccaStankus	efdba3b6e6	Merge branch 'master' of https://github.com/highfidelity/hifi into log-filter2	2018-01-02 08:59:42 -08:00
RebeccaStankus	fe82d33b76	couple small changes	2018-01-01 15:29:49 -08:00
Nissim Hadar	0764e80996	Corrected behaviour of skybox modes.	2017-12-30 18:19:42 -08:00
Nissim Hadar	fb59da5fb3	Reverted to old version of auto-tester.	2017-12-30 18:19:00 -08:00
Nissim Hadar	beb67bb5c8	Merge branch 'keylightInheritance' of https://github.com/NissimHadar/hifi into keylightInheritance	2017-12-30 16:32:58 -08:00
Nissim Hadar	b68da182fd	Merge branch 'QtImageCompare' of https://github.com/NissimHadar/hifi into keylightInheritance	2017-12-30 13:49:01 -08:00
nissim.hadar	b56c7535d2	Added legacy functionality (for zones that used Background "skybox")	2017-12-30 12:25:58 -08:00
nissim.hadar	b6bbf1abe1	Added sun intensity modulation as a function of altitude.	2017-12-29 23:47:42 -08:00
Bruce Brown	1d79a21655	Add files via upload	2017-12-29 15:51:11 -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
Triplelexx	78a0175413	fix assetbrowser sorting case sensitivity	2017-12-29 23:16:12 +00:00
Nissim Hadar	87e896ab20	Zone inheritance ready for testing.	2017-12-29 15:13:46 -08:00
luiscuenca	47dbb0c168	load script manually	2017-12-29 15:35:44 -07:00
luiscuenca	49bd62ca29	Touch feeling for near grab	2017-12-29 14:04:36 -07:00
Atlante45	aec5ab5921	CR	2017-12-29 12:46:52 -08:00
Atlante45	06e2f394f9	Update Octree server stats to handle single server	2017-12-29 12:46:52 -08:00
Atlante45	28f164d7e5	Remove legacy jurisdiction code	2017-12-29 12:46:52 -08:00
Bruce Brown	8d602e3669	Add files via upload	2017-12-29 12:43:59 -08:00
Bruce Brown	6d0cac83c4	Add files via upload	2017-12-29 12:28:31 -08:00
Bruce Brown	0eacac60c1	Add files via upload ... add more mmidi message types to be exposed to javascript	2017-12-29 11:05:37 -08:00
Bruce Brown	31238e2d66	Update Midi.cpp	2017-12-29 10:49:51 -08:00
Bruce Brown	b3ac4de1e6	Update Midi.h	2017-12-29 10:45:58 -08:00
Bruce Brown	fa10578293	Add files via upload	2017-12-29 10:40:59 -08:00
RebeccaStankus	06def41764	Merge branch 'master' of https://github.com/highfidelity/hifi into log-filter2	2017-12-29 10:03:29 -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	0e76d481a1	Completed the use of radio-buttons to hide disabled sections.	2017-12-29 08:28:31 -08:00
Nissim Hadar	a6f3401d0e	Removed background combo.	2017-12-29 08:15:34 -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
David Back	24981a560f	fix scaling threshold	2017-12-28 11:56:39 -08:00
Sam Gateau	0f20fc14b4	Merge branch 'master' of https://github.com/highfidelity/hifi into blue	2017-12-28 11:41:10 -08:00
Nissim Hadar	9636a0b450	No idea...	2017-12-28 09:35:58 -08:00
Nissim Hadar	8bb4d1431c	WIP - copy skylight URL to ambient URL.	2017-12-28 09:35:40 -08:00
Nissim Hadar	03cf7710d0	Ambient light inheritance	2017-12-28 09:34:55 -08:00
vladest	afc3082593	Cleanup. Errors checks	2017-12-28 13:16:51 +01:00
vladest	35fee739c5	Use buttons index	2017-12-27 23:50:15 +01:00
Nissim Hadar	9b9295aaec	Script that uses date, time and coordinates to compute sun position - this is then used to position the keylight.	2017-12-27 14:17:05 -08:00
Elisa Lupin-Jimenez	84933131c4	changed api key variable name	2017-12-27 12:49:16 -08:00
Elisa Lupin-Jimenez	a428eb5b75	added const to several parameters	2017-12-27 12:47:04 -08:00
Elisa Lupin-Jimenez	01c1032540	fixed constant names, added another URL check	2017-12-27 10:51:58 -08:00
RebeccaStankus	296f0a323a	saving for Wednesday	2017-12-26 15:56:05 -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
Elisa Lupin-Jimenez	03f06aadf4	keyword filters case insensitive now	2017-12-26 11:08:10 -08:00
Elisa Lupin-Jimenez	e1b344e36d	handles empty json object return	2017-12-26 10:50:10 -08:00
David Back	904015fc13	Merge branch 'master' of https://github.com/highfidelity/hifi into polyobjimportfixes	2017-12-26 10:20:11 -08:00