2046 commits

Author	SHA1	Message	Date
Ryan Huffman	dc3453a878	Add Window.raiseMainWindow()	2015-03-13 14:10:46 -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
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
Ryan Huffman	2bedd1cfc7	Move editEntities.js to edit.js	2015-03-12 12:39:06 -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
David Rowe	a3c4429e0b	Longer wait until requesting status again after request error	2015-03-11 09:36:26 -07:00
David Rowe	d071bc50a4	Change from paragraph of usernames to single column of usernames	2015-03-10 17:20:08 -07:00
Brad Hefta-Gaub	6f24a62758	Merge pull request #4414 from birarda/master ... workaround for missing touch begin event in 5.4.x	2015-03-10 17:09:33 -07:00
Stephen Birarda	3579bb46ab	handle touch update without a touch begin event	2015-03-10 17:04:30 -07:00
Philip Rosedale	2e85cf7459	Merge pull request #4413 from birarda/master ... fix stereo to stereo resampling via soxr	2015-03-10 16:09:31 -07:00
Stephen Birarda	8ede9fb39b	fix stereo to stereo resampling	2015-03-10 15:50:30 -07:00
Seth Alves	cf20596d6d	Merge pull request #4406 from ZappoMan/svoFromURL ... Support for importing from a network URL	2015-03-10 15:41:41 -07:00
David Rowe	4e8fcd47c0	Show/hide users window with menu item	2015-03-10 13:51:25 -07:00
Philip Rosedale	182a1a726d	remove debug	2015-03-10 13:34:16 -07:00
Philip Rosedale	2d6c51ac77	Detect moving objects before catching them	2015-03-10 13:32:56 -07:00
David Rowe	59762175e4	Grow/shrink window as size of users list changes	2015-03-10 12:44:34 -07:00
ZappoMan	e16961c958	removed dead code	2015-03-10 12:36:31 -07:00
ZappoMan	feddea821a	cleanup import from file vs url	2015-03-10 12:35:12 -07:00
David Rowe	a4fe9c1a12	Click on username to TP to them	2015-03-10 12:32:48 -07:00
ZappoMan	5facb39aa7	support for import entities from network URL	2015-03-10 12:21:37 -07:00
David Rowe	63d8da0233	Display user names in 2D window	2015-03-10 10:57:47 -07:00
David Rowe	d25d3bc6ab	Get users online from Web API	2015-03-10 10:57:46 -07:00
Andrew Meadows	a758ccd75a	Merge pull request #4402 from birarda/master ... add underlying controls for user discoverability	2015-03-10 08:30:46 -07:00
Stephen Birarda	2f22c0cd96	cleanup username API from GlobalServicesScriptingInterface	2015-03-09 16:28:01 -07:00
Seth Alves	99300a5bc8	merge from master	2015-03-09 13:39:51 -07:00
Andrew Meadows	51d05cc43e	merge upstream/master into andrew/isentropic ... Conflicts: libraries/networking/src/PacketHeaders.cpp	2015-03-09 08:51:49 -07:00
Seth Alves	08c3fa6363	merge from upstream	2015-03-08 17:29:05 -07:00