14093 commits

Author	SHA1	Message	Date
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
samcake	0dc551409d	Fixing a comment	2015-11-20 15:22:01 -08:00
samcake	e97e864de7	Getting the animation playback to work	2015-11-20 15:05:17 -08:00
Clément Brisset	5d75fcbfce	Merge pull request #6430 from birarda/unique_linked_data ... use a unique_ptr for linkedData in Node	2015-11-20 15:01:41 -08:00
David Rowe	c72c6a0a47	Make multiline strings from JavaScript's print() readably in log file ... Addresses quoting of newline characters as "\n" which was introduced in Qt 5.5.	2015-11-21 10:44:21 +13:00
Brad Hefta-Gaub	c7673aad4a	Merge pull request #6447 from huffman/polyline-texture ... Add texture property to polyline entity type	2015-11-20 13:31:34 -08:00
Brad Hefta-Gaub	879c42c269	Merge pull request #6451 from jherico/rec5 ... Force synchronous loading of clips in JS	2015-11-20 13:13:34 -08:00
Brad Davis	eef01f8a13	Merge pull request #6443 from ZappoMan/assetJS ... fix crash with no asset server	2015-11-20 12:58:16 -08:00
Stephen Birarda	b34934b849	resolve conflicts on merge with upstream/master	2015-11-20 11:52:53 -08:00
Brad Davis	cc2a7cbda8	Force synchronous loading of clips in JS	2015-11-20 11:51:08 -08:00
Brad Hefta-Gaub	c22d632c3a	Merge pull request #6446 from jherico/rec4 ... Support writing a clip to a qbytearray	2015-11-20 11:45:39 -08:00
Brad Hefta-Gaub	f1badc017b	CR feedback	2015-11-20 11:43:50 -08:00
Brad Davis	a356f96a7b	Merge pull request #6448 from ZappoMan/messaging ... fix senderID in messages, dry up code	2015-11-20 11:42:30 -08:00
Clément Brisset	f4b0492b33	Merge pull request #6436 from birarda/ghost-avatar ... fix for ghosted avatars thanks to check/add race	2015-11-20 11:41:20 -08:00
Brad Hefta-Gaub	7e9190d0e1	Merge branch 'master' of https://github.com/highfidelity/hifi into assetJS	2015-11-20 11:39:50 -08:00
Brad Hefta-Gaub	caa8b0b5b6	fix unix build	2015-11-20 11:07:01 -08:00
Stephen Birarda	19d3d80ff9	fixes for some incorrect assumptions	2015-11-20 11:03:52 -08:00
Brad Hefta-Gaub	4bbfcb6092	Merge branch 'master' of https://github.com/highfidelity/hifi into messaging	2015-11-20 10:30:38 -08:00
Brad Hefta-Gaub	0e5e33446e	handle old protocol case	2015-11-20 09:57:30 -08:00
Brad Hefta-Gaub	8ba6dfe721	add deprication warning about binary SVOs	2015-11-20 09:29:36 -08:00
Brad Hefta-Gaub	abf169ebd9	fix senderID in messages, dry up code	2015-11-20 09:03:21 -08:00