2068 commits

Author	SHA1	Message	Date
ZappoMan	9dd913bd6d	add copyright header to LODWarning.js	2015-03-17 15:51:08 -07:00
ZappoMan	6dbdfb7e7b	add LODWarning.js to default scripts	2015-03-17 15:49:34 -07:00
ZappoMan	37ccd7b9f8	add LOD warnings script	2015-03-17 15:47:23 -07:00
ZappoMan	1e03335012	implement scripting interface for LODManager	2015-03-17 13:18:29 -07:00
Atlante45	c421adaf58	Fix unresolve merge conflict	2015-03-16 16:27:33 +01:00
Atlante45	ad16f49d01	Merge branch 'master' of https://github.com/highfidelity/hifi into edit_entities_box_selection	2015-03-16 14:28:24 +01:00
Clément Brisset	dfd39ca1e1	Merge pull request #4448 from huffman/loading-image ... Add hourglass image to loading svo overlay	2015-03-16 06:25:41 -07:00
Clément Brisset	934d9c087a	Merge pull request #4447 from ctrlaltdavid/20394 ... CR for Job #20394 - Build friends.js v1	2015-03-16 06:24:35 -07:00
Stephen Birarda	641581a825	Merge pull request #4446 from huffman/marketplace-window ... Marketplace window	2015-03-13 17:51:44 -07:00
Ryan Huffman	76f474bff1	Add hourglass image to loading svo overlay	2015-03-13 14:48:33 -07:00
Ryan Huffman	d512a67c8a	Merge branch 'master' of github.com:highfidelity/hifi into edit-lights-overlays	2015-03-13 14:13:56 -07:00
Ryan Huffman	dc3453a878	Add Window.raiseMainWindow()	2015-03-13 14:10:46 -07:00
David Rowe	67b2d0c8ab	Trim text to fit in window	2015-03-13 12:18:49 -07:00
David Rowe	f49ed0951e	Fix clickable areas	2015-03-13 12:04:43 -07:00
Ryan Huffman	33f255fad2	Merge branch 'master' of github.com:highfidelity/hifi into marketplace-window	2015-03-13 11:46:21 -07:00
Ryan Huffman	905de8b03c	Adjust marketplace window size	2015-03-13 11:46:15 -07:00
Atlante45	36814e837b	Merge branch 'master' of https://github.com/highfidelity/hifi into edit_entities_box_selection	2015-03-13 19:05:17 +01:00
Ryan Huffman	e94bac1971	Fix subimage indexing in toolBars.js	2015-03-13 10:07:31 -07:00
Ryan Huffman	504dceda6b	Update edit.js icons	2015-03-13 10:07:12 -07:00
Stephen Birarda	edaee9716b	Merge pull request #4438 from huffman/edit-rename ... Move editEntities.js to edit.js	2015-03-13 09:39:34 -07:00
Clément Brisset	f5777867da	Merge pull request #4439 from ctrlaltdavid/20394 ... CR for Job #20394 - Build friends.js v1	2015-03-13 09:00:14 -07:00
Atlante45	55a88e6076	Allow selection of all entities inside box in editEntities	2015-03-13 16:24:33 +01:00
Ryan Huffman	a3c2df5c77	Add menu option to turn on/off showing lights in edit mode	2015-03-12 16:16:29 -07:00
Ryan Huffman	165199c69d	Update light overlay size	2015-03-12 15:55:31 -07:00
Ryan Huffman	2bedd1cfc7	Move editEntities.js to edit.js	2015-03-12 12:39:06 -07:00
Ryan Huffman	ebf70f818a	Merge branch 'master' of git://github.com/highfidelity/hifi into edit-light-2 ... Conflicts: examples/editEntities.js	2015-03-12 11:39:26 -07:00
Ryan Huffman	4335a41002	Update editEntities to call setActive on init	2015-03-12 11:38:51 -07:00
Ryan Huffman	c13ba4a318	Add toggling of light visibility	2015-03-12 11:38:29 -07:00
Ryan Huffman	ccbbba3def	Update light default dimensions	2015-03-12 11:18:42 -07:00
Ryan Huffman	d82598327b	Add light overlays	2015-03-12 11:18:32 -07:00
Brad Hefta-Gaub	f91a19a918	Merge pull request #4424 from huffman/open-svo ... Handle drag-n-dropped .svos and using interface to open .svo files	2015-03-12 08:15:25 -07:00
David Rowe	dfd9506223	Add user location after username ... Credit @nbq	2015-03-11 21:20:47 -07:00
David Rowe	2e16794615	Change font size to 12	2015-03-11 21:18:53 -07:00
David Rowe	eb22b0085b	Add radio buttons	2015-03-11 20:05:35 -07:00
David Rowe	a109a18bc3	Add visibility control	2015-03-11 19:28:29 -07:00
Ryan Huffman	1904e5e209	Make look.js the default look script and remove the old scripts	2015-03-11 16:17:44 -07:00
Ryan Huffman	76ebac1185	Add import svo requests in editEntities	2015-03-11 15:44:26 -07:00
Philip Rosedale	cc3a86af94	Merge pull request #4419 from huffman/merge-touch-mouse ... Add look.js	2015-03-11 14:40:27 -07:00
David Rowe	549eead9f2	Prepare to add visibility control	2015-03-11 12:36:57 -07:00
Clément Brisset	885e6206e9	Merge pull request #4420 from ctrlaltdavid/20394 ... CR for Job #20394 - Build friends.js v1	2015-03-11 11:17:04 -07:00
David Rowe	fd423e5019	Fix units	2015-03-11 11:07:02 -07:00
David Rowe	1a18decc6d	Fix typo	2015-03-11 10:49:36 -07:00
David Rowe	bbffa6474b	Add users.js to default scripts	2015-03-11 10:32:14 -07:00
David Rowe	532e4feebb	Remove dead code and fix typos	2015-03-11 10:30:09 -07:00
Ryan Huffman	6c978c0ff3	Add look.js ... Merges both lookWithMouse and lookWithTouch, and updates mouse look to only work with right-click	2015-03-11 10:27:38 -07:00
David Rowe	22ff97fd27	Make visible by default	2015-03-11 10:25:24 -07:00
David Rowe	d36399c65d	Add heading	2015-03-11 10:21:49 -07:00
David Rowe	c30bf5667f	Fix teleporting to user	2015-03-11 10:15:34 -07:00
Ryan Huffman	e4f7e35587	Hide edit tools when inactive	2015-03-11 10:10:11 -07:00
David Rowe	ad08a7dde2	Position window at bottom left of screen	2015-03-11 09:37:18 -07:00