Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-26 15:56:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
58487 commits 72 branches 56 tags 1.2 GiB
Commit graph

206 commits

Author SHA1 Message Date
Menithal
c3021ae60d Fixing Menu Items for Parenting / Unparenting 2017-02-15 22:21:29 +02:00
Menithal
655c49d9c0 edit.js: started to work on Parenting via hotkey 2017-02-15 19:50:15 +02:00
Seth Alves
d40402faae Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui-edit-js 2017-02-14 06:53:34 -08:00
Seth Alves
4393bc3c2e Merge pull request #9656 from humbletim/21114-part1 
CR-1 21114 -- ScriptCache/ScriptEngine cleanup, loader states, accessible load errors
 2017-02-14 06:49:05 -08:00
Seth Alves
30c46b89a0 Merge pull request #9668 from hyperlogic/feature/remove-tablet-color-effect 
Removed ColorOverlay from TabletButton, added more icon & text states
 2017-02-14 06:16:59 -08:00
Anthony J. Thibault
1c783031b1 Removed ColorOverlay from TabletButton, added more icon & text states 
Now uses separate images for each state. Now tabletButtonProxy has 4 state properties, one for icon and images.

  * icon
  * hoverIcon
  * activeIcon
  * activeHoverIcon

  * text
  * hoverText
  * activeText
  * activeHoverText

Updated scripts to set new button states, if necessary.
 2017-02-13 15:09:46 -08:00
Atlante45
512bb4765f Add entity clicks capture capabilities 2017-02-13 11:34:30 -08:00
humbletim
831bf93500 * refactor ScriptCache per FIXMEs 
* include error details in BatchLoader results
* update EntityServerScript properties in edtior to reflect more granular statuses
* ScriptEngine plumbing in prep for require/module integration
 2017-02-11 04:47:31 -05:00
Seth Alves
fead52f626 put new-entity buttons in a tab of the edit app 2017-02-10 15:18:01 -08:00
Seth Alves
0b358a2ac7 finish hooking up new-model dialog 2017-02-10 13:29:06 -08:00
Seth Alves
3171ce1602 hook up more of new-model dialog 2017-02-10 12:03:26 -08:00
Seth Alves
7a63b07462 attempting to handle new-model dialog 2017-02-09 17:14:10 -08:00
Seth Alves
24fc9bbe67 honor HUDUIEnabled setting 2017-02-09 15:12:01 -08:00
Seth Alves
e12c77e576 move the edit tabs into tablet 2017-02-09 14:43:44 -08:00
Seth Alves
c4ac719d2c merge from upstream + cleanups 2017-02-09 14:26:29 -08:00
Seth Alves
4c3a6842a5 start on moving edit.js to tablet 2017-02-09 14:03:01 -08:00
Anthony J. Thibault
85e01e3922 tablet-ui: Added sortOrder property to buttons 
By default user created buttons will appear after system buttons.
 2017-02-02 17:18:22 -08:00
Seth Alves
6671324a33 fix the edit.js toolbar buttons so they don't vanish when moused-over or clicked 2017-02-01 16:29:12 -08:00
Seth Alves
c317ba8054 merge from upstream 2017-01-25 15:57:53 -08:00
Seth Alves
ff8d13ecc7 get button-states for toolbar buttons working again 2017-01-25 15:38:54 -08:00
Seth Alves
98f1664a46 use a setting to decide which UI is enabled 2017-01-25 14:17:45 -08:00
Atlante45
f540c94113 Merge branch 'master' of https://github.com/highfidelity/hifi into ess-pr 2017-01-25 13:06:49 -08:00
Seth Alves
f18094f565 make use of tablet or HUD depend on a single variable. avoid some duplicated code 2017-01-25 12:00:34 -08:00
Ryan Huffman
2bb7a7a4a6 Remove entity server script status log spam from edit.js 2017-01-25 09:32:25 -08:00
Dante Ruiz
c811839163 tablet is not selectable in edit mode 2017-01-25 16:46:17 +00:00
Dante Ruiz
bc75cf5bed removed tabs 2017-01-25 16:11:37 +00:00
Dante Ruiz
a147ce3f5f fixed load script issue 2017-01-25 08:00:41 -08:00
Seth Alves
3496e4cc7a Merge branch 'master' of github.com:highfidelity/hifi into tablet-ui 2017-01-23 16:50:41 -08:00
Atlante45
a1962e274d Fix rescale for 0.x values 2017-01-23 14:35:16 -08:00
Seth Alves
c958314918 merge from upstream 2017-01-23 13:52:01 -08:00
humbletim
15394056eb * add isInEditMode to utils.js 
* update grab.js to use the latest Settings edit mode detection approach
* add edit guards to handControllerGrab.js and grab.js
* update edit.js to consistently initialize Setting's edit flag
 2017-01-20 22:29:40 -05:00
