30 commits

Author	SHA1	Message	Date
Stephen Birarda	9f0e146782	Merge pull request #4530 from birarda/master ... fix for marketplace URL on right click	2015-03-30 15:15:01 -07:00
Stephen Birarda	75da852b39	fix for marketplace url on right click	2015-03-30 15:10:16 -07:00
Ryan Huffman	1bdfa3abb5	Update right-click menu to look for marketplaceID	2015-03-27 13:36:22 -07:00
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
Ryan Huffman	28e2e65da9	Fix marketplace showing for all edit properties buttons	2015-03-26 16:23:36 -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
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	a901bc4b11	Update edit.js to export as .svo.json	2015-03-24 10:28:12 -07:00
Ryan Huffman	66517fa1c0	Add ability to show marketplace url from edit properties	2015-03-17 09:07:33 -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
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
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	504dceda6b	Update edit.js icons	2015-03-13 10:07:12 -07:00
Ryan Huffman	2bedd1cfc7	Move editEntities.js to edit.js	2015-03-12 12:39:06 -07:00

Renamed from examples/editEntities.js (Browse further)