23135 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Atlante45	bcfd4b50be	Merge branch 'master' of https://github.com/highfidelity/hifi into package_models	2015-03-12 14:18:37 +01:00
ZappoMan	b798761ec5	test fix for Austin's repro	2015-03-11 23:55:53 -07:00
David Rowe	dfd9506223	Add user location after username ... Credit @nbq	2015-03-11 21:20:47 -07:00
David Rowe	2e16794615	Change font size to 12	2015-03-11 21:18:53 -07:00
David Rowe	eb22b0085b	Add radio buttons	2015-03-11 20:05:35 -07:00
David Rowe	a109a18bc3	Add visibility control	2015-03-11 19:28:29 -07:00
Seth Alves	ed47753e33	Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide	2015-03-11 18:34:39 -07:00
Seth Alves	bf1cb951a3	move PhysicsEntity so that ModelEntityItem can initiate a model download	2015-03-11 18:34:27 -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	df29d5365a	Merge branch 'master' of github.com:highfidelity/hifi into avatars-can-collide	2015-03-11 15:18:55 -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
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
Seth Alves	3a3e723f4e	trying to figureo out where to download hull models	2015-03-11 14:26:30 -07:00
David Rowe	32897de80a	Rename Stereo Audio menu item	2015-03-11 12:41:47 -07:00
David Rowe	549eead9f2	Prepare to add visibility control	2015-03-11 12:36:57 -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	fd423e5019	Fix units	2015-03-11 11:07:02 -07:00
David Rowe	1a18decc6d	Fix typo	2015-03-11 10:49:36 -07:00
Philip Rosedale	aae0ceab48	Merge pull request #4418 from huffman/hide-edit-tools ... Hide edit tools when inactive	2015-03-11 10:38:21 -07:00
Atlante45	bfbc8ffb47	File extension is case insensitive	2015-03-11 18:35:15 +01:00
David Rowe	bbffa6474b	Add users.js to default scripts	2015-03-11 10:32:14 -07:00
David Rowe	532e4feebb	Remove dead code and fix typos	2015-03-11 10:30:09 -07:00
Ryan Huffman	6c978c0ff3	Add look.js ... Merges both lookWithMouse and lookWithTouch, and updates mouse look to only work with right-click	2015-03-11 10:27:38 -07:00
David Rowe	22ff97fd27	Make visible by default	2015-03-11 10:25:24 -07:00
David Rowe	d36399c65d	Add heading	2015-03-11 10:21:49 -07:00
David Rowe	c30bf5667f	Fix teleporting to user	2015-03-11 10:15:34 -07:00
Ryan Huffman	e4f7e35587	Hide edit tools when inactive	2015-03-11 10:10:11 -07:00
David Rowe	ad08a7dde2	Position window at bottom left of screen	2015-03-11 09:37:18 -07:00
David Rowe	a3c4429e0b	Longer wait until requesting status again after request error	2015-03-11 09:36:26 -07:00
Atlante45	1609823e2b	Move helper function to top	2015-03-11 16:32:45 +01:00