11486 commits

Author	SHA1	Message	Date
Brad Hefta-Gaub	ad27d7353b	Merge pull request #4386 from jherico/oculus_old_renderer ... DO NOT MERGE - Update Oculus SDK integration	2015-04-01 17:17:32 -07:00
Brad Hefta-Gaub	e5757575de	Merge pull request #4578 from samcake/orange ... tweak the default specular value for the Primitive entities to less shiny	2015-04-01 16:36:53 -07:00
Bradley Austin Davis	58908f44ef	Fixing crash on exit when using (or used) VR mode	2015-04-01 16:05:46 -07:00
Sam Gateau	4a6046b07c	tweak the default specular value for the Primitive entities (sphere and cubes) so they do not shine so much	2015-04-01 15:50:04 -07:00
Bradley Austin Davis	fd47d4f3a5	Working on putting some more timing measurement into the code	2015-04-01 15:47:51 -07:00
Stephen Birarda	526c9217a1	fix signup link from login dialog	2015-04-01 14:43:56 -07:00
Bradley Austin Davis	3b77118baa	Merge branch 'master' into oculus_old_renderer	2015-04-01 14:09:29 -07:00
Bradley Austin Davis	a7dc1d26e6	Working on SDK vs client distortion performance differences	2015-04-01 13:23:55 -07:00
Sam Gateau	3b92910a91	Adding the cookies sciprt that provide a simple ui useful for debug and exemple, complete the interface on the scene script interface to provide the getters	2015-04-01 12:22:35 -07:00
ZappoMan	da9a8e8a97	CR feedback	2015-04-01 09:27:58 -07:00
ZappoMan	827e37b920	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI	2015-04-01 09:09:50 -07:00
Bradley Austin Davis	e520a62bcf	Merge branch 'master' into oculus_old_renderer	2015-04-01 09:09:06 -07:00
Stojce Slavkovski	8514a39812	Use constants for URLs	2015-04-01 07:24:16 +02:00
Stojce Slavkovski	7b3d33c2a4	Merge branch 'master' of https://github.com/highfidelity/hifi into 20429	2015-04-01 06:48:09 +02: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
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
ZappoMan	d68143675a	first simple pass at using marketplace windows in preferences	2015-03-31 16:24:27 -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
Bradley Austin Davis	a7eebfd002	Merge remote-tracking branch 'upstream/master' into oculus_old_renderer	2015-03-31 15:42:01 -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
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
David Rowe	154dacf791	Fix typo	2015-03-31 14:21:56 -07:00
Bradley Austin Davis	c4c6cf82a2	Working on migration to SDK 0.5.0.1	2015-03-31 13:27:11 -07:00
Stojce Slavkovski	e1fba3c0c0	correct signup URL	2015-03-31 21:57:59 +02:00
Stojce Slavkovski	18b3a52f21	Merge branch 'master' of https://github.com/highfidelity/hifi into 20429	2015-03-31 21:50:46 +02:00
Bradley Austin Davis	56b5ad2e6b	Merge branch 'master' into oculus_old_renderer	2015-03-31 11:10:23 -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
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
ZappoMan	64fdca7d6d	fix no root joint warning	2015-03-30 17:32:42 -07:00
ZappoMan	3475bfb396	fix typos	2015-03-30 17:04:47 -07:00
Bradley Austin Davis	5e5bdec88d	Merge branch 'master' into oculus_old_renderer	2015-03-30 16:36:00 -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
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	186cb1ec7a	merge from upstream	2015-03-30 11:28:47 -07:00
Seth Alves	7de15cda87	quiet compiler	2015-03-30 09:30:13 -07:00
Stojce Slavkovski	d0e2697cbb	"Create account" link	2015-03-30 18:26:33 +02:00
Philip Rosedale	099a2b5319	Merge pull request #4521 from ctrlaltdavid/20416 ... CR for Job #20416 - Update notification.js to include a notification about being blocked from a server	2015-03-30 08:49:29 -07:00
ZappoMan	3bda65f4fe	if installing a body, and you have no head, make your head the default head	2015-03-28 19:19:11 -07:00
ZappoMan	80df8caefb	Merge branch 'master' of https://github.com/highfidelity/hifi into avatarUI	2015-03-28 18:43:03 -07:00
Seth Alves	fc1e45fc58	valgrind says this is used before it's initialized	2015-03-28 17:10:46 -07:00
Seth Alves	986bc71e93	quiet compiler	2015-03-28 17:10:26 -07:00
ZappoMan	002fba8018	first cut at predicting FST type for set avatar	2015-03-27 16:56:03 -07:00
ZappoMan	baa2f947e5	classifying FSTReader and moving ModelType into that class	2015-03-27 16:30:00 -07:00
Seth Alves	fd69a54f10	Merge branch 'master' of github.com:highfidelity/hifi into multi-hull-collisions	2015-03-27 15:55:20 -07:00
Philip Rosedale	d908b7fdc6	Merge pull request #4523 from AndrewMeadows/inertia ... enable avatar physics by default	2015-03-27 14:53:40 -07:00