2153 commits

Author	SHA1	Message	Date
Brad Davis	c5628b615c	Make sure we start fade in once an item becomes ready	2016-08-24 16:05:22 -07:00
Seth Alves	9bcda1bb45	merge from upstream	2016-08-20 15:25:04 -07:00
Brad Hefta-Gaub	1cec7b2db0	Merge pull request #8429 from SamGondelman/loadingFade2 ... Don't do fade effect once physics kick in	2016-08-18 12:46:24 -07:00
Seth Alves	87dbfa7e47	add -Wsuggest-override to compile flags and deal with fallout	2016-08-18 09:51:41 -07:00
samcake	8d12a23efb	Merge pull request #8325 from jherico/deferred_batches_threaded ... Threaded rendering	2016-08-15 09:59:44 -07:00
Brad Davis	fdbbd70eed	Merge pull request #8422 from sethalves/sidestep-linux-gcc-bug ... sidestep linux gcc linker? bug	2016-08-13 12:08:05 -07:00
Brad Davis	574737fbb5	More GPU api fixes, protect Buffer::flush	2016-08-12 22:29:04 -07:00
Brad Davis	6d7edd38cc	Rename clearViewTransform	2016-08-12 22:28:59 -07:00
Brad Davis	cbe1f6dbf5	Allow the lighting framebuffer to use the camera correction to stabilize lights in the HMD	2016-08-12 22:28:32 -07:00
Brad Davis	894d29bb29	Fixing flicking in instance based objects	2016-08-12 22:28:24 -07:00
Brad Davis	adcfd55cc0	Batch replay reprojection	2016-08-12 22:28:23 -07:00
SamGondelman	ccca6d935f	don't fade after physics kick in	2016-08-12 14:35:22 -07:00
Seth Alves	77a49e6c10	when building in debug mode on Linux, for reasons totally beyond me, this code ends up using the Vertex from FBXReader_Mesh.cpp (which is a different size so I get a crash). This change hopefully doesn't change any functionality while sidestepping what's probably a bug in gcc.	2016-08-12 10:01:20 -07:00
Brad Hefta-Gaub	a714f325fe	Merge pull request #8333 from SamGondelman/miscFixes ... Miscellaneous cmake and render engine improvements	2016-08-10 11:06:50 -07:00
SamGondelman	9e20d92241	CR changes	2016-08-10 10:35:18 -07:00
SamGondelman	9b27f8bc0f	Merge remote-tracking branch 'upstream/master' into loadingFade	2016-08-09 14:55:14 -07:00
SamGondelman	36d9f92101	performance optimization to minimize calling usecTimestampNow	2016-08-09 13:10:02 -07:00
SamGondelman	ae9fb3768c	CR notes	2016-08-08 17:45:25 -07:00
Ryan Huffman	6854f9fda4	Remove stars shaders and renderable	2016-08-08 16:03:03 -07:00
SamGondelman	de900e85c0	remove duplicate include	2016-08-08 14:10:47 -07:00
SamGondelman	328d3128fa	merge from master	2016-08-08 13:30:39 -07:00
SamGondelman	f311907982	fix merge mistake	2016-08-08 11:08:01 -07:00
Ryan Huffman	2a071c4329	Fix improperly formatted floats	2016-08-08 10:39:06 -07:00
Ryan Huffman	4f9be2ae72	Fix camera position not being set for angular loading	2016-08-08 08:53:06 -07:00
Ryan Huffman	77e993510e	Cleanup implementation of angular loading	2016-08-08 08:53:05 -07:00
Ryan Huffman	c594dcdf9f	Add priority loading for model entities	2016-08-08 08:52:29 -07:00
SamGondelman	dd51e0e38f	merge from master	2016-08-05 17:04:45 -07:00
SamGondelman	771e105fa2	Merge remote-tracking branch 'upstream/master' into loadingFade	2016-08-05 16:52:01 -07:00
Sam Gondelman	debda37567	Merge pull request #8379 from SamGondelman/loadingFade ... fixed procedural entity fade	2016-08-05 16:48:51 -07:00
SamGondelman	b794259b7d	fixed procedural entity fade	2016-08-05 16:15:10 -07:00
Sam Gondelman	84b7f9b186	Merge pull request #8375 from SamGondelman/loadingFade ... remove polyvox fade, fix web fade, add light fade	2016-08-05 11:53:15 -07:00
SamGondelman	8494400047	don't use web entity texel color alpha as per tony's suggestion	2016-08-05 11:27:56 -07:00
SamGondelman	130e64aaba	remove polyvox fade, possibly fix web fade	2016-08-05 10:36:48 -07:00
Brad Hefta-Gaub	83280aa3f2	implement support for updating the render items of models when they finish their fade	2016-08-05 10:11:07 -07:00
SamGondelman	b6e73e06a2	merge from master	2016-08-04 13:34:38 -07:00
Seth Alves	905c6147cf	Merge branch 'master' of github.com:highfidelity/hifi into default-when-av-fails	2016-08-04 09:56:32 -07:00
SamGondelman	d7052f6250	try to make text entities fade	2016-08-03 16:27:51 -07:00
SamGondelman	7713c1f4bf	try to fade in web entities	2016-08-03 15:56:41 -07:00
Anthony J. Thibault	f24c92f3a1	Bug fix for avatar debug marker rendering. ... "Developer > Hands > Show Hand Targets" works again "Developer > Avatar > Draw Position" works again	2016-08-03 15:43:31 -07:00
SamGondelman	27bacc9165	try to fade in procedural shapes	2016-08-03 14:33:05 -07:00
SamGondelman	2eb0c7735f	working on fading shape entities	2016-08-03 13:30:05 -07:00
Seth Alves	c743cf379e	use loadCollisionModelURLFinished when collisions model is finished	2016-08-03 11:31:51 -07:00
Seth Alves	ad4fc8c656	merge from upstream, don't hold up enabling of physics if a collision hull fails to load	2016-08-03 10:42:15 -07:00
SamGondelman	d63a0ef08f	working on making other entities transparent	2016-08-02 18:09:42 -07:00
Stephen Birarda	5d3e125a06	make failed geomtetry request not hold physics	2016-08-02 16:32:41 -07:00
SamGondelman	5de21982be	fix linux build	2016-08-02 11:44:17 -07:00
SamGondelman	ad5dec829c	why did I change that	2016-08-02 10:52:51 -07:00
SamGondelman	3d08502080	space	2016-08-02 10:50:57 -07:00
SamGondelman	74f11eb70b	try a different easing function	2016-08-02 10:50:31 -07:00
SamGondelman	0b5c7909b8	a calculated change	2016-08-01 18:45:25 -07:00