23532 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Stephen Birarda	f0c4aef932	download and make tbb for OS X	2015-03-30 17:26:33 -07:00
Stephen Birarda	79ef05831d	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-03-30 16:44:33 -07:00
Stephen Birarda	a308eb2e2f	don't use DX11 for bullet even if found	2015-03-30 16:44:10 -07:00
Philip Rosedale	f116ac131d	Merge pull request #4532 from AndrewMeadows/inertia ... fix crash in PhysicsEngine on shutdown	2015-03-30 16:31:34 -07:00
Philip Rosedale	f047255f68	Merge pull request #4531 from sethalves/fix-physics-crash ... fix a couple of crashes	2015-03-30 16:17:20 -07:00
Andrew Meadows	c6b34df06c	unlock after character is properly updated	2015-03-30 16:07:56 -07:00
Seth Alves	ee7247a5b4	fix a couple of crashes	2015-03-30 15:56:01 -07:00
Andrew Meadows	9b13f186e3	remove character from PhysicsEngine on shutdown	2015-03-30 15:51:58 -07:00
Stephen Birarda	9f0e146782	Merge pull request #4530 from birarda/master ... fix for marketplace URL on right click	2015-03-30 15:15:01 -07:00
Stephen Birarda	909c4ad919	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-03-30 15:10:53 -07:00
Stephen Birarda	75da852b39	fix for marketplace url on right click	2015-03-30 15:10:16 -07:00
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	7de15cda87	quiet compiler	2015-03-30 09:30:13 -07:00
Philip Rosedale	099a2b5319	Merge pull request #4521 from ctrlaltdavid/20416 ... CR for Job #20416 - Update notification.js to include a notification about being blocked from a server	2015-03-30 08:49:29 -07:00
Clément Brisset	d17c3c078a	Merge pull request #4526 from ZappoMan/fixScriptChangePreload ... fix to preload getting called when you change a script	2015-03-30 15:40:23 +02: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	2dd33e5334	don't include build-ext in tags	2015-03-29 05:40:16 -07:00
Seth Alves	43c3c621a8	I can't set VHACD_ROOT_DIR and run cmake with this line.	2015-03-28 17:14: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
Seth Alves	fc1e45fc58	valgrind says this is used before it's initialized	2015-03-28 17:10:46 -07:00
Seth Alves	986bc71e93	quiet compiler	2015-03-28 17:10:26 -07:00
Seth Alves	9428857194	quiet compiler, remove extra-assignment/typo	2015-03-28 17:10:16 -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
Philip Rosedale	d908b7fdc6	Merge pull request #4523 from AndrewMeadows/inertia ... enable avatar physics by default	2015-03-27 14:53:40 -07:00
ZappoMan	1821683453	fix bug in default avatars	2015-03-27 14:44:35 -07:00
Grayson Stebbins	0fd17b3303	editEntities.js --> edit.js	2015-03-27 14:40:16 -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