11237 commits

Author	SHA1	Message	Date
Brad Hefta-Gaub	356dbbec72	Merge pull request #4399 from ctrlaltdavid/20369 ... Fix for 20369	2015-03-11 18:09:07 -07:00
Stephen Birarda	69bc6c9761	Merge pull request #4426 from ZappoMan/fixAvatarManagerCrash ... some cleanup of dead code related to timers	2015-03-11 17:14:40 -07:00
ZappoMan	cab6cc8c75	fix crash on exit related to AvatarManager using TextureCach resources	2015-03-11 16:30:21 -07:00
ZappoMan	e87e0a1e0b	some cleanup of dead code related to timers	2015-03-11 16:27:04 -07:00
Seth Alves	48aca5c46f	Merge pull request #4423 from AndrewMeadows/isentropic ... remove old ragdoll simulation and avatar interactions	2015-03-11 15:18:15 -07:00
Andrew Meadows	bd115aa8f8	merge upstream/master into andrew/isentropic	2015-03-11 14:30:22 -07:00
Andrew Meadows	feafa0a60b	remove old Ragdoll and avatar interactions	2015-03-11 14:29:03 -07:00
David Rowe	32897de80a	Rename Stereo Audio menu item	2015-03-11 12:41:47 -07:00
Clément Brisset	885e6206e9	Merge pull request #4420 from ctrlaltdavid/20394 ... CR for Job #20394 - Build friends.js v1	2015-03-11 11:17:04 -07:00
David Rowe	3d11dde8ad	Check that the user configures a skeleton root joint ... Instead of just checking that the model has a "Hips" joint.	2015-03-10 20:27:31 -07:00
David Rowe	e57d63b20e	Merge branch 'master' into 20369	2015-03-10 18:55:27 -07:00
Leonardo Murillo	0509270bc6	Merge pull request #4415 from birarda/master ... fix for SVG issues on Windows	2015-03-10 19:28:21 -06:00
Stephen Birarda	931a234ba7	fix reset for close button SVG in LoginDialog	2015-03-10 18:08:19 -07:00
Brad Hefta-Gaub	5cced9fc66	Merge pull request #4400 from samcake/temp0 ... Introduce gpu::Shader, Pipeline and State	2015-03-10 16:51:40 -07:00
Brad Hefta-Gaub	04837d5302	Merge pull request #4390 from ctrlaltdavid/20287 ... CR for 20287 - Don't show the application menu bar when in full screen	2015-03-10 16:36:11 -07:00
Seth Alves	cf20596d6d	Merge pull request #4406 from ZappoMan/svoFromURL ... Support for importing from a network URL	2015-03-10 15:41:41 -07:00
Stephen Birarda	6afdb26042	let QMainWindow delete GLCanvas, just stop the QTimer instead	2015-03-10 13:19:32 -07:00
ZappoMan	feddea821a	cleanup import from file vs url	2015-03-10 12:35:12 -07:00
ZappoMan	5facb39aa7	support for import entities from network URL	2015-03-10 12:21:37 -07:00
Stephen Birarda	a8046b8316	fix a typo in comment, NULL glWidget pointer	2015-03-10 11:47:35 -07:00
Stephen Birarda	292354e180	manually call delete on GLCanvas in Application dtor	2015-03-10 11:33:49 -07:00
David Rowe	abb62fd8f9	Fix typo found in passing	2015-03-10 10:57:48 -07:00
Sam Gateau	c1a0d767c9	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2015-03-10 09:37:40 -07:00
Sam Gateau	853cf75f60	adding the atmosphere in the directional lighting pass, debug	2015-03-10 09:37:13 -07:00
David Rowe	2df3eed31e	Merge branch 'master' into 20287 ... Conflicts: interface/src/Application.h	2015-03-10 09:31:15 -07:00
ZappoMan	89f3a091f1	remove debugging	2015-03-10 09:02:35 -07:00
Andrew Meadows	a758ccd75a	Merge pull request #4402 from birarda/master ... add underlying controls for user discoverability	2015-03-10 08:30:46 -07:00
Stephen Birarda	de38221cf6	default to All discoverability until UI is present	2015-03-09 17:28:44 -07:00
Stephen Birarda	c6afa131d9	store discoverability mode as an int	2015-03-09 17:26:56 -07:00
Stephen Birarda	cd382eeea5	expose discoverability changes to js	2015-03-09 17:20:09 -07:00
Stephen Birarda	6d900d5a40	handle discoverability change in DiscoverabilityManager	2015-03-09 17:05:57 -07:00
Stephen Birarda	0658b54263	move location update to DiscoverabilityManager	2015-03-09 16:48:39 -07:00
Stephen Birarda	77a60a3d72	remove discoverability setter until API ready	2015-03-09 16:34:00 -07:00
Stephen Birarda	f81ae30918	fix getUsername for AccountManager include in implementation	2015-03-09 16:32:09 -07:00
Stephen Birarda	2f22c0cd96	cleanup username API from GlobalServicesScriptingInterface	2015-03-09 16:28:01 -07:00
ZappoMan	2a5d25e010	more hacking on mixamo pipeline files	2015-03-09 16:02:07 -07:00
Seth Alves	99300a5bc8	merge from master	2015-03-09 13:39:51 -07:00
David Rowe	531bb5738f	Merge branch 'master' into 20369 ... Conflicts: interface/src/ModelUploader.cpp	2015-03-09 13:35:38 -07:00
David Rowe	ba92254385	Fix skeleton detection when uploading avatar model	2015-03-09 13:31:54 -07:00
Leonardo Murillo	9ccd0a5afa	Fixing updater	2015-03-09 14:12:47 -06:00
Brad Hefta-Gaub	750f8a09fa	Merge pull request #4394 from AndrewMeadows/isentropic ... EntityItem now stores position in meters and angular velocity in radians/sec	2015-03-09 12:47:00 -07:00
ZappoMan	559945c0c6	temporarily remove skeleton check from upload	2015-03-09 10:50:09 -07:00
Andrew Meadows	c3a8c44545	oops, removing a typo	2015-03-09 09:55:35 -07:00
Andrew Meadows	c0ed3edbbb	remove exception when connecting to old server	2015-03-09 09:38:26 -07:00
Andrew Meadows	51d05cc43e	merge upstream/master into andrew/isentropic ... Conflicts: libraries/networking/src/PacketHeaders.cpp	2015-03-09 08:51:49 -07:00
Atlante45	61649ee0a5	Fix dialog labels	2015-03-09 13:42:14 +01:00
Seth Alves	3604fd639a	formatting	2015-03-08 20:03:10 -07:00
Seth Alves	08c3fa6363	merge from upstream	2015-03-08 17:29:05 -07:00
Brad Hefta-Gaub	80675f8459	Merge pull request #4391 from ZappoMan/fbxFixes ... different mixamo detection	2015-03-08 11:42:29 -07:00
Brad Hefta-Gaub	e2a367607a	Merge pull request #4384 from ctrlaltdavid/20369 ... CR for Job #20369 - Uploaded avatars without skeletons crash Interface	2015-03-08 11:42:07 -07:00