7913 commits

Author	SHA1	Message	Date
ZappoMan	c66db5d8e4	another approach	2015-04-01 14:43:27 -07:00
ZappoMan	d7188bac0b	another approach	2015-04-01 14:38:01 -07:00
ZappoMan	aac824fb99	fix crash on shutdown	2015-04-01 13:47:25 -07:00
Brad Hefta-Gaub	1de1527414	Merge pull request #4569 from ctrlaltdavid/20431 ... CR for Job #20431 - Remove XMLHttpRequest file reading and model uploading	2015-04-01 13:00:16 -07:00
Andrew Meadows	e27f800c75	Merge pull request #4561 from sethalves/island ... scaling hints to hash, larger collision shapes	2015-04-01 09:40:18 -07:00
Stephen Birarda	a1f1f7603d	Merge pull request #4564 from PhilipRosedale/master ... Buttons at bottom in dice, gun so not to conflict with edit.js	2015-04-01 09:06:34 -07:00
Philip Rosedale	8114fdd1e2	move button locations, names some constants in avatar controller	2015-03-31 21:51:50 -07:00
Seth Alves	380d03b3b2	Merge branch 'master' of github.com:highfidelity/hifi into island	2015-03-31 19:00:19 -07:00
Stephen Birarda	1d5f1807f7	Merge pull request #4562 from sethalves/editors-are-rezzers ... add a bool value to Node which indicates if it is allowed to rez new ent...	2015-03-31 18:53:29 -07:00
Seth Alves	8bca8ad4ef	bump protocol versions for PacketTypeDomainList and PacketTypeDomainListRequest	2015-03-31 18:37:42 -07:00
Seth Alves	4e83301c65	add a bool value to Node which indicates if it is allowed to rez new entities	2015-03-31 18:27:46 -07:00
Philip Rosedale	6a171c2f22	Merge pull request #4559 from birarda/constant-metaverse-url ... add a networking constants class with the metaverse server URL	2015-03-31 18:13:41 -07:00
Seth Alves	859628a4fd	fix comment	2015-03-31 17:20:16 -07:00
Seth Alves	23c69ad9e1	Merge branch 'master' of github.com:highfidelity/hifi into island	2015-03-31 17:19:59 -07:00
Seth Alves	d17289f566	Merge pull request #4556 from birarda/damaged-xcode ... handle a domain-server port change once connection initiated	2015-03-31 17:12:01 -07:00
Andrew Meadows	7fb9427f29	Merge pull request #4549 from jherico/dbg_macro ... Enabling the use of #ifdef DEBUG as a platform neutral idiom	2015-03-31 17:08:12 -07:00
Brad Hefta-Gaub	90498969e2	Merge pull request #4558 from birarda/master ... fix deadlock opportunity in killNodeWithUUID	2015-03-31 17:00:50 -07:00
Seth Alves	164e5ff816	Merge branch 'master' of github.com:highfidelity/hifi into island	2015-03-31 17:00:48 -07:00
Stephen Birarda	e22b33e96d	fix QUrl include for ubuntu	2015-03-31 17:00:04 -07:00
Seth Alves	05cb0b830c	make max collision size be 1000x1000x1000 rather than 100x100x100	2015-03-31 16:59:43 -07:00
Seth Alves	bacd6445f2	pull comments that get used as scaling hints into a hash table	2015-03-31 16:59:13 -07:00
David Rowe	0a55bcb0c5	Remove XMLHttpRequest's facility to read local files	2015-03-31 16:56:04 -07:00
Stephen Birarda	61806935bb	add a networking constants class with metaverse URL	2015-03-31 16:40:21 -07:00
Philip Rosedale	9635c6d248	Merge branch 'master' of https://github.com/worklist/hifi	2015-03-31 16:29:55 -07:00
Stephen Birarda	86174d6a29	Merge pull request #4551 from ZappoMan/neverCullAvatarParts ... never cull mesh parts for avatars	2015-03-31 16:29:01 -07:00
Philip Rosedale	b7f0be761c	gun buildings fall on creation, dice stops correctly	2015-03-31 16:27:09 -07:00
Stephen Birarda	64921c38b6	don't overlock in killNodeWithUUID	2015-03-31 16:25:22 -07:00
Stephen Birarda	cf7a6dda74	Merge branch 'master' of https://github.com/highfidelity/hifi into damaged-xcode	2015-03-31 16:14:59 -07:00
Stephen Birarda	740438d08d	handle domain-server local port changes once connected	2015-03-31 16:11:41 -07:00
Brad Hefta-Gaub	b43761a6c1	Merge pull request #4545 from samcake/orange ... No more FLat global lighting, always use one of the SPherical harmonics presets	2015-03-31 15:52:49 -07:00
Brad Hefta-Gaub	d77333953e	Merge pull request #4552 from sethalves/island ... Fix various collision-model related bugs	2015-03-31 15:47:53 -07:00
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
Seth Alves	af6ce8fb07	HERE COMES AN S	2015-03-31 14:37:41 -07:00
Seth Alves	48144a46b1	don't keep empty mesh-parts. take units hint from a common first-line comment, if it's there.	2015-03-31 14:34:35 -07:00
Seth Alves	95cc8672c0	remove unneeded assert	2015-03-31 14:32:43 -07:00
ZappoMan	a889191916	never cull mesh parts for avatars	2015-03-31 14:27:34 -07:00
David Rowe	154dacf791	Fix typo	2015-03-31 14:21:56 -07:00
Seth Alves	55d506bb53	formatting	2015-03-31 14:04:49 -07:00
Seth Alves	ea2c5ff622	formatting	2015-03-31 14:04:33 -07:00
Seth Alves	9e0118492e	make sure to not leave in-use resources in UnusedResource list	2015-03-31 14:04:21 -07:00
Seth Alves	347ef3c4e1	use scaling from visual model on collision model rather than using the bounds from the collision model	2015-03-31 14:03:37 -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
Bradley Austin Davis	02b69f4a70	Enabling the use of #ifdef DEBUG as a platform neutral idiom	2015-03-31 13:32:13 -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