24008 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Bradley Austin Davis	db9ab3e699	Merge branch 'master' into oculus_old_renderer	2015-03-31 18:25:34 -07:00
Bradley Austin Davis	eb816f7f6a	Adding support for eye per frame mode and offscreen render scaling	2015-03-31 18:24:58 -07:00
Philip Rosedale	d57959503b	Merge pull request #4560 from AndrewMeadows/bispinor ... improved bounding shape calculation for Mery model	2015-03-31 18:19:34 -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
Sam Gateau	0d721ec1e9	merging	2015-03-31 17:47:05 -07:00
Sam Gateau	9b63739a72	Trying to clen up the REnderMode usage in connection with the needed gpu::State for all the different variations	2015-03-31 17:35:34 -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
Seth Alves	5cc12b8b47	allow for quads in the model which is being used as the template for generating the collision shape. added a flag to run the fatten-face code	2015-03-31 17:00:36 -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	edaa4cdc65	Remove local file reading from scripts	2015-03-31 16:57:15 -07:00
David Rowe	0a55bcb0c5	Remove XMLHttpRequest's facility to read local files	2015-03-31 16:56:04 -07:00
Andrew Meadows	ef10e5734d	bounding box for skeleton with bad mesh weights	2015-03-31 16:53:33 -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
ZappoMan	d68143675a	first simple pass at using marketplace windows in preferences	2015-03-31 16:24:27 -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
Philip Rosedale	c336d235bf	Merge pull request #4538 from birarda/damaged-xcode ... potential fix for damaged xcode thanks to TBB	2015-03-31 16:04:26 -07:00
Brad Hefta-Gaub	b6f670a8d8	Merge pull request #4554 from samcake/yellow ... Better support for Nvidia Optimus Laptop	2015-03-31 15:56:01 -07:00
Brad Hefta-Gaub	867c8078bd	Merge pull request #4553 from PhilipRosedale/master ... Blocks fall when made, better edge colors	2015-03-31 15:53:44 -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
Stephen Birarda	e73e74336e	Merge branch 'master' of https://github.com/highfidelity/hifi into damaged-xcode	2015-03-31 15:42:16 -07:00
Bradley Austin Davis	a7eebfd002	Merge remote-tracking branch 'upstream/master' into oculus_old_renderer	2015-03-31 15:42:01 -07:00
Philip Rosedale	63fe49c60e	Merge pull request #4534 from birarda/master ... don't use DX11 for bullet even if found	2015-03-31 15:21:29 -07:00
Sam Gateau	b4d11e2eb5	Add the needed global variable exported to enable the nvidia gpu on optimus platform (laptops with intel integrated) also log the opengl version and gpu and driver used	2015-03-31 15:18:59 -07:00
Sam Gateau	74f04c0c84	remove useless comment	2015-03-31 14:57:51 -07:00
Bradley Austin Davis	6757dfcc0c	Working on 0.5.0.1 port and addressing the direct HMD/v-sync conflict	2015-03-31 14:52:21 -07:00
Seth Alves	07493432da	Merge pull request #4550 from ctrlaltdavid/fix-typo ... Fix typo	2015-03-31 14:51:28 -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
Philip Rosedale	f4695643e3	Blocks fall when made, better edge colors	2015-03-31 14:13:19 -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