Commit graph

18 commits

Author SHA1 Message Date
Ryan Huffman
70be7b3273 Merge branch 'master' of https://github.com/highfidelity/hifi into feat/user-actions 2016-06-21 16:39:25 -07:00
Ryan Huffman
c2ebcd1f77 Make activity logging from scripts only available for certain events 2016-06-16 13:49:25 -07:00
Ryan Huffman
bce05df56b Update enabled_edit to only get sent when you have permission 2016-06-16 13:25:14 -07:00
Ryan Huffman
56c84bbc27 Add opened_marketplace and enabled_edit to edit.js 2016-06-16 13:18:08 -07:00
David Rowe
58f89c88a2 Remember last directory used for Window.browse() and Window.save()
Use last directory if not specified in method call. Default to desktop.
2016-06-11 16:45:17 +12:00
David Rowe
0fe93a1e89 Fix capitalization of import and export dialog titles 2016-06-09 16:12:11 +12:00
howard-stearns
c299aef8f2 fix 588, 558 2016-05-20 12:15:30 -07:00
Brad Hefta-Gaub
52445115dd Merge pull request #7906 from howard-stearns/improve-hand-controller-edit
improve hand-controller edit
2016-05-18 11:35:00 -07:00
Atlante45
4b1497fdf4 Remove dead code highlight entity in edit.js 2016-05-16 16:25:40 -07:00
howard-stearns
acb56d0603 Larger edit handles, and more tolerance in click (vs drag). 2016-05-16 12:35:05 -07:00
Atlante45
5acbed647c Remove glowLevel references in scripts 2016-05-14 14:49:31 -07:00
Brad Hefta-Gaub
e881cba502 Merge pull request #7777 from ctrlaltdavid/20897
Move directory, examples, and edit toolbar buttons down a bit
2016-04-28 17:00:49 -07:00
James B. Pollack
e68909ce3e re add local paths 2016-04-28 13:48:09 -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
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
James B. Pollack
afb2342781 Merge remote-tracking branch 'upstream/master' into defaultScripts 2016-04-26 16:16:56 -07:00
James B. Pollack
06171f6063 move default to system 2016-04-26 14:47:02 -07:00
Renamed from scripts/default/edit.js (Browse further)