23476 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
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
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
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
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
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
Ryan Huffman	36c79ccc03	Merge pull request #4520 from cozza13/20426 ... CR for Job #20426 - Remove references to models out of edit.js	2015-03-27 09:39:36 -07:00
Philip Rosedale	0874683727	Merge pull request #4519 from huffman/change-default-light-color ... Update default light color to (150,150,150)	2015-03-27 09:38:19 -07:00
Chris Collins	83af2feded	Remove reference to FBX files ... Remove reference to FBX files	2015-03-27 09:33:19 -07:00
Ryan Huffman	c9f4f4626b	Update default light color to (150,150,150)	2015-03-27 09:21:32 -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
Stephen Birarda	647e2d7829	Merge pull request #4517 from ZappoMan/menuCleanup ... menu and display tweaks at Philip's request	2015-03-26 20:06:16 -07:00
Andrew Meadows	821ac605f5	smoother motion on steps ... faster motion when "flying" cleanup of MyAvatar::updatePosition()	2015-03-26 19:48:52 -07:00
Brad Hefta-Gaub	57f87b9b42	Merge pull request #4518 from birarda/master ... add user heartbeat if they choose not to send a location	2015-03-26 17:08:00 -07:00
Stephen Birarda	ba82436d95	add user heartbeat if they choose not to send location	2015-03-26 16:50:40 -07:00
Brad Hefta-Gaub	7f74bd1ae9	Merge pull request #4513 from ctrlaltdavid/20421 ... CR for Job #20421 - Add scrollbar to Users Online window	2015-03-26 16:50:30 -07:00
Brad Hefta-Gaub	0cee3892ff	Merge pull request #4516 from huffman/fix-edit-buttons ... Fix marketplace showing for all edit properties buttons	2015-03-26 16:38:47 -07:00
ZappoMan	6cff99f9d6	menu and display tweaks	2015-03-26 16:36:46 -07:00
Ryan Huffman	28e2e65da9	Fix marketplace showing for all edit properties buttons	2015-03-26 16:23:36 -07:00
Stephen Birarda	050f0144d0	Merge pull request #4515 from ZappoMan/entityScriptsLocking ... fix locking issue in enter/leave entity scripts	2015-03-26 16:23:08 -07:00
Brad Hefta-Gaub	3b5d48acd1	Merge pull request #4514 from birarda/master ... prefer tbb release libraries for debug on OS X	2015-03-26 16:06:53 -07:00
ZappoMan	8e7ead2ead	fix locking issue in enter/leave entity scripts	2015-03-26 16:05:31 -07:00
Andrew Meadows	599e6aa83e	merge upstream/master into andrew/inertia	2015-03-26 15:17:53 -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
Stephen Birarda	42a0f719d8	Merge branch 'master' of https://github.com/highfidelity/hifi	2015-03-26 14:10:41 -07:00