Commit graph

56 commits

Author SHA1 Message Date
Andrew Meadows
5bb504ad55 Merge pull request #4268 from huffman/remove-upload-model
Remove upload from file from editEntities.js
2015-02-12 08:57:22 -08:00
Ryan Huffman
957686e12e Remove upload from file from editEntities.js 2015-02-11 09:04:56 -08:00
Ryan Huffman
6eca8610b6 Increase entity-resize timeout to 2 minutes 2015-02-10 15:54:04 -08:00
Ryan Huffman
9997ef1b97 Increase size of text entity 2015-02-10 14:23:00 -08:00
Ryan Huffman
1e11e658a8 Update drag/drop distance to be based on cameraManager.enabled rather than camera mode 2015-02-05 10:18:34 -08:00
Ryan Huffman
2343da0a8a Update drag/drop distance while in non-independent mode 2015-02-05 10:16:51 -08:00
Ryan Huffman
41720dbc4b Add drag-drop functionality for placing entities 2015-02-05 10:07:31 -08:00
Ryan Huffman
efed79d76c Update the default properties for text entities 2015-02-04 13:37:11 -08:00
Ryan Huffman
36238bb5df Update editEntities to use left click for select 2015-02-04 10:43:55 -08:00
Ryan Huffman
09752589b8 Reenable on/off button 2015-02-04 10:43:28 -08:00
Ryan Huffman
4fbc7a5dcd Add focus easing and auto-focus to menu and settings 2015-02-04 10:42:01 -08:00
Ryan Huffman
01a00b5127 Disable editEntities always-on 2015-02-04 10:40:50 -08:00
Ryan Huffman
e2b6be2a92 Fix focus behavior when selecting an item without shift 2015-02-03 11:58:39 -08:00
Ryan Huffman
7f0fdbe23e Make auto-focus in editEntities always use ease-on-focus 2015-02-03 11:50:58 -08:00
Ryan Huffman
814d585086 Make the entity list always visible 2015-02-03 11:44:38 -08:00
Ryan Huffman
ba5a96f541 Add Window.setFocus 2015-02-03 11:44:22 -08:00
Ryan Huffman
a98829ed8a Fix editEntities.js automatically turning on 2015-01-30 13:12:00 -08:00
Ryan Huffman
0d1488e44f Fix editEntities.js includes 2015-01-30 10:03:37 -08:00
Ryan Huffman
77c78689d1 Merge branch 'master' of github.com:highfidelity/hifi into edit-always-on 2015-01-30 09:28:09 -08:00
Ryan Huffman
cddce8f795 Update editEntities to always be on + use right click for select 2015-01-30 09:21:27 -08:00
Ryan Huffman
5d8825f5eb Remove call to gridTool.mousePressEvent 2015-01-30 08:56:37 -08:00
Ryan Huffman
d06d8b8f01 Merge branch 'master' of github.com:highfidelity/hifi into revert-grid
Conflicts:
	examples/libraries/gridTool.js
2015-01-29 17:27:58 -08:00
Ryan Huffman
eb69720af4 Update when grid tool window is shown 2015-01-29 16:58:48 -08:00
Brad Hefta-Gaub
f5e092c0d2 Merge pull request #4187 from huffman/parallel-script-loading
Parallel script loading
2015-01-29 13:26:37 -08:00
Ryan Huffman
a775476cfa Remove editEntities move-by-arrow-key completely 2015-01-28 12:21:50 -08:00
Ryan Huffman
135c8c1bdf Disable move entity by arrows 2015-01-28 12:19:54 -08:00
Ryan Huffman
5633be0e92 Add ability to move orbit camera using keys 2015-01-28 12:19:42 -08:00
Ryan Huffman
e1ca6d5048 Disable editentities auto-off when moving avatar 2015-01-28 12:16:28 -08:00
Ryan Huffman
1ba398c0e3 Remove blank line 2015-01-27 15:57:27 -08:00
Ryan Huffman
defb796c1e Update editEntities to auto-focus on selection 2015-01-27 15:56:24 -08:00
Ryan Huffman
4fd5f74365 Update editEntities.js to load includes in parallel 2015-01-22 14:14:49 -08:00
Ryan Huffman
3a287a08ab Fix removal of entity list menu item 2015-01-20 12:43:49 -08:00
Ryan Huffman
891f6fa513 Move entity list to edit menu 2015-01-20 12:40:16 -08:00
Ryan Huffman
8202c84c79 Add entity list menu option 2015-01-20 12:37:39 -08:00
Ryan Huffman
92b99237a2 Merge branch 'master' of github.com:highfidelity/hifi into entity-list-updates 2015-01-15 11:13:01 -08:00
Ryan Huffman
705e6181a1 Move entity delete action to function 2015-01-15 11:12:46 -08:00
Brad Hefta-Gaub
d5d4b4ee18 Merge pull request #4113 from huffman/edit-entity-click
Update editEntities to do an accurate pick when the mouse is idle
2015-01-15 11:04:34 -08:00
Ryan Huffman
bf6d63cf0c Make accurateRay parameter required 2015-01-15 10:59:24 -08:00
Ryan Huffman
dcb4d9f02d Update editEntities to do accurate pick on mouse idle 2015-01-15 10:57:35 -08:00
Chris Collins
d6a3b94c73 Changed references of global.js to a var
Changed references of global.js to a var
2015-01-15 10:48:31 -08:00
Ryan Huffman
c51cac6381 Remove Model List dialog 2015-01-13 15:38:28 -08:00
Ryan Huffman
ce60a410cf Reenable entity list tools 2015-01-13 15:34:26 -08:00
Ryan Huffman
00f7bf7efe Remove 'Edit Properties...' in favor of properties window 2015-01-13 10:12:15 -08:00
Ryan Huffman
8d8352946b Add rescale button to edit properties window 2015-01-09 10:01:58 -08:00
Ryan Huffman
92fc08fa70 Update property list window to only show after selection 2015-01-07 12:14:47 -08:00
Chris Collins
0a1a64b7e6 Script updates and fixes to highfidelity-public
Script updates and fixes to highfidelity-public
2015-01-06 17:04:42 -08:00
Ryan Huffman
a474243f08 Update to ignore mouseRelease events if mousePress event handles by tool 2014-12-30 11:21:50 -08:00
Ryan Huffman
2fab404f7f Reorganize selectionManager selection checking 2014-12-12 15:35:39 -08:00
Ryan Huffman
dde9b92dbd Update SelectionManager -> selectionManager 2014-12-12 15:31:54 -08:00
Ryan Huffman
33b4c614ea Add buttons for moving selection to grid and resetting to natural dimensions 2014-12-12 15:28:57 -08:00