3105 commits

Author	SHA1	Message	Date
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
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
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
David Rowe	154dacf791	Fix typo	2015-03-31 14:21:56 -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	3475bfb396	fix typos	2015-03-30 17:04:47 -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	186cb1ec7a	merge from upstream	2015-03-30 11:28:47 -07: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
ZappoMan	002fba8018	first cut at predicting FST type for set avatar	2015-03-27 16:56:03 -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
Andrew Meadows	be5fdbf217	enable avatar collisions by default ... also remove old gravity features	2015-03-27 13:36:20 -07:00
David Rowe	90c1da2094	Merge branch 'master' into 20416 ... Conflicts: examples/notifications.js	2015-03-27 12:13:29 -07:00
Seth Alves	7da87d6e15	set up a way to request ResourceCache downloads from a non-networking thread.	2015-03-26 18:37:55 -07:00
ZappoMan	6cff99f9d6	menu and display tweaks	2015-03-26 16:36:46 -07:00
Brad Hefta-Gaub	918154e407	Merge pull request #4491 from huffman/export-json ... Update export entities to export as JSON	2015-03-25 16:49:23 -07:00
Andrew Meadows	b87360f0f5	merge upstream/master into andrew/inertia	2015-03-24 17:41:07 -07:00
Andrew Meadows	44eca08fa4	PhysicsEngine doesn't need AvatarData ... MyAvatar now owns its CharacterController fix for bug of phantom collision obj when avatar's physics are disabled	2015-03-24 17:38:35 -07:00
Philip Rosedale	fe61387121	Merge pull request #4498 from ZappoMan/LODUITweaks ... Some LOD UI Tweaks	2015-03-24 17:34:27 -07:00
ZappoMan	619428c325	move LOD FPS settings to Preferences	2015-03-24 13:32:22 -07:00
Stephen Birarda	1a6865b41b	send immediate location update when domain changes	2015-03-24 13:15:30 -07:00
Ryan Huffman	2fc0ef80d0	Add SVO_JSON_EXTENSION to accepted extensions	2015-03-24 10:40:46 -07:00
ZappoMan	fa122a227b	tweaks to the LOD Tools UI	2015-03-23 16:44:07 -07:00
Ryan Huffman	61dc31ffe7	Update export entities to export as JSON	2015-03-23 14:09:45 -07:00
David Rowe	cb6abfb2e6	Display notification if domain connection refused	2015-03-23 12:05:56 -07:00
ZappoMan	5f825211df	Merge branch 'master' of https://github.com/highfidelity/hifi into dragDropLinkAvatars	2015-03-19 15:12:06 -07:00
ZappoMan	24132968fe	oops	2015-03-19 12:41:44 -07:00
ZappoMan	26670f9e41	remove unneeded debug	2015-03-19 12:15:12 -07:00
ZappoMan	c5314aceac	more DRYing up of code	2015-03-19 11:57:57 -07:00
ZappoMan	5814a14152	removed dead code	2015-03-19 11:42:00 -07:00
ZappoMan	3c41ecd091	cleanup accepted files implementation	2015-03-19 11:29:41 -07:00
ZappoMan	8e0141b8e9	first cut at fst drag/drop support	2015-03-19 08:48:13 -07:00
samcake	c0a66a05f4	Merge pull request #4463 from ZappoMan/LODTweaks ... MVP Task - tweaks to automatic-LOD adjustments & Display warning when LOD is decreased	2015-03-18 16:55:39 -07:00
Brad Davis	0c465ce2b5	Merge pull request #4460 from ZappoMan/runJSFiles ... MVP task - Allow a script to be added to a users "running script" from the marketplace	2015-03-18 12:52:44 -07:00
ZappoMan	8239a295cb	Merge branch 'master' of https://github.com/highfidelity/hifi into LODTweaks	2015-03-18 11:54:05 -07:00
ZappoMan	a2e012f7a9	Merge branch 'master' of https://github.com/highfidelity/hifi into runJSFiles	2015-03-18 11:53:19 -07:00
Brad Davis	07ee350c09	Removing reported logspam from release builds	2015-03-18 10:24:53 -07:00
Brad Hefta-Gaub	a5294ae3fa	Merge pull request #4436 from sethalves/persist-entities-as-json ... Optionally persist entities as json	2015-03-17 21:53:17 -07:00
Brad Hefta-Gaub	55d9560c9e	Merge pull request #4469 from jherico/frustumFetchCheck ... Fix broken aspect ratio in mirror	2015-03-17 17:06:21 -07:00
Brad Davis	1662230289	Adding some fixmes to the code, since globals are evil and such checks should be confined to debug mode only	2015-03-17 16:44:29 -07:00
Brad Davis	e616308911	Adding runtime check to ensure that the correct frustum is fetched during rendering	2015-03-17 16:28:44 -07:00
Brad Davis	c88f6f8f07	Adding some documentation on the change	2015-03-17 13:49:06 -07:00
ZappoMan	1e03335012	implement scripting interface for LODManager	2015-03-17 13:18:29 -07:00
Brad Davis	71e59cfa88	Fix: Mini-mirror doesn't render avatar head when in first person mode	2015-03-17 13:15:15 -07:00
ZappoMan	749bc1ee9b	support for loading of JS files by drag, web page urls, and openfile events	2015-03-17 08:38:39 -07:00