42876 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
James B. Pollack	fc82780512	move toolbars to production	2016-04-29 11:04:04 -07:00
James B. Pollack	e61f8524c1	update dice path	2016-04-29 11:01:19 -07:00
Brad Hefta-Gaub	d2d4ba277d	Merge pull request #7791 from birarda/anon-events ... use a setting handle for UAL disabled to fix startup race	2016-04-28 19:11:09 -07:00
Stephen Birarda	09981db834	use a setting handle for UAL disabled to fix startup race	2016-04-28 18:05:06 -07:00
Brad Hefta-Gaub	19e069f6ef	Merge pull request #7790 from birarda/anon-events ... don't require authentication to send usage data	2016-04-28 18:01:33 -07:00
Stephen Birarda	6883891748	don't require authentication to send user activity	2016-04-28 17:08:40 -07:00
Brad Hefta-Gaub	e92e4e57b1	Merge pull request #7772 from AndrewMeadows/minor-optimizations ... minor cleanup and optimizations around EntityItem::getDimensions()	2016-04-28 17:04:42 -07:00
Brad Hefta-Gaub	647ec69aaf	Merge pull request #7789 from imgntn/movetemplates ... Move developer templates into a different location	2016-04-28 17:02:42 -07:00
Brad Hefta-Gaub	e881cba502	Merge pull request #7777 from ctrlaltdavid/20897 ... Move directory, examples, and edit toolbar buttons down a bit	2016-04-28 17:00:49 -07:00
Brad Hefta-Gaub	5314755e0d	Merge pull request #7782 from ctrlaltdavid/20898 ... Automatically upgrade toolbar position to bottom center of window	2016-04-28 16:37:34 -07:00
Brad Hefta-Gaub	bc57719f5f	Merge pull request #7771 from ericrius1/lampFix ... Lamp fix- moves light position up a bit on desklamp at home	2016-04-28 16:29:03 -07:00
Brad Hefta-Gaub	6488744bd5	Merge pull request #7780 from imgntn/defaultScripts ... Remove directory.js from default scripts	2016-04-28 16:28:33 -07:00
Brad Hefta-Gaub	b72ac35e8e	Merge pull request #7785 from imgntn/editicons ... Re-add locking/visibility tools to edit.js	2016-04-28 16:27:34 -07:00
James B. Pollack	851f9b0914	move dev templates into a dif location	2016-04-28 16:23:32 -07:00
James B. Pollack	e68909ce3e	re add local paths	2016-04-28 13:48:09 -07:00
James B. Pollack	aafed4e1b8	fix horizontal typo in examples	2016-04-28 13:42:10 -07:00
James B. Pollack	b52406e127	horizontal	2016-04-28 13:40:58 -07:00
James B. Pollack	795d866da9	re add locking/visibility tools to edit.js	2016-04-28 13:29:54 -07:00
David Rowe	1cf53829d3	Fix upgrading for all toolbar buttons	2016-04-29 08:20:20 +12:00
David Rowe	b7188bad30	Automatically upgrade toolbar position to bottom center of window	2016-04-29 07:13:56 +12:00
James B. Pollack	90c59c5af0	remove directory from default	2016-04-28 10:39:53 -07:00
Andrew Meadows	b95c81d0ba	Merge pull request #7763 from huffman/fix/gpu-ident-debug ... Fix assert crash in GPUIdent	2016-04-28 08:02:11 -07:00
Seth Alves	5cec928ad1	Merge pull request #7776 from huffman/fix/build-copy-scripts ... Fix interfaces scripts not copying from /scripts in local builds	2016-04-27 19:15:09 -07:00
David Rowe	eee3cedd95	Fix typo	2016-04-28 12:55:41 +12:00
Marko Kudjerski	b6bd02aea6	Merge pull request #7774 from birarda/alpha-is-beta ... change produced installer names to beta	2016-04-27 17:52:28 -07:00
David Rowe	26e8e22b8b	Move directory, examples, and edit toolbar buttons down ... Moved down as far as they can go within the getRecommendedOverlayRect(), i.e., there's a 50px margin.	2016-04-28 12:23:47 +12:00
Andrew Meadows	8a691cf449	Merge pull request #7765 from hyperlogic/tony/cone-sphere-angle ... Improve eye tracking when face to face	2016-04-27 16:54:07 -07:00
Andrew Meadows	4160e0c1df	Merge pull request #7773 from imgntn/defaultScripts ... change path for defaultscripts.js in scriptengine	2016-04-27 16:35:51 -07:00
Ryan Huffman	f92f29ecab	Fix interfaces scripts not copying from /scripts in local builds	2016-04-27 16:34:30 -07:00
Stephen Birarda	9fe9100cac	change produced installer names to beta	2016-04-27 15:57:32 -07:00
James B. Pollack	bced3c2c3c	change path for defaultscripts.js in scriptengine	2016-04-27 13:34:42 -07:00
Andrew Meadows	5042561e80	Merge pull request #7730 from imgntn/defaultScripts ... /scripts for launch	2016-04-27 11:36:20 -07:00
Andrew Meadows	b5ad989811	more optimized uses of EntityItem::getDimensions()	2016-04-27 11:04:22 -07:00
Andrew Meadows	c686418be0	optimize use of EntityItem::getDimensions()	2016-04-27 10:34:29 -07:00
Andrew Meadows	f6aa0a11a8	Merge pull request #7766 from ZappoMan/fixAutoResize ... fix auto resize of models on import	2016-04-27 10:03:18 -07:00
Andrew Meadows	93f4bc759d	Merge pull request #7743 from samcake/color ... group several separate glUniform parameters into a single Uniform Buffer	2016-04-27 10:02:56 -07:00
ericrius1	72f272b5d3	lampfix	2016-04-27 09:48:16 -07:00
ericrius1	1297ae5d0d	Merge remote-tracking branch 'upstream/master'	2016-04-27 09:29:45 -07:00
James B. Pollack	92f61dc86f	prepend /system to default scripts	2016-04-27 00:44:04 -07:00
James B. Pollack	6c16e8c6c7	rename default scripts	2016-04-27 00:43:30 -07:00
Brad Hefta-Gaub	19416fe722	Merge pull request #7761 from samcake/lemon ... Add support for equi-rectangular skymaps (2 by 1)	2016-04-26 17:15:24 -07:00
Brad Hefta-Gaub	db6a07171f	Merge pull request #7764 from zzmp/fix/text3d-pipeline ... Fix strange rendering with Text3DOverlay	2016-04-26 17:15:09 -07:00
Howard Stearns	70552b2455	Merge pull request #7762 from ZappoMan/qmlWindowFixes ... fix a bunch of bugs in qml window placement	2016-04-26 17:00:54 -07:00
James B. Pollack	afb2342781	Merge remote-tracking branch 'upstream/master' into defaultScripts	2016-04-26 16:16:56 -07:00
James B. Pollack	37fa703279	use system path instead of default for loading scripts	2016-04-26 15:50:45 -07:00
James B. Pollack	cd59c462d1	users and voxel fixes	2016-04-26 15:34:24 -07:00
Brad Hefta-Gaub	b597f7001b	fix auto resize	2016-04-26 15:13:11 -07:00
James B. Pollack	db197b5014	fix users	2016-04-26 14:50:19 -07:00
James B. Pollack	06171f6063	move default to system	2016-04-26 14:47:02 -07:00
James B. Pollack	251769a0b9	put toolbar.js at latest	2016-04-26 14:35:39 -07:00