9243 commits

Author	SHA1	Message	Date
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
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
Zach Pomerantz	1e8d45aecb	Put ScriptableResource state enum in prototype	2016-04-27 19:20:43 -07:00
Zach Pomerantz	0c78d5bdd1	Change ScriptableResource signal to state	2016-04-27 19:20:42 -07:00
Zach Pomerantz	c2909946e6	Split test to prefetch, movie	2016-04-27 19:20:33 -07:00
David Rowe	eee3cedd95	Fix typo	2016-04-28 12:55:41 +12: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
David Rowe	9ecffd626e	Capitalize title of directory window from "directory" to "Directory"	2016-04-28 09:01:03 +12:00
Zach Pomerantz	bc8a171fde	Merge branch 'master' of github.com:highfidelity/hifi into feat/resource-prefetch	2016-04-27 11:55:24 -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
James B. Pollack	afb2342781	Merge remote-tracking branch 'upstream/master' into defaultScripts	2016-04-26 16:16:56 -07:00
James B. Pollack	cd59c462d1	users and voxel fixes	2016-04-26 15:34:24 -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
James B. Pollack	5cb88b957c	update paths for users and voxels	2016-04-26 14:35:24 -07:00
James B. Pollack	2f069b4051	sort out voxel pics	2016-04-26 14:09:22 -07:00
James B. Pollack	8d506f6242	new voxel pic	2016-04-26 14:04:57 -07:00
James B. Pollack	db00df8020	update butterflies url to production	2016-04-26 13:26:34 -07:00
James B. Pollack	4431d869e7	move butterflies.js to tutorials at freidricas request	2016-04-26 13:25:43 -07:00
James B. Pollack	927ac60a8c	add images for voxels	2016-04-26 13:24:22 -07:00
Andrew Meadows	e158ea9d92	update asset urls in users.js	2016-04-26 11:41:39 -07:00
Andrew Meadows	e87b06657c	remove whitespace and fix formatting	2016-04-26 11:24:38 -07:00
Andrew Meadows	e436c355a1	get viewport dimensions from controller	2016-04-26 11:23:29 -07:00
Andrew Meadows	8a02a585f2	use array of colors	2016-04-26 11:23:05 -07:00
Andrew Meadows	6e28538063	support toggling locked and visible properties	2016-04-26 11:22:45 -07:00
Andrew Meadows	39a1b9e75d	update script/tutorials	2016-04-26 11:21:56 -07:00
Andrew Meadows	3a9cde8510	use local paths rather than remote URLs	2016-04-26 11:21:11 -07:00
Andrew Meadows	9556995f2f	move users.js and voxels.js	2016-04-26 11:15:21 -07:00
Andrew Meadows	50117e2ff4	add some new tutorial JS files	2016-04-25 17:53:10 -07:00
Andrew Meadows	3a2cb37ce2	move and rename some JS files	2016-04-25 17:50:35 -07:00
Andrew Meadows	e32fface93	add some local assets	2016-04-25 17:46:02 -07:00
Andrew Meadows	4630bdea58	move from examples/ to scripts/templates/	2016-04-25 17:38:34 -07:00
Andrew Meadows	0cc12fdaa6	move from examples/ to scripts/developer/	2016-04-25 17:36:35 -07:00
Andrew Meadows	582b20227a	move from examples/ to scripts/default/	2016-04-25 17:35:27 -07:00