835 commits

Author	SHA1	Message	Date
Saracen	43ddf7ca23	Unify cube and sphere edit menu entries into one.	2019-05-02 22:40:11 +01:00
Sam Gateau	ba02aa7098	making luci2 better	2019-04-19 16:56:55 -07:00
Sam Gateau	af3d981ad1	Bringing the Luci interface into the new Prop framework and moving some tools there too	2019-04-18 17:44:08 -07:00
Sam Gateau	3d78592bb8	Adding more style widgets andbringing luci1 into the panels of luci2	2019-04-18 00:19:19 -07:00
Sam Gateau	9873c10353	Better canvas ICon qml and activation of the jobs	2019-04-17 17:58:48 -07:00
Sam Gateau	4ce7d75720	FInding a path	2019-04-16 23:38:40 -07:00
Sam Gateau	f2b747a68d	Adding indentation of the folder in the header and refining background color	2019-04-16 18:15:00 -07:00
Sam Gateau	e7e9715e10	merging up	2019-04-15 09:16:59 -07:00
Sam Gateau	9581f5c958	separating the group header container	2019-04-05 08:44:49 -07:00
Sam Gateau	3ddde35d8f	Merge branch 'master' of https://github.com/highfidelity/hifi into blackProp	2019-04-03 16:56:17 -07:00
Wayne Chen	390ce9bb26	wip for getting AvatarInputsBar to switch accordingly	2019-03-22 15:34:06 -07:00
Sam Gateau	f2fc9c0102	Multiple task view	2019-03-12 16:40:28 -07:00
Sam Gateau	530b871eef	Getting the group styled and scrollview working all together	2019-03-11 00:08:31 -07:00
Sam Gateau	a303f803eb	BReaking group	2019-03-08 18:14:38 -08:00
Sam Gateau	1b371c07ff	Merge branch 'master' of github.com:highfidelity/hifi into blackProp	2019-03-08 09:47:59 -08:00
Sam Gateau	5b8116bec4	make the group foldable	2019-03-07 17:52:11 -08:00
Sam Gateau	f7896b6407	Better propGroup	2019-03-06 22:24:43 -08:00
SamGondelman	96eb137df2	fix debugAvatarMixer.js	2019-03-06 15:53:25 -08:00
Sam Gateau	c540016af6	This is working !!!!	2019-03-05 20:22:19 -08:00
Sam Gateau	4959452c79	Dynamic creation of the propItem in the propGRoup!	2019-03-05 14:27:32 -08:00
Sam Gateau	e4518ba234	Fixing the bins and exploring the REpeater	2019-03-04 23:44:14 -08:00
Sam Gateau	3d2614498b	ANd fuck	2019-03-04 18:07:02 -08:00
Sam Gateau	fe23ef1485	Adding the prop library	2019-03-03 23:35:40 -08:00
Sam Gateau	dab0df1113	Trying to fix the damn gamma	2019-02-22 18:03:23 -08:00
SamGondelman	27f05db825	fix ao	2019-02-18 01:12:00 -08:00
Sam Gateau	afb6c838eb	REverting all the changes from the brown branch not used	2019-02-11 20:13:37 -08:00
Sam Gateau	35491bf5b0	Multisampling works in 4.1	2019-02-06 00:05:17 -08:00
Sam Gateau	4089f8c5b0	Adding Color filter to the tone mapper	2019-02-04 23:45:35 -08:00
Dante Ruiz	20d933ce6e	recenter log window when enter and exiting hmd mode	2019-01-28 13:58:29 -08:00
sabrina-shanman	556a2ec3b6	Add material inspector to Luci.js	2019-01-18 18:15:44 -08:00
SamGondelman	4cd1cd6606	merge with master	2019-01-03 12:56:41 -08:00
Seth Alves	78aff6e95c	grab js api; send grab information through trait system	2019-01-03 08:17:52 -08:00
SamGondelman	ea11497a67	Merge remote-tracking branch 'upstream/master' into NOverlays7	2019-01-02 18:09:19 -08:00
Jeff Clinton	032178673a	Merge pull request #14634 from SamGondelman/NOverlays5 ... Case 20200: Update EntityScriptingInterface to not find local entities (#2)	2019-01-02 09:00:56 -08:00
Brad Hefta-Gaub	440f517b88	Merge pull request #14602 from samcake/punk ... Case 20303 : Cleaning up the render view tasks and jobs for better 2ndary camera	2018-12-27 15:43:17 -08:00
SamGondelman	b5a2642b6a	updated entityscriptinginterface API and related functions ... (cherry picked from commit 6aac596698)	2018-12-22 00:55:10 -05:00
Sam Gondelman	097d2d9503	Revert "Case 20200: Update EntityScriptingInterface to not find local entities"	2018-12-20 16:53:33 -08:00
sam gateau	49df69e609	Merge branch 'master' of github.com:highfidelity/hifi into punk	2018-12-20 13:17:02 -08:00
sam gateau	d8e7305f4a	Removing hili for now	2018-12-18 09:16:40 -08:00
Sam Gateau	76f204b5aa	Exploring the hologram	2018-12-18 00:45:12 -08:00
sam gateau	237fb4dc4c	Shadows are completely working with settings on both pipeline	2018-12-17 17:34:47 -08:00
Sam Gateau	318bf20ede	Shadow is working correctly in both pipelines	2018-12-17 00:27:07 -08:00
SamGondelman	770da220d7	cleanup entity properties more and start polyline work, remove lines	2018-12-12 16:47:35 -08:00
SamGondelman	6aac596698	updated entityscriptinginterface API and related functions	2018-12-07 15:25:21 -08:00
Sam Gateau	a295c6ffc8	scripts\developer\utilities\lib\jet\qml\TaskListView.qml	2018-12-04 22:41:36 -08:00
sam gateau	0343983f31	Applying changes done in deferred to forward	2018-12-03 16:58:54 -08:00
Sam Gateau	aa749b0980	adressing review comments	2018-11-28 21:46:13 -08:00
Sam Gateau	ba4aec2aff	Fixing the issues with thte debug renderdeferredTask and investigating the avatars perf	2018-11-28 01:01:18 -08:00
sam gateau	f348cc35c4	separting debug in its own task	2018-11-26 15:20:45 -08:00
Sam Gateau	6b1c7bf96e	restoring the engine render views and cleaning up the task / config section of the pr	2018-11-20 23:15:09 -08:00