2126 commits

Author	SHA1	Message	Date
Ryan Huffman	36c79ccc03	Merge pull request #4520 from cozza13/20426 ... CR for Job #20426 - Remove references to models out of edit.js	2015-03-27 09:39:36 -07:00
Chris Collins	83af2feded	Remove reference to FBX files ... Remove reference to FBX files	2015-03-27 09:33:19 -07:00
Ryan Huffman	c9f4f4626b	Update default light color to (150,150,150)	2015-03-27 09:21:32 -07:00
Brad Hefta-Gaub	7f74bd1ae9	Merge pull request #4513 from ctrlaltdavid/20421 ... CR for Job #20421 - Add scrollbar to Users Online window	2015-03-26 16:50:30 -07:00
Brad Hefta-Gaub	0cee3892ff	Merge pull request #4516 from huffman/fix-edit-buttons ... Fix marketplace showing for all edit properties buttons	2015-03-26 16:38:47 -07:00
Ryan Huffman	28e2e65da9	Fix marketplace showing for all edit properties buttons	2015-03-26 16:23:36 -07:00
ZappoMan	8e7ead2ead	fix locking issue in enter/leave entity scripts	2015-03-26 16:05:31 -07:00
David Rowe	ef9d665146	Highlight scrollbar when it is being moved	2015-03-26 12:22:27 -07:00
David Rowe	876f3e8a23	Scroll when click above or below bar	2015-03-26 12:22:26 -07:00
David Rowe	c7fe7aa157	Update users displayed per scrollbar position	2015-03-26 12:22:26 -07:00
David Rowe	14e92eecad	Click and drag scrollbar	2015-03-26 12:22:25 -07:00
David Rowe	1e1a277065	Scrollbar bar height varies with percentage of users displayed	2015-03-26 12:22:24 -07:00
David Rowe	98c88aab04	Handle no users able to be displayed, insufficient screen height	2015-03-26 12:22:23 -07:00
David Rowe	ba1a7c6761	Show/hide scrollbar depending on whether needed or not	2015-03-26 12:22:23 -07:00
David Rowe	567375368e	Show first N users that can fit	2015-03-26 12:22:22 -07:00
David Rowe	8e66f5998a	Add scrollbar background and bar	2015-03-26 12:22:21 -07:00
David Rowe	7c4ea855a8	Limit height of users window per screen space available	2015-03-26 12:22:20 -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
Philip Rosedale	4cfa4ada92	Merge pull request #4508 from huffman/right-click-marketplace ... Right click marketplace menu	2015-03-25 16:36:23 -07:00
Philip Rosedale	29b9212259	Merge pull request #4501 from Atlante45/light_types ... Light types	2015-03-25 16:34:05 -07:00
Philip Rosedale	0c85881908	Merge pull request #4504 from huffman/disable-duplicate-on-locked-entity ... Disable duplicate on locked entity	2015-03-25 16:31:49 -07:00
Stephen Birarda	f075674415	Merge pull request #4502 from huffman/webwindow-open-url ... Add more functionality to WebWindow (get/set url, raise)	2015-03-25 13:25:29 -07:00
Ryan Huffman	b5b1c5a90b	Remove extraneous print	2015-03-25 12:30:42 -07:00
Ryan Huffman	b8174b164f	Update marketplace popup to hide on position or orientation change	2015-03-25 12:30:00 -07:00
Ryan Huffman	d07acfe9ac	Add right-click marketplace popup	2015-03-25 12:29:38 -07:00
Ryan Huffman	8eed2b6603	Add PopupMenu to edit.js	2015-03-25 12:28:56 -07:00
Ryan Huffman	ea3ec91f71	Remove inspect tool from edit.js	2015-03-25 12:27:15 -07:00
Leonardo Murillo	d1d183e190	More .com changes	2015-03-25 13:05:10 -06:00
Ryan Huffman	5b4b78043a	Remove unneeded print messages	2015-03-25 11:22:28 -07:00
Ryan Huffman	dec89ba96f	Disable duplicating locked entities	2015-03-25 11:22:07 -07:00
Ryan Huffman	bb4417acc6	Merge branch 'master' of github.com:highfidelity/hifi into webwindow-open-url	2015-03-25 10:49:24 -07:00
Atlante45	715fe1096f	Random but persistant switch sound	2015-03-25 17:33:27 +01:00
Atlante45	725a8795fb	Merge branch 'master' of https://github.com/highfidelity/hifi into light_types	2015-03-25 16:39:11 +01:00
Atlante45	19886bd33c	Better handling of callback	2015-03-25 16:38:27 +01:00
Atlante45	afb96709f1	Only update userData when light entity is identified	2015-03-25 15:44:37 +01:00
Atlante45	92d3944044	Use preOp function for all common checks/updates	2015-03-25 15:04:06 +01:00
Philip Rosedale	9c24d2d0eb	Merge pull request #4496 from stojce/20397 ... CR for Job #20397 - Create a test script that builds and places a bunch of houses for load testing	2015-03-24 17:35:44 -07:00
ZappoMan	0e44126106	added LOD Warnings to notifications.js	2015-03-24 16:38:13 -07:00
Ryan Huffman	d54526b8bb	Merge branch 'master' of git://github.com/highfidelity/hifi into webwindow-openurl	2015-03-24 15:43:36 -07:00
Ryan Huffman	a901bc4b11	Update edit.js to export as .svo.json	2015-03-24 10:28:12 -07:00
Atlante45	c26f17e16b	Update from light properties	2015-03-23 18:36:40 +01:00
Atlante45	ea0f3f05e7	Tune sound down	2015-03-23 17:55:23 +01:00
Atlante45	fdfdba5d2d	Couple tweaks	2015-03-23 17:46:57 +01:00
Atlante45	963be820d0	Remove comments	2015-03-23 17:28:11 +01:00
Atlante45	40ed0146e2	Better handling of erased lights	2015-03-23 17:26:43 +01:00
Atlante45	30ea2eb722	Nicer way to update light Properties	2015-03-23 17:20:21 +01:00
Atlante45	efd177d80d	Fix property save	2015-03-23 17:06:34 +01:00
Atlante45	66f954142a	Fix light multiple creations	2015-03-23 17:06:12 +01:00
Atlante45	5fadcbe7d9	Prints cleanup	2015-03-23 17:05:46 +01:00
Atlante45	6b4845abf3	Some improvements to lightController	2015-03-23 16:47:24 +01:00