23005 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Seth Alves	b945ce5e7a	Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json	2015-03-12 11:38:01 -07:00
Seth Alves	c9eacd2197	remove unneeded debug print	2015-03-12 11:37:53 -07:00
Stephen Birarda	6c7e0eda6a	Merge pull request #4432 from Atlante45/dm_update ... Dependency::customDeleter uses a lambda	2015-03-12 11:33:32 -07:00
Seth Alves	6903904267	formatting	2015-03-12 11:31:57 -07:00
Seth Alves	e66ac7f982	formatting	2015-03-12 11:29:47 -07:00
Stephen Birarda	278813e47f	Merge pull request #4434 from highfidelity/revert-4429-master ... Revert "NOT MERGEABLE: graceful cleanup on Application dtor for NodeList...	2015-03-12 11:28:13 -07:00
Stephen Birarda	9269b2a0b2	Revert "NOT MERGEABLE: graceful cleanup on Application dtor for NodeList"	2015-03-12 11:28:07 -07:00
Stephen Birarda	4da9186045	Merge pull request #4429 from birarda/master ... NOT MERGEABLE: graceful cleanup on Application dtor for NodeList	2015-03-12 11:26:56 -07:00
Seth Alves	4aa7b0eb0f	provide defaults for anything entity properties read from a map	2015-03-12 11:19:47 -07:00
Atlante45	eb5206f8e6	Naming	2015-03-12 19:05:06 +01:00
Stephen Birarda	3279e19b3d	Merge pull request #4430 from Atlante45/update_login_on_launch ... Update Login menu item on creation	2015-03-12 10:55:07 -07:00
Atlante45	0bd97ce40c	Dependency::customDeleter uses a lambda	2015-03-12 18:53:29 +01:00
Seth Alves	898b9f4af3	Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json	2015-03-12 10:24:05 -07:00
Seth Alves	9e6c289ab8	move filename utils into shared library	2015-03-12 10:23:57 -07:00
Seth Alves	b431ce289c	missed a comma	2015-03-12 10:11:46 -07:00
Seth Alves	90f6b798b1	don't mess with tools window in this branch	2015-03-12 10:11:37 -07:00
Seth Alves	3bc85c2531	instead of a json checkbox, a dropdown to chose the file type	2015-03-12 09:34:01 -07:00
Seth Alves	ac882f86e2	backup code is now aware of possible file extension differences	2015-03-12 09:13:53 -07:00
Seth Alves	fb93d08dd8	change how tool window acts on linux	2015-03-12 09:13:29 -07:00
Brad Hefta-Gaub	8768b53124	Merge pull request #4416 from Atlante45/package_models ... Package models	2015-03-12 08:57:46 -07:00
Atlante45	52c0ba817a	Remove dead code	2015-03-12 16:32:09 +01:00
Atlante45	d858956ad8	Merge branch 'master' of https://github.com/highfidelity/hifi into package_models	2015-03-12 16:31:03 +01:00
Brad Hefta-Gaub	f91a19a918	Merge pull request #4424 from huffman/open-svo ... Handle drag-n-dropped .svos and using interface to open .svo files	2015-03-12 08:15:25 -07:00
Atlante45	decd240f60	Update Login menu item on startup after creation	2015-03-12 14:53:11 +01:00
Atlante45	bcfd4b50be	Merge branch 'master' of https://github.com/highfidelity/hifi into package_models	2015-03-12 14:18:37 +01:00
Seth Alves	2a06816f71	added persist-as-json checkbox to domain settings. File extension of persist file is automatically adjusted when entity server saves. When loading, if both a json and svo file exist, the newer one is used. This is regardless of the persistAsJson setting	2015-03-11 23:09:15 -07:00
Seth Alves	87ac38c3df	Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json	2015-03-11 18:35:13 -07:00
Brad Hefta-Gaub	356dbbec72	Merge pull request #4399 from ctrlaltdavid/20369 ... Fix for 20369	2015-03-11 18:09:07 -07:00
Stephen Birarda	d7e99594ae	make the application the parent of the node thread	2015-03-11 18:04:32 -07:00
Stephen Birarda	851d020390	remove QThread include required for debug	2015-03-11 17:21:49 -07:00
Stephen Birarda	7a8e94f1e5	remove extra debug information for node thread cleanup	2015-03-11 17:18:49 -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
Stephen Birarda	5d9a3811ca	more graceful cleanup for Application NodeList and DatagramProcessor	2015-03-11 17:14:20 -07:00
Stephen Birarda	943670285c	Merge pull request #4427 from ZappoMan/crashonexit ... fix crash on exit related to AvatarManager using TextureCach resources	2015-03-11 17:11:56 -07:00
Stephen Birarda	9f754e40d0	move all silent node timers into LimitedNodeList	2015-03-11 16:59:06 -07:00
Brad Hefta-Gaub	7fdcc64292	Merge pull request #4425 from huffman/look-default ... Make look.js the default look script and remove the old scripts	2015-03-11 16:51:35 -07:00
Stephen Birarda	429e1c6368	Merge pull request #4428 from birarda/master ... use glm from hifi S3 now that fedora is down	2015-03-11 16:45:19 -07:00
Stephen Birarda	d3bc540919	use glm from hifi S3 now that fedora is down	2015-03-11 16:42:29 -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
Ryan Huffman	1904e5e209	Make look.js the default look script and remove the old scripts	2015-03-11 16:17:44 -07:00
Ryan Huffman	76ebac1185	Add import svo requests in editEntities	2015-03-11 15:44:26 -07:00
Ryan Huffman	0048b91311	Add handling for opening an .svo using interface	2015-03-11 15:42:16 -07:00
Ryan Huffman	c3c2a75f48	Handle .svo drop events and emit svoImportRequested	2015-03-11 15:38:15 -07:00
Ryan Huffman	2f885bb7f2	Move WindowScriptingInterface to DependencyManager	2015-03-11 15:34:29 -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
Philip Rosedale	8111179711	Merge pull request #4422 from ctrlaltdavid/20396 ... CR for 20396 - Rename Stereo Audio menu item	2015-03-11 14:56:07 -07:00
Philip Rosedale	cc3a86af94	Merge pull request #4419 from huffman/merge-touch-mouse ... Add look.js	2015-03-11 14:40:27 -07:00
Seth Alves	918cfa8b4e	Merge branch 'master' of github.com:highfidelity/hifi into persist-entities-as-json	2015-03-11 14:36:25 -07:00
Andrew Meadows	bd115aa8f8	merge upstream/master into andrew/isentropic	2015-03-11 14:30:22 -07:00