2704 commits

Author	SHA1	Message	Date
Olivier Prat	381e0c64a8	Working avatar fade in / fade out except that it is also triggered on bubble collisions	2017-07-11 16:43:27 +02:00
Olivier Prat	aba8be595e	Separated fade categories from transition event types	2017-07-11 11:37:24 +02:00
Olivier Prat	9758a6ded0	Edition picking again (but without bounding box highlighting)	2017-07-10 17:57:02 +02:00
Olivier Prat	66d09a4c3c	Some objects fade and fixed crash due to invalid meta item id	2017-07-10 16:02:12 +02:00
Olivier Prat	267531cc1a	First working fade	2017-07-10 15:27:09 +02:00
Olivier Prat	06d69d04c3	TransitionStage + FadeJob compiling but not linked to entity events	2017-07-07 18:22:11 +02:00
Olivier Prat	4256a1f2a7	Preparing for merge with stage. DOESN'T COMPILE!	2017-07-07 15:16:20 +02:00
Sam Gateau	d15c4ea2d3	Merging with the stage branch	2017-07-07 15:12:40 +02:00
Sam Gateau	a8086764da	REmoving warnings for unused var	2017-07-07 12:19:22 +02:00
Sam Gateau	4c1bf6af47	REmoving comments	2017-07-07 11:38:25 +02:00
Olivier Prat	5ab093dc38	Preparing to introducte TransitionStage	2017-07-07 11:01:47 +02:00
Sam Gateau	156c20d01e	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2017-07-07 10:58:05 +02:00
Olivier Prat	69a7ec42fd	Added fade state in render::Item	2017-07-07 09:16:54 +02:00
Olivier Prat	018c0489f4	Merged with 21378	2017-07-06 16:53:47 +02:00
Sam Gateau	53ffca796f	Drafting a better SHape plumber to render the items	2017-07-06 16:35:40 +02:00
Sam Gateau	48b4b5f49c	Fixing the bug appearing on Nvidia 284.76	2017-07-05 18:39:09 +02:00
Olivier Prat	b1b11ec756	Correct fix for mac and linux due to multiple Logging.h files	2017-07-05 09:08:51 +02:00
Olivier Prat	23bfc2c13d	Fixed compilation on mac and linux	2017-07-04 18:36:54 +02:00
Olivier Prat	5cee2cff9f	Merge branch 'master' of git://github.com/highfidelity/hifi into 21378	2017-07-04 17:48:07 +02:00
Olivier Prat	45342a00fd	Forced faded objects to double sided (without correct lighting for the moment)	2017-07-04 17:45:32 +02:00
Olivier Prat	704effc0a6	Added cubic interpolation in noise for rounder effect	2017-07-04 17:38:45 +02:00
Olivier Prat	2525fe5869	Working save and load	2017-07-04 17:31:24 +02:00
Olivier Prat	98d915cf0f	Smoother ease in / out functions	2017-07-04 14:35:43 +02:00
Olivier Prat	7d851c1cbd	Added timing parameters and visual debug of threshold	2017-07-04 12:01:28 +02:00
Olivier Prat	0244dd6325	Working bubble isect trespasser POV	2017-07-04 09:47:23 +02:00
Olivier Prat	57b2bdf709	Working bubble isect owner POV	2017-07-04 09:14:08 +02:00
Seth Alves	70a7b302fc	Merge pull request #10860 from jherico/deadlock_guards ... Don't use blocking connections on the main thread	2017-07-03 09:05:56 -07:00
Olivier Prat	f2b8bd4c84	Merged with 21378	2017-07-03 16:44:00 +02:00
Olivier Prat	ec1cf9dc50	Changed array initialization to old style C	2017-07-03 16:42:27 +02:00
Olivier Prat	0d1d262db4	Working on bubble intersections	2017-07-03 16:28:00 +02:00
Olivier Prat	3fddac9f6e	Fixed compilation errors with array initializations	2017-07-03 16:12:23 +02:00
Olivier Prat	d9a83539b2	Merged with master	2017-07-03 15:32:30 +02:00
Olivier Prat	af7957491b	Working avater enter/leaves + manual threshold	2017-07-03 12:40:58 +02:00
Brad Davis	6fc82bb351	Switch to preprocessor macro for blocking invokes to capture function information	2017-06-30 11:36:24 -07:00
Olivier Prat	87833abd31	Sky working again.	2017-06-30 16:46:25 +02:00
Brad Davis	b52dd7b822	Don't use blocking connections on the main thread	2017-06-29 20:45:17 -07:00
Olivier Prat	c5ca23f4ea	Changing edited fade category properly updates widgets in edit window	2017-06-29 17:14:20 +02:00
Olivier Prat	fb33b8d1c1	Working edition and emissive edge on fade element enter/leave	2017-06-29 12:59:43 +02:00
Olivier Prat	6a31dc2659	Selection of edited object working	2017-06-29 12:13:55 +02:00
Olivier Prat	8a12d0c106	Fade effect working again for basic enter domain but with various Fade jobs	2017-06-29 08:54:23 +02:00
Sam Gateau	93963b3257	Apply the projection and deferred transform fixes found while working on spectator camera	2017-06-28 15:44:17 +02:00
Sam Gateau	76dae279cf	Removing the default case from the renderer	2017-06-27 14:24:34 +02:00
Sam Gateau	7687bdc060	less comments & constant	2017-06-26 17:02:45 +02:00
Sam Gateau	5e05c41980	less comments & constant	2017-06-26 16:56:04 +02:00
Sam Gateau	6ab2dccd38	less comments & constant	2017-06-26 16:52:04 +02:00
Sam Gateau	7cbeabfc29	less comments & constant	2017-06-26 16:49:20 +02:00
Sam Gateau	a2fc44703d	One less constant	2017-06-26 16:45:54 +02:00
Sam Gateau	904f22985c	CLeaning up comments	2017-06-26 16:43:04 +02:00
Sam Gateau	77644e7e9d	Removing commented objects from deferredlighting effect	2017-06-26 14:34:09 +02:00
Olivier Prat	1bb0d51849	Merged with master	2017-06-26 11:55:46 +02:00