22495 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Stephen Birarda	44f8e599e2	test the possibility that zlib is no longer required	2015-02-19 15:29:28 -08:00
Stephen Birarda	63d4538b76	fix ZLIB dll find, bullet check	2015-02-19 15:22:37 -08:00
Stephen Birarda	c3b9198ec3	cleanup handling of external projects if OS not handled	2015-02-19 15:19:52 -08:00
Stephen Birarda	799cee32aa	remove freeglut from build guides, no longer needed	2015-02-19 14:43:34 -08:00
Stephen Birarda	afae7297e7	adjustements to build guides to remove bullet	2015-02-19 14:41:23 -08:00
Stephen Birarda	a3d370f01f	more path shortening for build of external projects	2015-02-19 14:33:31 -08:00
Stephen Birarda	a0a4882ed6	shorten externals binary dir path	2015-02-19 14:18:05 -08:00
Ryan Huffman	4dfe725721	Update preferences dialog to use layouts throughout	2015-02-19 14:02:15 -08:00
Stephen Birarda	d47a114f23	actually remove BUILD_SHARED_LIBS from combo command	2015-02-19 13:57:31 -08:00
Stephen Birarda	01c92ba94d	don't attempt to build shared bullet libs on windows	2015-02-19 13:53:48 -08:00
Stephen Birarda	721be462f5	attempt to handle windows in bullet external project	2015-02-19 13:40:17 -08:00
Stephen Birarda	cbc6ae98d8	groundwork for windows support in bullet external project	2015-02-19 13:22:33 -08:00
Stephen Birarda	d185c775a4	fix install step for OS X bullet	2015-02-19 13:17:39 -08:00
Stephen Birarda	51ad631c54	dynamically grab animation URL as model URL from model	2015-02-19 13:14:46 -08:00
Stephen Birarda	6b08b2993a	fix for bullet system include to silence warnings	2015-02-19 13:03:16 -08:00
Stephen Birarda	2cdb8edbbf	fix casing for libBulletSoftBody	2015-02-19 12:44:49 -08:00
Stephen Birarda	71b273ceec	fix order for found result in bullet find module	2015-02-19 12:42:28 -08:00
Stephen Birarda	03809131a4	log install to be able to confirm installed files	2015-02-19 12:39:48 -08:00
Stephen Birarda	d563c80ca0	handle bullet external project on unix/android	2015-02-19 12:12:41 -08:00
Philip Rosedale	f3b37bba54	Merge branch 'master' of https://github.com/worklist/hifi	2015-02-19 12:04:43 -08:00
Stephen Birarda	70a89680f5	fix bullet include to match previous format	2015-02-19 12:04:41 -08:00
Stephen Birarda	6f055ca0d7	add an external project to handle bullet	2015-02-19 12:01:40 -08:00
Ryan Huffman	4a8e3193a9	Add more comments to UIUtil::scaleWidgetFontSizes	2015-02-19 12:01:27 -08:00
Grayson Stebbins	fd3bbb6553	Merge pull request #4316 from nbq/removeat ... Fix TP text in welcome page	2015-02-19 11:58:22 -08:00
Jason Hawks	d0b47a66ab	removed at symbol and added enter for teleport box	2015-02-19 14:49:00 -05:00
Jason Hawks	e66e098cd2	Merge branch 'master' of github.com:nbq/hifi	2015-02-19 14:38:50 -05:00
Clément Brisset	d2ed782626	Merge pull request #4308 from Triplelexx/20315 ... CR for Job #20315 - Update contents of the "welcome to Interface" dialog	2015-02-19 10:27:27 -08:00
Andrew Meadows	21405135f9	Merge pull request #4310 from talentraspel/20323 ... CR for Job #20323 - BUG: another crash on exit in interface	2015-02-19 09:52:23 -08:00
Stephen Birarda	27c6f80a61	use md5 hash to verify downloaded externals	2015-02-19 09:33:22 -08:00
Clément Brisset	ac3b172dee	Merge pull request #4312 from ctrlaltdavid/update-svg-url ... Update SVG URL to Amazon S3	2015-02-19 04:36:16 -08:00
Andrew Meadows	e207dad009	Merge pull request #4314 from AndrewMeadows/inertia ... fix EntityServer crash for zero view aspectRatio	2015-02-18 18:09:05 -08:00
Stephen Birarda	6231a9d8da	remove TBB from build guides	2015-02-18 17:29:32 -08:00
Stephen Birarda	7ec01c9095	handle android build of tbb, don't prefix win with lib	2015-02-18 17:20:13 -08:00
Ryan Huffman	a8999964f6	Cleanup dpi scaling comments	2015-02-18 16:21:51 -08:00
Stephen Birarda	31b136f807	resolve conflicts on merge with upstream/master	2015-02-18 16:19:15 -08:00
Stephen Birarda	24468a7936	Merge pull request #4315 from birarda/master ... use http link for gverb in case no git available	2015-02-18 16:18:04 -08:00
Ryan Huffman	4751974c45	Revert "Add scaling for high-dpi Windows/Linux displays" ... This reverts commit 2828b65bea.	2015-02-18 16:16:50 -08:00
Ryan Huffman	03eb1a984f	Revert "Fix dpi scaling in getViewportDimensions" ... This reverts commit 9b719273ab.	2015-02-18 16:15:53 -08:00
Stephen Birarda	5a3ef34d1e	use http link for gverb in case no git available	2015-02-18 16:14:51 -08:00
Stephen Birarda	75b193d784	mirror tbb in HF S3 for http link	2015-02-18 16:03:12 -08:00
Andrew Meadows	cf9d92abc0	fix EntityServer crash for zero view aspectRatio	2015-02-18 15:48:12 -08:00
Stephen Birarda	e665a1b4bb	use https for tbb urls since it will redirect	2015-02-18 15:47:33 -08:00
Stephen Birarda	b3b292a45f	handle linux binary find for tbb external project	2015-02-18 15:40:14 -08:00
Philip Rosedale	f6f54809d0	Merge pull request #4291 from Atlante45/reverb_smoothing ... Reverb smoothing	2015-02-18 15:34:14 -08:00
Ryan Huffman	22d46e3e6b	Update runningscripts script font to match parent	2015-02-18 15:33:24 -08:00
Ryan Huffman	9b719273ab	Fix dpi scaling in getViewportDimensions	2015-02-18 15:30:39 -08:00
Stephen Birarda	b6d660fdd3	setup TBB external project for windows	2015-02-18 15:26:33 -08:00
Ryan Huffman	2828b65bea	Add scaling for high-dpi Windows/Linux displays	2015-02-18 15:09:41 -08:00
David Rowe	24d03deb21	Fix typo	2015-02-18 15:02:44 -08:00
Ryan Huffman	51f5719e0f	Update font sizes in running scripts window	2015-02-18 14:59:52 -08:00