11164 commits

Author	SHA1	Message	Date
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
Brad Hefta-Gaub	21cd7e36e0	Merge pull request #4381 from Atlante45/disk_cache ... Disk cache tweaks	2015-03-08 11:40:40 -07:00
samcake	174e359c50	Merge pull request #4387 from ZappoMan/fbxFixes ... tweaks to hacks for detecting mixamo files	2015-03-06 17:25:19 -08:00
Brad Hefta-Gaub	c9dd96c98d	Merge pull request #4389 from birarda/master ... render application overlay only if enabled	2015-03-06 17:06:05 -08:00
Brad Hefta-Gaub	fd6f8c7792	Merge pull request #4382 from huffman/import-export ... Improvements to Import/Export entities	2015-03-06 16:31:57 -08:00
Stephen Birarda	a4963f1895	render application overlay only if enabled	2015-03-06 15:22:25 -08:00
Grayson Stebbins	7c78e598b8	Update to .com instead of .io in Welcome dialog	2015-03-06 15:15:48 -08:00
ZappoMan	ffab6ffe48	tweaks to hacks for detecting mixamo files	2015-03-06 15:11:02 -08:00
Clément Brisset	aed208a339	Merge pull request #4383 from huffman/fix-script-editor-icons ... Fix issue with Script Editor icons not showing up on first show	2015-03-06 06:02:50 -08:00
Ryan Huffman	299035bc85	Move script editor show() call to DialogsManager	2015-03-05 15:05:17 -08:00
Ryan Huffman	03c03a20f9	Update pasteEntities to use vec3	2015-03-05 13:52:30 -08:00
Ryan Huffman	6848025504	Add exporting by entity ID to Application	2015-03-05 13:36:16 -08:00
Atlante45	7690301e58	Include functional	2015-03-05 21:49:22 +01:00
Ryan Huffman	71768ef275	Return entity IDs on paste	2015-03-05 12:36:45 -08:00
Ryan Huffman	a922619ebc	Add Clipboard.exportEntities that takes a list of entity IDs	2015-03-05 12:36:10 -08:00
Atlante45	f4d8ee39dc	Menu item for cache editor	2015-03-05 21:10:02 +01:00
Atlante45	908e946ac5	Hook up disk cache to the dialog manager	2015-03-05 21:09:23 +01:00
Atlante45	53f23d8452	Added disk cache editor	2015-03-05 21:08:14 +01:00
Atlante45	9d7144dab0	Bumped disk cache size to 10GB	2015-03-05 18:52:48 +01:00
David Rowe	8686e090c9	Don't upload skeletonless avatar model to HiFi servers	2015-03-03 22:34:07 -08:00
David Rowe	aad3f1dfd9	Automatically switch to default model if avatar model is skeletonless	2015-03-03 22:34:07 -08:00
David Rowe	30b77d4200	Don't crash if avatar model at start-up or loaded is skeletonless	2015-03-03 22:34:06 -08:00
Stephen Birarda	0a74291377	Merge pull request #4373 from birarda/remove-xmpp ... fix web chat link for IRC	2015-03-03 16:26:12 -08:00
Stephen Birarda	d3682b0297	fix web chat link for IRC	2015-03-03 16:03:47 -08:00
Brad Hefta-Gaub	fc048c3b03	Merge pull request #4368 from ctrlaltdavid/20377 ... CR for 20377	2015-03-03 15:51:42 -08:00
samcake	6b1f42df83	Merge pull request #4366 from ZappoMan/removeMetavoxels ... remove metavoxels	2015-03-03 15:50:53 -08:00
Stephen Birarda	8f2dc7e38b	resolve conflicts on merge with upstream master	2015-03-03 12:22:25 -08:00
Stephen Birarda	a961cd8ff3	show link to IRC in place of Qxmpp removal	2015-03-03 12:17:35 -08:00
Brad Hefta-Gaub	b118912708	Merge pull request #4361 from samcake/temp0 ... evolve the Transform stack away from the legacy GL to the brand new shader way	2015-03-03 11:43:01 -08:00
Brad Hefta-Gaub	29340b6586	Merge pull request #4369 from ctrlaltdavid/20370 ... CR for Job #20370 - Talk bubble fix - from a suggestion in https://worklist.net/20361	2015-03-03 11:17:31 -08:00
David Rowe	1b34b80b1a	Use BrowsC_U to control both brows' up and down	2015-03-03 11:05:59 -08:00
Brad Hefta-Gaub	b88d52a310	Merge pull request #4363 from huffman/block-restricted-users ... Add permission-checking to edit entities	2015-03-03 11:04:46 -08:00
Sam Gateau	4619ba1f5b	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2015-03-03 10:56:04 -08:00
Stephen Birarda	27b9b345ca	remove ChatWindow includes from DialogsManager	2015-03-03 10:15:34 -08:00
Stephen Birarda	b270297406	remove a missed XmppClient include	2015-03-03 10:14:35 -08:00
Stephen Birarda	e43da00537	remove xmpp chat support	2015-03-03 10:13:41 -08:00
Stephen Birarda	5a601f3676	resolve conflicts on merge with upstream/master	2015-03-03 10:01:24 -08:00
David Rowe	dd678dbc49	Use all DDE coefficients to achieve better face control	2015-03-02 19:05:13 -08:00
ZappoMan	5c3c94a618	remove metavoxels	2015-03-02 17:21:43 -08:00
Ryan Huffman	b370e025c9	Move EntityScriptingInterface instance to DependencyManager	2015-03-02 15:05:31 -08:00
ZappoMan	a338d96b9d	only render the overlay if we're actually rendering the overlay	2015-02-27 18:00:51 -08:00
ZappoMan	9cc66f3da7	cleanup stats display behavior, reset default settings for timing details	2015-02-27 17:57:42 -08:00
Sam Gateau	5652852d1a	Merge branch 'master' of https://github.com/highfidelity/hifi into temp0	2015-02-27 17:35:59 -08:00
Sam Gateau	f92efa13c8	fix typo	2015-02-27 17:35:08 -08:00
Sam Gateau	5ab3cbb7ec	Fixed the 2 remianing issues before PR, the shadow program needed to have the binding assigned and the Head of the avatar isn't getting it's BBox evaluated	2015-02-27 17:11:16 -08:00
Philip Rosedale	af9108c79f	Merge pull request #4338 from ctrlaltdavid/20368 ... DO NOT MERGE - QA for 20368	2015-02-27 14:16:55 -08:00
Philip Rosedale	9eee213bce	Merge pull request #4353 from Atlante45/relax_face_tracker ... Relax blendshapes	2015-02-27 13:36:22 -08:00
Sam Gateau	ea88cbd75f	Merge with upstream master	2015-02-27 13:19:50 -08:00
David Rowe	797b1649a6	Merge branch 'master' into 20368 ... Conflicts: interface/src/devices/DdeFaceTracker.cpp	2015-02-27 12:48:21 -08:00
Brad Hefta-Gaub	08dc883b0e	Merge pull request #4351 from huffman/update-light-properties ... Update light properties (primarily for editEntities.js)	2015-02-27 10:54:19 -08:00