7872 commits

Author	SHA1	Message	Date
Sam Gateau	74f04c0c84	remove useless comment	2015-03-31 14:57:51 -07:00
Sam Gateau	07a36158e6	Merge branch 'master' of https://github.com/highfidelity/hifi into orange	2015-03-31 14:46:56 -07:00
Stephen Birarda	3ed097ff86	Merge pull request #4548 from AndrewMeadows/inertia ... fix typo that broke avatar motion	2015-03-31 13:42:20 -07:00
Stephen Birarda	e5637a1f28	Merge pull request #4547 from ZappoMan/preloadOnImport ... fix issue with preload not being called on import	2015-03-31 13:31:13 -07:00
Andrew Meadows	9739d68370	fix typo that broke avatar motion	2015-03-31 13:20:06 -07:00
Brad Hefta-Gaub	e27a89b7c3	Merge pull request #4539 from birarda/settings-thread-delete-later ... fix for cleanup of SettingsManager thread	2015-03-31 13:09:06 -07:00
ZappoMan	df99c314aa	fix issue with preload not being called on import	2015-03-31 12:44:44 -07:00
Sam Gateau	edf0ca2b06	Forbifd the global ambient lighting to go the simple global value and instead fallback to the first Spherical harmonics preset	2015-03-31 10:29:03 -07:00
andrew	a2b5fdb540	merge	2015-03-31 09:28:23 -07:00
andrew	fdfb8bd1b4	fix intermittent crash on windows during login	2015-03-31 09:26:33 -07:00
Andrew Meadows	f1b1ed014b	merge upstream/master into andrew/inertia	2015-03-31 08:33:31 -07:00
Seth Alves	c8e623ace7	remove some debugging prints, added some comments	2015-03-31 07:18:20 -07:00
Seth Alves	52fc75a114	merge upstream	2015-03-31 07:18:04 -07:00
Philip Rosedale	4961cf37b6	Merge pull request #4540 from ZappoMan/scriptCaching ... quiet warning flood when scripts are bad	2015-03-30 21:48:13 -07:00
Philip Rosedale	5325478940	Merge pull request #4528 from ZappoMan/avatarUI ... Support for Auto-detecting FST type, and adding type hint to FST files when packaged	2015-03-30 21:31:22 -07:00
ZappoMan	a88b3c02d2	quiet warning flood when scripts are bad	2015-03-30 18:24:34 -07:00
Stephen Birarda	7d5b8c430a	remove extra added space	2015-03-30 18:06:51 -07:00
Stephen Birarda	1cb12bd1da	Merge branch 'master' of https://github.com/highfidelity/hifi into settings-thread-delete-later	2015-03-30 18:03:35 -07:00
Stephen Birarda	b7174b5170	fix for cleanup of SettingsManager thread	2015-03-30 18:03:18 -07:00
Andrew Meadows	b8ff253f86	unlock after character is properly updated	2015-03-30 18:03:18 -07:00
Andrew Meadows	bdfe75b1f5	remove character from PhysicsEngine on shutdown	2015-03-30 18:03:18 -07:00
Seth Alves	63a59aa00a	fix a couple of crashes	2015-03-30 18:03:18 -07:00
Philip Rosedale	ce05d3104a	Merge pull request #4535 from ZappoMan/scriptCaching ... Script caching & Fix to Stack Overflow Crash on Windows with lots of entity scripts	2015-03-30 18:02:52 -07:00
Brad Hefta-Gaub	e1da9331e3	Merge pull request #4533 from jherico/tr2 ... Fixing consecutive spaces issue with text renderer	2015-03-30 17:34:42 -07:00
ZappoMan	0366ce9bf5	removed dead code	2015-03-30 17:33:25 -07:00
Andrew Meadows	94c1cf12f5	deleting _dynamicsWorld doesn't crash on shutdown	2015-03-30 17:12:19 -07:00
Seth Alves	acf30782b6	include quads in creation of hulls for physics collision. visual model vs collision model debug spew. fix dice script	2015-03-30 17:04:47 -07:00
ZappoMan	31072b2b2e	only start one download per url even if still pending	2015-03-30 16:48:41 -07:00
ZappoMan	e2d8d82096	more script caching cleanup	2015-03-30 16:34:04 -07:00
Philip Rosedale	f116ac131d	Merge pull request #4532 from AndrewMeadows/inertia ... fix crash in PhysicsEngine on shutdown	2015-03-30 16:31:34 -07:00
Bradley Austin Davis	87c4f8433c	Fixing consecutive spaces issue with text renderer	2015-03-30 16:21:57 -07:00
ZappoMan	74d50a9250	more work on improving script caching	2015-03-30 16:21:47 -07:00
Andrew Meadows	c6b34df06c	unlock after character is properly updated	2015-03-30 16:07:56 -07:00
Seth Alves	4aa6748e11	Merge branch 'fix-physics-crash' of github.com:sethalves/hifi into vhacd-knobs	2015-03-30 16:02:27 -07:00
Seth Alves	ee7247a5b4	fix a couple of crashes	2015-03-30 15:56:01 -07:00
Andrew Meadows	9b13f186e3	remove character from PhysicsEngine on shutdown	2015-03-30 15:51:58 -07:00
ZappoMan	36657c9473	first cut at script caching	2015-03-30 14:36:48 -07:00
Seth Alves	071b6a21de	Merge branch 'master' of github.com:highfidelity/hifi into vhacd-knobs	2015-03-30 13:44:39 -07:00
Andrew Meadows	10af59296d	Merge pull request #4499 from sethalves/multi-hull-collisions ... Multi hull collisions	2015-03-30 12:11:56 -07:00
Andrew Meadows	2404fb126f	Merge pull request #4527 from sethalves/valgrind ... Valgrind told me to do it	2015-03-30 11:56:17 -07:00
Seth Alves	e730109c51	quiet debuging spew	2015-03-30 11:46:48 -07:00
Seth Alves	f90211e830	Merge pull request #1 from AndrewMeadows/cyclohexane ... optimizations when creating convex hull shapes	2015-03-30 11:38:49 -07:00
Philip Rosedale	2951d17bf3	Merge pull request #4529 from AndrewMeadows/inertia ... fix crash for bad avatar body on login	2015-03-30 11:30:39 -07:00
Seth Alves	186cb1ec7a	merge from upstream	2015-03-30 11:28:47 -07:00
Seth Alves	8a5192c1d9	attempt to handle registration point in hull collisions	2015-03-30 11:22:31 -07:00
Andrew Meadows	da9ceac9ae	fix crash for bad avatar body on login	2015-03-30 11:06:02 -07:00
Philip Rosedale	685de8cc7f	Merge pull request #4522 from huffman/rename-attribution ... Rename attribution to marketplaceID	2015-03-30 10:57:28 -07:00
Andrew Meadows	adf076a630	optimizations when creating convex hull shapes	2015-03-30 09:56:30 -07:00
Seth Alves	7137b41375	free these so it's easier to see other leaks in valgrind	2015-03-30 09:30:37 -07:00
Seth Alves	4bf86bb824	another [] needed after delete	2015-03-29 17:59:57 -07:00