7828 commits

Author	SHA1	Message	Date
Andrew Meadows	10af59296d	Merge pull request #4499 from sethalves/multi-hull-collisions ... Multi hull collisions	2015-03-30 12:11:56 -07:00
Andrew Meadows	2404fb126f	Merge pull request #4527 from sethalves/valgrind ... Valgrind told me to do it	2015-03-30 11:56:17 -07:00
Seth Alves	e730109c51	quiet debuging spew	2015-03-30 11:46:48 -07:00
Seth Alves	f90211e830	Merge pull request #1 from AndrewMeadows/cyclohexane ... optimizations when creating convex hull shapes	2015-03-30 11:38:49 -07:00
Philip Rosedale	2951d17bf3	Merge pull request #4529 from AndrewMeadows/inertia ... fix crash for bad avatar body on login	2015-03-30 11:30:39 -07:00
Seth Alves	186cb1ec7a	merge from upstream	2015-03-30 11:28:47 -07:00
Seth Alves	8a5192c1d9	attempt to handle registration point in hull collisions	2015-03-30 11:22:31 -07:00
Andrew Meadows	da9ceac9ae	fix crash for bad avatar body on login	2015-03-30 11:06:02 -07:00
Philip Rosedale	685de8cc7f	Merge pull request #4522 from huffman/rename-attribution ... Rename attribution to marketplaceID	2015-03-30 10:57:28 -07:00
Andrew Meadows	adf076a630	optimizations when creating convex hull shapes	2015-03-30 09:56:30 -07:00
Seth Alves	7137b41375	free these so it's easier to see other leaks in valgrind	2015-03-30 09:30:37 -07:00
Seth Alves	4bf86bb824	another [] needed after delete	2015-03-29 17:59:57 -07:00
Seth Alves	26230cf493	uninitialized variable (quiet valgrind)	2015-03-29 05:40:39 -07:00
Seth Alves	a47ae9212b	quiet compiler	2015-03-28 17:13:31 -07:00
Seth Alves	1e166eef0f	valgrind says _ghostObject is used before it's initialized	2015-03-28 17:12:55 -07:00
Seth Alves	96bfc53391	prototype has no code and isn't used	2015-03-28 17:11:56 -07:00
Seth Alves	78b46cff2b	quiet compiler	2015-03-28 17:11:36 -07:00
Seth Alves	faa3ed6c29	valgrind wants []	2015-03-28 17:11:23 -07:00
ZappoMan	a765b4c8a5	fix to preload getting called when you change a script	2015-03-27 18:56:55 -07:00
Seth Alves	90f51e7d4c	print a warning when ShapeManager is skipping over a too-large or too-small shape	2015-03-27 16:15:54 -07:00
Seth Alves	fd69a54f10	Merge branch 'master' of github.com:highfidelity/hifi into multi-hull-collisions	2015-03-27 15:55:20 -07:00
Stephen Birarda	80ecbed02b	Merge pull request #4524 from ctrlaltdavid/fix-xmlhttprequest-auth ... Fix authorization of API calls in XMLHttpRequest	2015-03-27 15:35:14 -07:00
David Rowe	c456760419	Extract API URL into a const	2015-03-27 15:24:55 -07:00
Philip Rosedale	53970cb530	Merge pull request #4525 from ZappoMan/defaultAvatarBodyFix ... fix bug in default avatars	2015-03-27 14:54:35 -07:00
ZappoMan	1821683453	fix bug in default avatars	2015-03-27 14:44:35 -07:00
Seth Alves	cfa30594cc	make obj reader handle faces with more than 4 vertices	2015-03-27 14:24:36 -07:00
David Rowe	1ee797efa4	Fix authorization of API calls in XMLHttpRequest	2015-03-27 13:59:52 -07:00
Andrew Meadows	5b85a2aa44	merge upstream/master into andrew/inertia	2015-03-27 13:56:54 -07:00
Andrew Meadows	bee8c0e237	"hover" if the "jump" key is held down long enough	2015-03-27 13:56:03 -07:00
Andrew Meadows	be5fdbf217	enable avatar collisions by default ... also remove old gravity features	2015-03-27 13:36:20 -07:00
Ryan Huffman	81cb1e98ba	Rename attribution to marketplaceID	2015-03-27 13:35:58 -07:00
Philip Rosedale	6550b4e311	Merge pull request #4509 from AndrewMeadows/inertia ... character transitions into "hover" when stepping over abyss	2015-03-27 13:16:36 -07:00
Seth Alves	087248dffc	fix locking in ResourceCache::checkAsynchronousGets	2015-03-27 13:14:20 -07:00
Brad Hefta-Gaub	2255c30d58	Merge pull request #4512 from Atlante45/ordered_fst ... Hint order for FST files	2015-03-27 09:41:50 -07:00
Andrew Meadows	b9b2c30bba	use QObject::deleteLater() not explicit delete	2015-03-27 09:01:44 -07:00
Andrew Meadows	e75bb3cd9c	merge upstream/master into andrew/inertia	2015-03-27 08:14:36 -07:00
Atlante45	e16c8852fb	extra ;	2015-03-27 14:43:09 +01:00
Atlante45	daaba330d5	Turn lambda into helper function	2015-03-27 14:41:32 +01:00
Andrew Meadows	821ac605f5	smoother motion on steps ... faster motion when "flying" cleanup of MyAvatar::updatePosition()	2015-03-26 19:48:52 -07:00
Seth Alves	16875338bf	Merge branch 'master' of github.com:highfidelity/hifi into multi-hull-collisions	2015-03-26 18:55:43 -07:00
Seth Alves	7da87d6e15	set up a way to request ResourceCache downloads from a non-networking thread.	2015-03-26 18:37:55 -07:00
ZappoMan	8e7ead2ead	fix locking issue in enter/leave entity scripts	2015-03-26 16:05:31 -07:00
Andrew Meadows	0035e8df88	merge	2015-03-26 15:17:14 -07:00
Andrew Meadows	8a951e0dd3	minor cleanup	2015-03-26 15:16:57 -07:00
Andrew Meadows	0ef4022e94	tweak gravity and step heights of controller	2015-03-26 15:14:46 -07:00
Andrew Meadows	858dbeb674	remove one line of cruft	2015-03-26 13:23:15 -07:00
Andrew Meadows	9c6ea7380f	merge	2015-03-26 13:20:51 -07:00
Seth Alves	212f564131	Merge branch 'master' of github.com:highfidelity/hifi into multi-hull-collisions	2015-03-26 13:08:44 -07:00
Atlante45	c26b499671	Add forgotten include	2015-03-26 15:58:18 +01:00
Atlante45	716e9bfe4f	Hint order for FST files	2015-03-26 15:40:48 +01:00