Ryan Huffman
ad70431c26 Fix edit.js server script status getting reset when changing properties 2017-01-20 15:34:38 -08:00
Ryan Huffman
c015ac1bd5 Add display of server script status to edit.js 2017-01-19 13:27:44 -08:00
Ryan Huffman
71e039951c Add reload server scripts button to edit.js 2017-01-17 14:47:57 -08:00
Dante Ruiz
5ed8831bee all hud buttons on tablet 2016-12-21 23:25:40 +00:00
Dante Ruiz
8698ee61cd commit update 2016-12-20 15:39:17 -08:00
Dante Ruiz
bee6e230ae made requested changes 2016-12-20 18:28:07 +00:00
Dante Ruiz
fe4fa351d1 clean up 3 2016-12-20 16:04:18 +00:00
Dante Ruiz
74092d8714 removed commented code 2016-12-20 15:46:15 +00:00
Dante Ruiz
fc4b4f85f4 added button to menu 2016-12-20 00:24:45 +00:00
Dante Ruiz
c0e82d3e05 moving buttons to tablet 2016-12-19 13:43:49 -08:00
Dante Ruiz
348c0c95e5 conforming to coding standard and better variable naming 2016-12-01 22:22:17 +00:00
Dante Ruiz
a35f28725b fixed child not commit back when performing undo 2016-12-01 10:54:26 -08:00
Dante Ruiz
3c1d434449 fixed typo 2016-12-01 10:54:26 -08:00
Dante Ruiz
0c9cd5803a added descendant checking 2016-12-01 10:54:26 -08:00
Dante Ruiz
cb0e01bfa4 fixed child of parent not being added when performing an undo 2016-12-01 10:54:26 -08:00
Atlante45
cfd4294743 Turn Edit.js on when importing SVO 2016-11-18 11:31:12 -08:00
Ryan Huffman
55d4695489 Fix edit.js not allowing imports when you only have temp rez permissions 2016-10-13 11:51:54 -07:00
Seth Alves
785e187a27 edit.js uses notification.js to indicate errors instead of a modal dialog. in HMD, notification messages no longer jitter around 2016-09-21 11:39:25 -07:00
Ryan Downe Karpf
6c853ec77d Merge pull request #8538 from AndrewMeadows/workaround-resolvePath 
workaround for Script.resolvePath() bug
 2016-08-31 08:59:14 -07:00
