7302 commits

Author	SHA1	Message	Date
Seth Alves	af341f0ee5	if hifi uri is localhost, extract domain-server port from shared memory	2015-02-25 12:11:32 -08:00
Seth Alves	1a4808857e	put local domain server's http port into shared memeory	2015-02-25 11:30:54 -08:00
Seth Alves	a6c79203bd	Merge branch 'master' of github.com:highfidelity/hifi into assignment-client-keep-a-spare-x	2015-02-25 08:47:58 -08:00
Clément Brisset	b1e46c1bc8	Merge pull request #4337 from ZappoMan/crashonexit ... Fixes to various Crashes on shutdown	2015-02-25 08:47:36 -08:00
ZappoMan	e87df0017a	code review feedback	2015-02-25 08:26:54 -08:00
Brad Hefta-Gaub	97e2e65cb3	Merge pull request #4336 from AndrewMeadows/bispinor ... lower threshold for ignoring rotation updates	2015-02-24 20:13:22 -08:00
Brad Hefta-Gaub	0f4e098a61	Merge pull request #4334 from huffman/edit-ray-improvement ... Fix BillboardOverlay::findRayIntersection	2015-02-24 20:13:05 -08:00
Brad Hefta-Gaub	8b47de3150	Merge pull request #4329 from Seefo/master ... Cleaned up warnings on Windows	2015-02-24 20:08:56 -08:00
ZappoMan	f1017f8a5d	simplify waitTillDoneRunning	2015-02-24 17:45:22 -08:00
ZappoMan	310654831c	clean up comments remove dead code	2015-02-24 17:34:19 -08:00
Andrew Meadows	0456cb298f	lower threshold for ignoring rotation updates ... one hundred fold smaller	2015-02-24 17:16:00 -08:00
ZappoMan	eab09eaf28	removed extra debugging	2015-02-24 17:15:58 -08:00
Seth Alves	89ebb45c03	Revert "Merge pull request #4332 from birarda/master" ... This reverts commit 3230857b0d, reversing changes made to 1b669af79d.	2015-02-24 17:09:05 -08:00
ZappoMan	25ae001d3b	removed extra debugging	2015-02-24 17:05:44 -08:00
Ryan Huffman	03b10b6cb0	Add findRayRectangleIntersection	2015-02-24 17:00:30 -08:00
ZappoMan	9dcea38b2b	tweak some debugging	2015-02-24 16:23:39 -08:00
ZappoMan	8757600a5e	ifdef around massive debug output	2015-02-24 15:57:13 -08:00
ZappoMan	ca432a415f	Merge branch 'master' of https://github.com/highfidelity/hifi into crashonexit	2015-02-24 15:33:41 -08:00
ZappoMan	fd93b99f03	more hacking on script shutdown behavior	2015-02-24 14:02:46 -08:00
Stephen Birarda	09ffcbb2e8	Revert "Merge pull request #4324 from sethalves/assignment-client-keep-a-spare" ... This reverts commit 087e2babde, reversing changes made to 5202d2136a.	2015-02-24 12:30:40 -08:00
Andrew Meadows	1b669af79d	Merge pull request #4307 from Atlante45/fix_warnings ... Fix warnings	2015-02-24 12:19:32 -08:00
Andrew Meadows	efcac708b6	Merge pull request #4331 from PhilipRosedale/master ... Toyball is a textured baseball, added ability to get controller angular velocity	2015-02-24 12:19:20 -08:00
Stephen Birarda	087e2babde	Merge pull request #4324 from sethalves/assignment-client-keep-a-spare ... Assignment client keep a spare	2015-02-24 11:40:43 -08:00
Philip Rosedale	d74856e01b	add angularVelocity to controller	2015-02-24 11:21:04 -08:00
Seth Alves	5f9af610c2	coding convention	2015-02-24 10:41:58 -08:00
Seefo	ab590440be	Cleaned up warnings on Windows	2015-02-23 22:15:24 -05:00
ZappoMan	6be8f4c0ec	more work on improving shutdown behavior	2015-02-23 17:32:31 -08:00
Andrew Meadows	3cd0a70641	store shapeType whenever it is explicitly changed	2015-02-23 14:35:44 -08:00
Andrew Meadows	456acd8833	merge upstream/master into andrew/bispinor	2015-02-23 11:41:40 -08:00
ZappoMan	7e2d355b56	first cut at properly shutting down timers while shutting down scripts	2015-02-23 11:40:30 -08:00
Andrew Meadows	2e1c122915	moved ShapeType boilerplate stuff macos	2015-02-23 11:38:56 -08:00
Seth Alves	0b9b7f06cc	address various comments from code review	2015-02-23 11:12:19 -08:00
Andrew Meadows	0fc4c732f7	use macro for copying shapeType string to script	2015-02-23 10:13:47 -08:00
ZappoMan	1efa7b28b0	removed dead code	2015-02-23 10:04:14 -08:00
Andrew Meadows	0455ccf7be	Merge pull request #4313 from ctrlaltdavid/20355 ... CR for 20355 - Initial Integration with DDE	2015-02-23 09:47:19 -08:00
ZappoMan	a8d48e592f	removing debug messages	2015-02-23 09:44:18 -08:00
ZappoMan	e5ef61e27e	simplifying the change	2015-02-23 09:23:15 -08:00
ZappoMan	d32fc645e8	remove some dead code, added a debugging notes comment	2015-02-23 09:10:15 -08:00
Seth Alves	e0263d8843	Merge branch 'master' of github.com:highfidelity/hifi into assignment-client-keep-a-spare	2015-02-23 09:06:43 -08:00
ZappoMan	e3de994c4a	more hacking	2015-02-20 18:42:02 -08:00
ZappoMan	8c4474b2d0	more hacking	2015-02-20 17:55:04 -08:00
Andrew Meadows	27e6f99deb	use strings for shapeType for JS Entity properties	2015-02-20 16:54:58 -08:00
ZappoMan	b219937902	switch known scripts iterator	2015-02-20 15:46:11 -08:00
ZappoMan	0b607fa390	first cut at shutting down scripts ahead of other cleanup	2015-02-20 15:28:25 -08:00
Seth Alves	70c96e496f	don't print ^a to qDebug for unassigned node type	2015-02-20 14:25:13 -08:00
Seth Alves	4bba4fc387	cleanups	2015-02-20 13:44:37 -08:00
Seth Alves	feb0e7ac31	AssignmentClientMonitor doesn't keep a list of its children. Instead it knows about active children due to their entries in the NodeList. Every few seconds, if 2 or more children are idle, the Monitor will ask one to exit	2015-02-20 13:26:59 -08:00
Andrew Meadows	94b3c4a3a8	simpler less draconian workaround	2015-02-20 11:57:37 -08:00
Andrew Meadows	c3dbae1bd3	remove warning about signed-unsigned comparison	2015-02-20 09:00:28 -08:00
Andrew Meadows	aa667464c0	merge upstream/master into andrew/thermonuclear	2015-02-20 08:26:51 -08:00