8067 commits

Author	SHA1	Message	Date
Sam Gateau	fec52f6b10	Removing almost all the QFramebufferObject (instead in overlay layer) in favor of gpu::Framebuffer, eveyrthing seems to work properly	2015-04-14 18:27:24 -07:00
Sam Gateau	87030236cb	working version with the gpu::SAmpler and the gpu::Framebuffer	2015-04-14 15:53:24 -07:00
Sam Gateau	c34c5f6075	adding the Fremabuffer to be used for shadows and main rendering	2015-04-14 08:47:52 -07:00
Sam Gateau	534cbdfab0	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2015-04-13 12:22:30 -07:00
Sam Gateau	51ce3129b9	connecting the dots for a framebuffer GLBackend, need to be tested	2015-04-13 12:22:08 -07:00
Sam Gateau	05689c0413	Bringin the Framebuffer to GLBackend and refining the interface	2015-04-13 11:13:30 -07:00
Seth Alves	8479f0d4c1	don't compute shape info until both render and collision geometries are fully loaded	2015-04-13 09:34:38 -07:00
Sam Gateau	69484ad00b	Creating the Framebuffer class and the companion Swapbuffer	2015-04-12 17:36:45 -07:00
Andrew Meadows	e9159304d2	Merge pull request #4617 from sethalves/acceleration-and-owner-in-wire-protocol ... Acceleration and owner in wire protocol	2015-04-10 09:07:47 -07:00
Philip Rosedale	d24264bd81	Merge pull request #4626 from sethalves/island ... more changes to vhacd tool -- useful for generating hull for low-poly island	2015-04-09 15:34:48 -07:00
Seth Alves	4ada3fc9a4	don't keep large things out of physics engine	2015-04-09 15:12:51 -07:00
Seth Alves	efa5c473d2	add fatten-faces mode to convex-hull tool for use on meshes which were derived from height-fields	2015-04-09 14:29:17 -07:00
Brad Davis	3d6cf82659	Merge pull request #4624 from ctrlaltdavid/memory-fixes ... Replace try with nothrow	2015-04-09 12:30:44 -07:00
David Rowe	ae3d606e95	Replace try with nothrow	2015-04-09 10:01:31 -07:00
Clément Brisset	59a5fac2f1	Merge pull request #4619 from ctrlaltdavid/memory-fixes ... Memory fixes	2015-04-09 18:51:02 +02:00
Seth Alves	73a1265624	Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol	2015-04-09 09:21:06 -07:00
David Rowe	b2dd53ac43	Coding standard	2015-04-09 08:37:24 -07:00
Atlante45	298a81cea9	Trim entity properties set from JS that are strings	2015-04-09 14:42:26 +02:00
Clément Brisset	36631dd3a3	Merge pull request #4608 from ctrlaltdavid/fix-animation-not-starting ... CR for Animation fixes	2015-04-09 11:39:13 +02:00
David Rowe	76d6c6cac5	Delete char* items properly	2015-04-08 20:03:42 -07:00
David Rowe	e768852645	Fix catching bad_alloc ... Non-allocation wasn't caught on Windows; it just crashed.	2015-04-08 20:02:22 -07:00
Seth Alves	62ff8bf735	set PROP_LAST_ITEM automatically	2015-04-08 17:07:20 -07:00
Seth Alves	51a0fdf3d4	formatting	2015-04-08 15:43:49 -07:00
Seth Alves	2448051c75	Merge branch 'master' of github.com:highfidelity/hifi into acceleration-and-owner-in-wire-protocol	2015-04-08 15:39:40 -07:00
Seth Alves	1dd01cde00	expand svo to hold acceleration and id of current simulator node	2015-04-08 15:39:34 -07:00
Seth Alves	5c709e2638	quiet compiler	2015-04-08 15:39:07 -07:00
Philip Rosedale	52f82b0768	Merge pull request #4613 from samcake/orange ... fix the rendering bug on mac release	2015-04-08 11:27:06 -07:00
samcake	4fb5c8f907	fix the rendering bug on mac release due to the State::DepthTest not properly aligned to 4bytes. Improved the glCheckError for knowing where the error comes from.	2015-04-08 11:04:13 -07:00
Andrew Meadows	ad33bf0dfb	Merge pull request #4609 from sethalves/island ... physics collision model extents, more vhacd changes	2015-04-08 09:02:36 -07:00
Philip Rosedale	b949353b0b	Merge pull request #4611 from AndrewMeadows/isentropic ... use DynamicCharacterController	2015-04-08 08:03:01 -07:00
Andrew Meadows	2ccc25e380	remove old kinematic CharacterController	2015-04-07 16:29:52 -07:00
Andrew Meadows	40c94fa00e	merge upstream/master into andrew/isentropic	2015-04-07 16:23:38 -07:00
Andrew Meadows	d9146b1033	jump to hover works again	2015-04-07 16:23:06 -07:00
Seth Alves	e8ff727c61	when populating shape-info, give the dimensions of the collision model rather than those of the visual model	2015-04-07 15:47:13 -07:00
Seth Alves	3cfafea5ca	Merge branch 'master' of github.com:highfidelity/hifi into island	2015-04-07 15:09:50 -07:00
Andrew Meadows	b5f0c57dd1	jumping and hovering works with dynamic controller	2015-04-07 15:07:46 -07:00
Sam Gateau	ad9129b552	Fixing all the shaders for entities to work correctly with the now supported color attribute field	2015-04-07 14:26:45 -07:00
David Rowe	43a130dabe	Fix Stop button not working at the end of a non-looped animation	2015-04-07 14:02:42 -07:00
Sam Gateau	f0efade06d	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2015-04-07 12:56:21 -07:00
Andrew Meadows	a47170b02c	Merge pull request #4601 from samcake/temp1 ... Introducing gpu::State and using it in the Model rendering path and more...	2015-04-07 12:48:42 -07:00
Sam Gateau	9d6839e6a1	Merge branch 'temp1' of https://github.com/samcake/hifi into orange	2015-04-07 11:45:57 -07:00
Sam Gateau	25643479c9	Fixed the memory leak, due to the location pointer in the Model::RenderPipelineLib which was not smart pointed correctly	2015-04-07 11:20:55 -07:00
Seth Alves	bc9e818b95	Merge branch 'master' of github.com:highfidelity/hifi into island	2015-04-07 11:12:16 -07:00
Sam Gateau	88afb3cedc	solution to the color attribute case	2015-04-07 10:04:51 -07:00
Seth Alves	ef5dffecf6	fix filenames in comments	2015-04-07 10:03:14 -07:00
Seth Alves	9014397167	try again without macro	2015-04-07 09:59:04 -07:00
Sam Gateau	dee651069c	adding support for color attribute in FBX, and displaying it correctly	2015-04-06 23:33:13 -07:00
Seth Alves	fb607e2b26	logging groups for library/shared and interface	2015-04-06 18:45:06 -07:00
Seth Alves	cd5245d0d6	logging group for render-utils	2015-04-06 18:16:01 -07:00
Seth Alves	55bab2efd6	put physics into its own logging group	2015-04-06 18:09:45 -07:00