14113 commits

Author	SHA1	Message	Date
Atlante45	bd23a4137e	Move toGlm to GLMHelpers	2015-12-03 15:01:17 -08:00
Atlante45	9c5486fb4b	More particle work	2015-12-03 15:01:17 -08:00
Atlante45	2dd494b5df	Remove additive blending option (force it)	2015-11-24 11:51:56 -08:00
Atlante45	4827a96bfa	Fix vertex shader (nested struct unsupported)	2015-11-24 11:51:56 -08:00
Atlante45	d08a4d77dc	Shader cleanup	2015-11-24 11:51:56 -08:00
Atlante45	28c8cf26f5	Fix shader transform errors	2015-11-24 11:51:56 -08:00
Atlante45	9adc437553	Make Particle's Payload/PendingChanges *almost* pointer free	2015-11-24 11:51:56 -08:00
Atlante45	0f316e6ae1	Remove particles emiter bounds compute	2015-11-24 11:51:56 -08:00
Atlante45	2cb2ca29e6	More particle shader work	2015-11-24 11:51:56 -08:00
Atlante45	74278cad40	Fix particle texturing	2015-11-24 11:51:56 -08:00
Atlante45	e25ea122d8	Start moving update to shader	2015-11-24 11:51:56 -08:00
Atlante45	61511d57bb	Rename struct/Add type aliases	2015-11-24 11:51:56 -08:00
Atlante45	ca17c75631	Save one array traversal	2015-11-24 11:51:56 -08:00
Atlante45	cb14fbf4a1	Instance particle draw calls	2015-11-24 11:51:56 -08:00
Atlante45	230a413ec1	First pass at new particle shader	2015-11-24 11:51:56 -08:00
Atlante45	7d0a5677fa	More code cleanup	2015-11-24 11:51:56 -08:00
Atlante45	964ac5bad6	More cleanup	2015-11-24 11:51:56 -08:00
Atlante45	c33b6205a8	Some cleanup	2015-11-24 11:51:56 -08:00
Atlante45	40e802bae7	Get rid of global variable for sort ... Fix rhs/lhs	2015-11-24 11:51:56 -08:00
Atlante45	395822c6cd	Use make_shared	2015-11-24 11:51:56 -08:00
Atlante45	a71ed7b166	Implement particle bounds with Extents	2015-11-24 11:51:56 -08:00
Atlante45	9320623ff5	Add AABox functionalities	2015-11-24 11:51:56 -08:00
Philip Rosedale	dde01b2071	Merge pull request #6476 from AndrewMeadows/arrow ... fix for objects suffering from very small updates to physics properties	2015-11-24 11:22:25 -08:00
Brad Hefta-Gaub	fd7a704753	Merge pull request #6471 from birarda/url-cmp ... fix unnecessary model URL updating thanks to URL encoding	2015-11-24 10:56:21 -08:00
Andrew Meadows	e26081e981	always update physics properties when they change ... and move activation check logic to MotionState	2015-11-24 10:20:19 -08:00
Andrew Meadows	5135c9dded	whitespace cleanup	2015-11-24 10:20:19 -08:00
Brad Hefta-Gaub	d32e500464	Merge pull request #6462 from jherico/rec5 ... Blendshapes and attachments in recordings, plus other minor fixes.	2015-11-24 10:01:17 -08:00
Stephen Birarda	5a7b0dd1ad	put the parsed model URL in ModelEntityItem	2015-11-24 11:46:51 -06:00
Stephen Birarda	0d6b919448	cleanup printing of updated model URL	2015-11-24 11:22:30 -06:00
Stephen Birarda	0e19e50047	cleaner handling for QString/QUrl conversion/comparison	2015-11-24 11:17:46 -06:00
Stephen Birarda	762709748d	Merge pull request #6473 from ZappoMan/waitForScriptThreads ... change the ScriptEngine::waitTillDoneRunning() to wait for the script thread to complete	2015-11-24 10:39:22 -06:00
Brad Davis	5c2b980a45	Fixing avatar facial blendshapes and attachments in recordings	2015-11-23 22:36:07 -08:00
Brad Davis	bc84265e99	Additional checking when serializing transforms to json	2015-11-23 22:35:12 -08:00
Brad Davis	3738f21936	Fix occasional deadlock in loading recordings	2015-11-23 22:34:17 -08:00
samcake	a1668cdc73	Let the AssertClient JS interface use global vars	2015-11-23 22:28:59 -08:00
Brad Hefta-Gaub	5f88d958ab	CR feedback	2015-11-23 18:26:15 -08:00
Brad Hefta-Gaub	ce46c30647	change the ScriptEngine::waitTillDoneRunning() to wait for the script thread to complete	2015-11-23 16:27:06 -08:00
Stephen Birarda	6339c2c48f	fix for unnecessary model URL updating	2015-11-23 17:25:31 -06:00
Seth Alves	d4937071e1	rather than activating rigid body and forcing non-static on deserialize, just force non-static	2015-11-23 12:17:15 -08:00
Seth Alves	6f19093cb9	if an entity with an action has a motion-type of static, flag it so it gets updated in bullet	2015-11-23 10:03:35 -08:00
Brad Davis	64ba5b4f14	Cleaning up old recording files	2015-11-23 09:42:34 -08:00
EdgarPironti	ebbed7c525	Save clip to asset - removing last fix	2015-11-20 18:23:36 -08:00
samcake	de56f698aa	Merge pull request #6444 from EdgarPironti/asset_branch ... Save clip to asset	2015-11-20 16:28:55 -08:00
Brad Davis	336562b894	Merge pull request #6452 from ctrlaltdavid/20732 ... Make multiline strings from JavaScript's print() readably in log file	2015-11-20 16:25:17 -08:00
EdgarPironti	df2153186d	Fixes	2015-11-20 16:07:31 -08:00
EdgarPironti	e70f6855aa	Fixes	2015-11-20 16:07:30 -08:00
EdgarPironti	35365f9157	Fixes	2015-11-20 16:07:30 -08:00
EdgarPironti	1db6d0e3c1	Upload QByteArray	2015-11-20 16:07:29 -08:00
EdgarPironti	1b18d3656f	Save clip to asset	2015-11-20 16:07:29 -08:00
Brad Davis	f45eff3df9	Merge pull request #6455 from samcake/controllers ... Recording playback the skeleton animation correctly for agents	2015-11-20 15:35:53 -08:00