22463 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Philip Rosedale	9d021a1a1e	remove unused line	2015-02-24 11:49:12 -08:00
Philip Rosedale	7489b468f3	give angular velocity to the thrown ball	2015-02-24 11:48:35 -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
samcake	5202d2136a	Merge pull request #4319 from huffman/avatar-billboards ... Fix avatar billboards all rendering as the same billboard	2015-02-24 11:22:38 -08:00
Philip Rosedale	d74856e01b	add angularVelocity to controller	2015-02-24 11:21:04 -08:00
Ryan Huffman	c9818c184a	Update editEntities to turn off when switching domains	2015-02-24 10:47:55 -08:00
Ryan Huffman	4641bd0cd9	Add Window.domainChanged signal for scripting	2015-02-24 10:47:37 -08:00
Seth Alves	88920ad3aa	Merge branch 'assignment-client-keep-a-spare' of github.com:sethalves/hifi into assignment-client-keep-a-spare	2015-02-24 10:42:22 -08:00
Seth Alves	5f9af610c2	coding convention	2015-02-24 10:41:58 -08:00
Seth Alves	f5a7a19bc3	coding convention	2015-02-24 10:41:20 -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
Stephen Birarda	086960f8af	clarify the build guide for nmake and msbuild	2015-02-23 16:10:42 -08:00
Stephen Birarda	71dd443ae2	also call fixup_bundle for release builds on win	2015-02-23 15:29:43 -08:00
Brad Hefta-Gaub	af99a5d07b	Merge pull request #4325 from AndrewMeadows/bispinor ... use strings for shapeType in JS Entity properties	2015-02-23 15:11:57 -08:00
Andrew Meadows	3cd0a70641	store shapeType whenever it is explicitly changed	2015-02-23 14:35:44 -08:00
Stephen Birarda	87ce55cc42	add new macro file for fixup libs	2015-02-23 13:24:53 -08:00
Stephen Birarda	8be707f63f	rename add paths macro for fixup_bundle	2015-02-23 13:24:21 -08:00
Stephen Birarda	bae5d987f9	add OpenSSL lib path to paths for fixup	2015-02-23 13:21:45 -08:00
Stephen Birarda	954a298dc4	correct QXmpp DLL path for windows	2015-02-23 13:04:12 -08:00
Stephen Birarda	2ad8ac866d	make correct version of bullet for windows	2015-02-23 12:50:53 -08:00
Stephen Birarda	b32fa0f33d	pass correct configuration to bullet install target	2015-02-23 12:27:30 -08:00
Stephen Birarda	88130feb11	force release build of bullet on win32	2015-02-23 12:19:54 -08:00
Stephen Birarda	8d97107acf	use ALL_BUILD for bullet msbuild	2015-02-23 12:12:36 -08:00
Stephen Birarda	9e1a890ff2	fix for msbuild target command	2015-02-23 12:09:00 -08:00
Stephen Birarda	ded0b1461b	help cmake find msbuild	2015-02-23 12:04:35 -08:00
Thijs Wenker	793116b90c	ability to mute all notifications or just certain types	2015-02-23 21:00:26 +01:00
Stephen Birarda	e60d91e4ce	fix for bullet debug or release build on windows	2015-02-23 12:00:19 -08:00
Andrew Meadows	f2fc781523	change shapeType to use strings in billiards.js	2015-02-23 11:42:36 -08:00
Andrew Meadows	456acd8833	merge upstream/master into andrew/bispinor	2015-02-23 11:41:40 -08:00
Stephen Birarda	2f4adbc2f7	also use release icon for RelWithDebInfo	2015-02-23 11:40:38 -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
Stephen Birarda	5983a94c7f	force bullet cmake build to be RelWithDebInfo	2015-02-23 11:29:42 -08:00
Stephen Birarda	6803aa8d91	fix copy paste typos	2015-02-23 11:22:21 -08:00
Stephen Birarda	1372436e63	handle possibility that bullet builds debug libraries	2015-02-23 11:20:50 -08:00
Stephen Birarda	9878a93338	add a definition for shared QXmpp on win	2015-02-23 11:13:10 -08:00
Seth Alves	0b9b7f06cc	address various comments from code review	2015-02-23 11:12:19 -08:00
Stephen Birarda	80da0a1702	use empty string for not present debug libraries	2015-02-23 11:11:35 -08:00
Stephen Birarda	353f7e2f96	set qxmpp debug library to empty string	2015-02-23 10:59:54 -08:00
Stephen Birarda	0990910ed2	add a missing period for apple qxmpp ext	2015-02-23 10:41:48 -08:00
Stephen Birarda	6042ba6cf2	fix for qxmpp name on win and lib location	2015-02-23 10:36:20 -08:00
Stephen Birarda	16c557a9c7	copy over /tmp/hifi.dst dir for xcode qxmpp install	2015-02-23 10:32:06 -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
Stephen Birarda	2463292339	link SDL2 as a downloaded framework on OS X	2015-02-23 10:00:44 -08:00
Stephen Birarda	e71a8258d6	fix SDL2 framework link on OS X	2015-02-23 09:52:35 -08:00
Stephen Birarda	82a798ef15	use SDL2 framework on OS X	2015-02-23 09:47:35 -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	85cec79ff5	removing debug messages	2015-02-23 09:44:22 -08:00