Andrew Meadows
b50d24fb00 don't use Script.resolvePath() in local functions 2016-08-29 17:11:29 -07:00
James B. Pollack
cceae50b90 no more delete with backspace 2016-08-29 14:28:05 -07:00
James B. Pollack
53a2281918 better 2016-08-26 11:57:15 -07:00
James B. Pollack
f6bd04780d add a print to catch errors 2016-08-26 11:56:40 -07:00
James B. Pollack
4c63ad1ac8 code cleanup 2016-08-26 10:19:31 -07:00
James B. Pollack
ee190db5eb some comments 2016-08-25 16:27:58 -07:00
James B. Pollack
9be073cc12 handle some more cases 2016-08-25 16:03:12 -07:00
Andrew Meadows
6f6a7bcc44 wrap default scripts with local scope 2016-08-25 08:57:06 -07:00
James B. Pollack
45e3f926a1 removed unused prints and cleanup 2016-08-24 14:19:27 -07:00
James B. Pollack
2f4617cd5e quiet some prints 2016-08-23 18:20:33 -07:00
James B. Pollack
a5054487ba save on no selections, select another entity, etc 2016-08-23 18:18:43 -07:00
James B. Pollack
0810ad0e7b use square of sides 2016-08-16 18:13:42 -07:00
James B. Pollack
e9c2a1d509 cleanup prints 2016-08-16 18:03:34 -07:00
James B. Pollack
06787029b7 small 2016-08-16 17:58:35 -07:00
James B. Pollack
1632f4cb3d better create locations 2016-08-16 10:52:05 -07:00
James B. Pollack
cd10b2b62e open asset browser with a button 2016-08-12 15:49:36 -07:00
James B. Pollack
1366dabc3a yay 2016-08-12 14:24:29 -07:00
Zander Otavka
8976f18290 Change 3.14 literal to Math.PI 2016-07-21 18:36:58 -07:00
Zander Otavka
d75c2e2a6f Merge branch 'master' into edit-model-ui 2016-07-18 13:11:51 -07:00
Zander Otavka
492f7e0c29 Add gravity to dynamic model entities 2016-07-18 12:43:14 -07:00
Zander Otavka
06985f9278 Make combo box go by index, add default values 2016-07-18 12:06:11 -07:00
Zander Otavka
6c47db016f Remove some debug logging 2016-07-15 17:43:37 -07:00
Zander Otavka
6417bb1859 Require tripple equals over double, fix in edit.js 2016-07-15 17:33:47 -07:00
Zander Otavka
ded82294f9 Bring edit.js up to the coding standard 
There were some serious bad practices going on there, I fixed them.
There are still a few, but they are minimized.
 2016-07-15 17:31:41 -07:00
Brad Davis
9ebc0c28c8 Fix hover states for toolbar buttons 2016-07-15 17:12:49 -07:00
Brad Davis
d084623662 PR feedback 2016-07-15 12:15:23 -07:00
Brad Davis
a6d71f508e Fix edit toolbar button vanishing, persistent edit button 2016-07-14 17:40:04 -07:00
Brad Davis
1adf96c8df Move edit.js to new toolbar API 2016-07-14 17:40:03 -07:00
howard-stearns
9495d93a72 Merge branch 'master' of https://github.com/highfidelity/hifi into basic-hand-controller-edit 2016-07-06 15:06:51 -07:00
howard-stearns
b8e6572ebf basic hand-controller editing 2016-07-05 17:00:54 -07:00
howard-stearns
f03f5f3e68 new icons 2016-06-30 16:47:10 -07:00
Seth Alves
03b55e6a64 Merge branch 'master' of github.com:highfidelity/hifi into tmp-rez-cap-rather-than-reject 2016-06-23 10:33:31 -07:00
howard-stearns
67f76db7e4 Merge branch 'master' of https://github.com/highfidelity/hifi into vive-ui 2016-06-22 15:58:53 -07:00
Ryan Huffman
1be30ccce9 Fix enabled_edit firing on disable 2016-06-22 08:24:50 -07:00
Seth Alves
9ca27f267d cap lifetime rather than reject edits from nodes which only have tmp-rez rights 2016-06-21 16:48:04 -07:00
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
Bradley Austin Davis
71bf9384ce Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-15 10:45:51 -07:00
Brad Davis
0ddee876c3 Merge remote-tracking branch 'upstream/master' into vive-ui 2016-06-13 13:03:46 -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
f8353fb082 New button content and initial positions. 2016-06-08 11:11:18 -07: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)