22468 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Seth Alves	abe193eaff	Merge branch 'master' of github.com:highfidelity/hifi into domain-server-http-port-in-shmem	2015-02-25 14:45:53 -08:00
Stephen Birarda	db7bfc1e6e	Merge pull request #4342 from birarda/master ... look directly in Xcode app for 10.9 SDK	2015-02-25 14:04:41 -08:00
Stephen Birarda	a7a9ede744	handle an SDK in Xcode beta	2015-02-25 13:53:57 -08:00
Stephen Birarda	e0d31f6e61	remove extra added spaces	2015-02-25 13:52:14 -08:00
Stephen Birarda	994c0386d3	cleanup command that looks for SDK	2015-02-25 13:50:59 -08:00
Stephen Birarda	d24287f627	look in Xcode application for 10.9 SDK	2015-02-25 13:48:28 -08:00
Leonardo Murillo	006b3ed0ac	Merge pull request #4300 from birarda/dependencies ... NOT MERGEABLE - add some externals as cmake external projects	2015-02-25 13:22:49 -08:00
Stephen Birarda	1c2606c6db	fail out if windeployqt is not found	2015-02-25 13:12:37 -08:00
Stephen Birarda	a9fcde6265	fix two typos in BUILD guides	2015-02-25 13:07:52 -08:00
Brad Hefta-Gaub	e7b36166ec	Merge pull request #4340 from huffman/fix-repeat-captured-keys ... Make KeyEvent objects equal even if they have differing isAutoRepeat val...	2015-02-25 12:24:19 -08:00
Brad Hefta-Gaub	6d237f3f79	Merge pull request #4339 from huffman/fix-plane-pick ... Fix plane pick	2015-02-25 12:23:45 -08:00
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
Stephen Birarda	33b0fd24a6	don't call copy dll step for scribe	2015-02-25 11:02:05 -08:00
Stephen Birarda	66ab2ba9f9	fix for flipped conditional for dll fixup	2015-02-25 10:44:02 -08:00
Stephen Birarda	fd8240669b	fix for windeployqt for executables	2015-02-25 10:39:44 -08:00
Ryan Huffman	660d9ad499	Make KeyEvent objects equal even if they have differing isAutoRepeat values	2015-02-25 10:28:45 -08:00
Ryan Huffman	c499352ad8	Update billboard and planar overlays to use new findRayRectangleIntersection signature	2015-02-25 10:27:11 -08:00
Ryan Huffman	14ec9b431e	Update findRayRectangleIntersection to set out variable distance	2015-02-25 10:26:44 -08:00
Seth Alves	0ce49888ff	AssignmentClientApp is QCoreApplication, other classes aren't. If --min is set and all the assignment clients exit (probably due to domain server restarting), respawn until --min is statisfied.	2015-02-25 09:20:34 -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
Clément Brisset	880c8f370f	Merge pull request #4333 from birarda/master ... pass 10.9 SDK as CMAKE_OSX_SYSROOT	2015-02-25 06:41:28 -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	8c26be49d7	Merge pull request #4330 from huffman/edit-off-on-domain-change ... Turn editEntities off on domain change	2015-02-24 20:11:39 -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
Brad Hefta-Gaub	9ded2699e2	Merge pull request #4327 from thoys/20364 ... CR for Job #20364 - Add toggle to turn off sounds in notifications.js	2015-02-24 20:06:57 -08:00
ZappoMan	f1017f8a5d	simplify waitTillDoneRunning	2015-02-24 17:45:22 -08:00
Seth Alves	5c5ffc07ab	allow client count to drift as needed if the user doesn't specify --min or --max	2015-02-24 17:43:08 -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	0c28e220d1	Merge branch 'assignment-client-keep-a-spare-again' of github.com:sethalves/hifi into assignment-client-keep-a-spare-x	2015-02-24 17:10:32 -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	eb21b74439	Replace Planar3DOverlay::findRayIntersection with GeometryUtil::findRayRectangleIntersection	2015-02-24 17:01:24 -08:00
Ryan Huffman	be7959bbcd	Fix BillboardOverlay findRayIntersection implementation	2015-02-24 17:00:55 -08:00
Ryan Huffman	03b10b6cb0	Add findRayRectangleIntersection	2015-02-24 17:00:30 -08:00
Seth Alves	c9d6a44c3a	fix up command-line parsing	2015-02-24 16:56:13 -08:00
ZappoMan	9dcea38b2b	tweak some debugging	2015-02-24 16:23:39 -08:00
ZappoMan	89f7f2da2e	don't do idle process and painting if we're shutting down the application	2015-02-24 15:57:34 -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
Stephen Birarda	e7e7323ff0	pass 10.9 SDK as CMAKE_OSX_SYSROOT	2015-02-24 15:00:41 -08:00
Ryan Huffman	89c10ca2ec	Fix BillboardOverlay::findRayIntersection	2015-02-24 14:36:24 -08:00
ZappoMan	fd93b99f03	more hacking on script shutdown behavior	2015-02-24 14:02:46 -08:00
Stephen Birarda	d52ba5e958	call windeployqt after fixup_bundle for qt plugins	2015-02-24 13:20:17 -08:00
Leonardo Murillo	3230857b0d	Merge pull request #4332 from birarda/master ... revert the spare assignment-client work for now	2015-02-24 12:32:34 -08:00