David Rowe
b74f42dc23
Merge branch 'master' into 21863
2018-05-17 07:44:39 +12:00
Dante Ruiz
82422edb59
fixinig the controller settings page and have menu option on by default
2018-05-14 18:51:39 -07:00
Zach Fox
fd4530e671
MS3128: Remove vestigal Edit menu item
2018-05-07 14:39:31 -07:00
David Rowe
8fd972fce9
Don't disable lasering on particle or light entity icon when is selected
2018-05-06 20:23:49 +12:00
RebeccaStankus
7a7474baca
moved checkEditPermissionsAndUpdate function to higher scope
2018-05-03 13:34:55 -07:00
David Rowe
f27e363b68
Remove entity from list when it deletes; handle multiple deletions
2018-05-02 15:23:13 +12:00
David Rowe
5a064d3499
Remove selection handles and list highlight when entity deletes
2018-05-02 14:13:15 +12:00
Liv Erickson
7db07db9e2
remove menu item at cleanup
2018-04-30 13:55:01 -07:00
John Conklin II
5ef90b242e
Merge pull request #12925 from thoys/fix/create-errorOnShutdown
...
Create app: Save light selection menu option properly
2018-04-19 10:16:40 -07:00
John Conklin II
eedc8a8c0a
Merge pull request #12929 from misslivirose/fix/misc-edit-bugs
...
Fix edit icon behavior
2018-04-18 13:46:38 -07:00
Liv Erickson
e795af03dd
move function out of global scope
2018-04-18 09:56:39 -07:00
Liv Erickson
2a055429cd
handle edit changes
2018-04-17 17:31:16 -07:00
Liv Erickson
e35efccfa3
make icon slightly more robust
2018-04-17 17:11:37 -07:00
Liv Erickson
6c1872caba
remove old dependency on domain changed message to fix issue with edit icon not handling domain changes
2018-04-17 16:38:29 -07:00
Liv Erickson
abe8a3e6d9
correct implementation that doesn't interfere with other app status
2018-04-17 15:41:03 -07:00
Liv
071396bed0
move logic for disconnecting out of initalize() and into setActive()
2018-04-17 15:40:59 -07:00
Liv
7a7438b648
space for synxtax
2018-04-17 15:40:57 -07:00
Liv
7f01dded79
add handler to refused domain change connections
2018-04-17 15:40:55 -07:00
Liv
6f020a7ec8
return tablet to home on change domain
2018-04-17 15:40:54 -07:00
Thijs Wenker
e6f0bfbf4c
get proper checkbox value from the allow light selection menu option
2018-04-18 00:10:49 +02:00
John Conklin II
98f6899c3d
Merge pull request #12839 from SamGondelman/matMigrate
...
Migrate materials from userData to materialData
2018-04-12 18:24:33 -07:00
Liv
c7be6e0934
Update edit.js
...
remove the unneeded manual removal of the create setting - it's handled with the rest of the menu items now, and this was causing it to default to false every start..
tested locally but might have gotten in a weird state, so fixing in GH editor.
2018-04-10 12:15:57 -07:00
SamGondelman
9b07880aab
migrate materials from userData to materialData
2018-04-09 12:49:03 -07:00
Livi Erickson
799963a009
fix syntax based on CR feedback
2018-03-30 13:50:46 -07:00
Liv Erickson
810930ff23
handle correct first time settings
2018-03-30 13:50:46 -07:00
Liv Erickson
ec0874be1a
fix for edit preferences not persisting
2018-03-30 13:50:46 -07:00
Clément Brisset
feec59655c
Merge pull request #12692 from highfidelity/stable
...
Merge stable back into master
2018-03-22 15:08:30 -07:00
David Back
3f2a49d243
fix list of tablet IDs ray cast checks in edit.js
2018-03-17 10:59:18 -07:00
John Conklin II
1e1836c009
Merge pull request #12502 from elisa-lj11/2dimages-update
...
Image entity has correct orientation and is collisionless
2018-03-01 09:57:08 -08:00
Elisa Lupin-Jimenez
b56c78d36c
image has correct orientation and is collisionless
2018-02-26 14:44:46 -08:00
Liv Erickson
269d8312e2
wrap selection print in wantDebug to avoid spamming logs in HMD
2018-02-22 13:03:16 -08:00
Seth Alves
c534e3a6e4
Merge pull request #12356 from ctrlaltdavid/21742
...
Handle tablet entities and overlays not being available
2018-02-22 08:48:13 -08:00
SamGondelman
324eefc914
remove fresnel, add unlit, fix overlays, cleanup
2018-02-14 17:02:07 -08:00
SamGondelman
4500ed17e7
merge from master
2018-02-13 13:58:39 -08:00
Elisa Lupin-Jimenez
a61021f46c
Merge pull request #12272 from elisa-lj11/2d-images
...
2d images (JPG and PNG) are now supported as (quasi) entities
2018-02-13 11:44:02 -08:00
David Rowe
b1f49be790
Merge branch 'master' into 21742
...
# Conflicts:
# scripts/system/libraries/entitySelectionTool.js
2018-02-13 10:04:32 +13:00
SamGondelman
84cd0e1529
wip live material swapping on model entities, model overlays, avatars,
...
and albedo swap on shape entities
2018-02-09 12:00:08 -08:00
David Rowe
adb6f66a05
Handle tablet entities and overlays not being available
2018-02-08 09:51:48 +13:00
SamGondelman
4d4294dd6a
Merge remote-tracking branch 'upstream/master' into decals
2018-02-02 16:50:01 -08:00
SamGondelman
d7f4b033e8
wip finish adding material entity
2018-02-02 16:49:33 -08:00
Elisa Lupin-Jimenez
e2bf8ad231
reverted to S3 for model URL
2018-02-02 15:36:28 -08:00
Elisa Lupin-Jimenez
d20ff0955c
qml doesn't work, .js might not work on osx
2018-02-02 11:26:21 -08:00
Elisa Lupin-Jimenez
73fde4333e
new local reference to image model
2018-02-02 10:27:44 -08:00
Elisa Lupin-Jimenez
d7a847930d
added image icon
2018-02-02 10:27:44 -08:00
Elisa Lupin-Jimenez
f71d9e4d6a
snapshot referenced locally, won't work on OS
2018-02-02 10:27:44 -08:00
Elisa Lupin-Jimenez
bd7204e6ef
image entity now has grabbable and dynamic options
2018-02-02 10:27:42 -08:00
Elisa Lupin-Jimenez
d390e20139
removed extraneous commenting and image class
2018-02-02 10:27:42 -08:00
Elisa Lupin-Jimenez
42151b8fd4
creating new image entity opens image property options
2018-02-02 10:14:27 -08:00
Elisa Lupin-Jimenez
308e481e63
switch to image property list not working
2018-02-02 10:11:37 -08:00
Elisa Lupin-Jimenez
ceb621a521
reverted protocol change for images
2018-02-02 10:08:40 -08:00
Elisa Lupin-Jimenez
dc5f29aa58
entity item properties hooked up for image
2018-02-02 10:08:40 -08:00
Elisa Lupin-Jimenez
fc0e87d5ea
more infrastructure links
2018-02-02 10:08:39 -08:00
Elisa Lupin-Jimenez
fdca8ab93e
added image button to edit.js, working on connecting to cpp
2018-02-02 10:08:39 -08:00
David Back
db56246cd6
more fixes, clean up, updates
2018-02-01 17:30:56 -08:00
David Back
09bcee7c2e
Merge branch 'master' of https://github.com/highfidelity/hifi into newEditGrab
2018-01-31 11:03:11 -08:00
Atlante45
bc819c698e
Merge branch 'stable' of https://github.com/highfidelity/hifi into merge-back
2018-01-30 16:09:30 -08:00
David Back
3bbe821aba
Merge branch 'master' of https://github.com/highfidelity/hifi into newEditGrab
2018-01-30 14:08:27 -08:00
Liv Erickson
3aa12eb7df
pass in deletedIDs so can delete children depth > 1
2018-01-29 17:51:26 -08:00
Dante Ruiz
08511a2a2e
fix new model path
2018-01-29 15:27:55 -08:00
David Back
c722b4b04d
Merge branch 'master' of https://github.com/highfidelity/hifi into newEditGrab
2018-01-19 18:20:49 -08:00
David Back
c4359de859
entity edit tools wip update
2018-01-19 18:20:36 -08:00
David Rowe
85bda1da8e
Add Window browseChanged signal as replacement for openFileChanged
2018-01-17 09:57:20 +13:00
Nissim Hadar
e94982a470
Merge branch 'master' of https://github.com/highfidelity/hifi into keylightInheritance
2018-01-09 10:10:27 -08:00
Liv Erickson
d1e176ee9d
Update menu to reflect non-grabbable entity types, include particles
2018-01-08 11:31:09 -08:00
Liv Erickson
4e582975b6
cleanup
2018-01-05 18:03:20 -08:00
Liv Erickson
f563b8ca2e
Make zones and lights not default grabbable
2018-01-05 17:49:43 -08:00
Nissim Hadar
87e896ab20
Zone inheritance ready for testing.
2017-12-29 15:13:46 -08:00
Nissim Hadar
8bb4d1431c
WIP - copy skylight URL to ambient URL.
2017-12-28 09:35:40 -08:00
Brad Davis
2fcf11455b
Fixing edit state detection
2017-12-18 14:03:13 -08:00
Zach Fox
b2bafed2bb
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-12-07 11:21:24 -08:00
Alexander Ivash
da06b2656f
7991 Change Instances of Edit Mode to Create Mode
2017-11-27 22:47:42 +03:00
Brad Hefta-Gaub
1de6ecec30
Merge pull request #11830 from ElderOrb/FB8244
...
8244 Rename captionColorOverride to captionColor
2017-11-18 14:28:32 -08:00
Zach Fox
7d34b3fe67
Merge branch 'master' of https://github.com/highfidelity/hifi into commerce_QmlWhitelist
2017-11-17 15:45:03 -08:00
Alexander Ivash
c5d2f598d7
8244 Rename captionColorOverride to captionColor
2017-11-16 15:46:49 +03:00
Brad Davis
bb2e061d77
Fixing global declarations in JS
2017-11-15 12:00:52 -08:00
Brad Davis
1167be4102
Reverting tablet API rename, cleaning up duplicated code
2017-11-15 11:52:55 -08:00
Brad Davis
7bf1b176d7
Renaming Tablet API to Tablets, supporting dev-mode QML loading from filesystem
2017-11-10 14:21:24 -08:00
Brad Davis
92a3c209aa
Merge remote-tracking branch 'upstream/master' into feature/qml_whitelist_tablet
2017-11-10 11:44:29 -08:00
David Rowe
ad661cb345
Don't remove entities from list when try to delete locked entity
2017-11-10 10:50:07 +13:00
Clément Brisset
40baca6ee1
Merge pull request #11756 from ctrlaltdavid/21592
...
Fix import from URL adding multiple copies of imported entities
2017-11-08 18:01:48 -08:00
David Rowe
fadbf09cdd
Avoid potentially slow entity list refresh upon deleting entities
2017-11-07 18:10:10 +13:00
David Rowe
b272b2e6c8
Fix import from URL adding multiple copies of imported entities
2017-11-07 11:28:35 +13:00
Brad Davis
d162e1cff6
Whitelist functionality for tablet apps
2017-11-04 15:14:06 -07:00
Zach Fox
5ab737f66d
Merge pull request #11658 from zfox23/pop_dynamicTestsMaster
...
Commerce: Owner Verification for Certified Entities
2017-10-27 12:28:04 -07:00
Zach Fox
8cb60fc62c
Small edit.js changes
2017-10-26 16:44:21 -07:00
Zach Fox
7998984d8e
Missed tons of spots!
2017-10-24 14:30:47 -07:00
Zach Fox
9537e19ad4
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster
2017-10-19 10:58:55 -07:00
Melissa Brown
1a3821e984
Merge pull request #11591 from ctrlaltdavid/21568
...
Add some Quat and Uuid JavaScript helper properties
2017-10-18 22:07:06 -07:00
Zach Fox
3f0b08aea8
Merge branch 'master' of https://github.com/highfidelity/hifi into pop_dynamicTestsMaster
2017-10-18 10:37:47 -07:00
David Rowe
5b6d33bcb2
Missing semicolon
2017-10-18 20:29:34 +13:00
David Rowe
f74c33f597
Fix importing entities from URL
2017-10-18 17:44:36 +13:00
Zach Fox
f3b641a833
Edit.js caused a testing fail :(
2017-10-17 11:30:15 -07:00
David Rowe
fc4e440dc4
Update system scripts to use new properties
2017-10-14 08:32:14 +13:00
David Rowe
105457b388
Don't unbusubscribe from possibly shared channel
2017-10-06 13:27:08 +13:00
David Rowe
75365847a1
Merge branch 'master' into vr-edit-a
2017-09-30 09:30:38 +13:00
Thijs Wenker
cabd68a63a
Every time a dialog opened in edit.js a new callback is created, which wasn't disconnected after the event happened, this caused lots of entities to be created after each next import.
2017-09-28 16:03:09 -07:00
David Rowe
30c4a22441
Merge branch 'master' into vr-edit-a
2017-09-28 16:10:26 +13:00
druiz17
38096b48d9
fixing entitySelectionTool
2017-09-27 10:52:56 -07:00
David Rowe
6b3b2beae0
Merge branch 'master' into vr-edit-a
2017-09-27 15:34:52 +13:00
Seth Alves
913d3c4d12
Merge pull request #11422 from hyperlogic/feature/ant-man2
...
Secondary IPD fixes
2017-09-26 11:53:45 -07:00
vladest
c17ca955db
Listener disconnects in C++ now
2017-09-20 20:03:53 +02:00
Daniela
8144841258
Add Edit.js Entities spawn up according to the orientation of the avatar.
2017-09-20 09:21:16 -07:00
David Rowe
c56fda88fa
Merge branch 'master' into vr-edit-a
2017-09-19 16:17:04 +12:00
vladest
5585265349
Merge branch 'master' into modal_dialogs_async
2017-09-16 22:06:49 +02:00
vladest
de4f34aacb
Add resizable flag. Use the flag for Create only
2017-09-15 21:49:38 +02:00
vladest
681fc529dc
Merge branch 'master' into modal_dialogs_async
2017-09-01 13:31:15 +02:00
David Rowe
269f1769be
Merge branch 'master' into vr-edit-a
2017-09-01 14:45:59 +12:00
beholder
180acbc188
6819 - Create button not disabled
2017-08-29 23:49:44 +03:00
vladest
38295ab73f
Merge conflicts
2017-08-28 16:58:30 +02:00
David Rowe
cddb054066
Merge branch 'master' into vr-edit-h
...
# Conflicts:
# libraries/display-plugins/src/display-plugins/hmd/HmdDisplayPlugin.cpp
# scripts/system/controllers/handControllerGrab.js
2017-08-20 18:41:29 +12:00
vladest
15f8bc0141
Keep old function names for compatibility
2017-08-16 22:17:34 +02:00
vladest
4e5c650621
Modified some usecases for async dialogs
2017-08-16 21:41:18 +02:00
vladest
273261ee57
Reworked WindowScriptingInterface browse method for async methods
2017-08-15 23:12:35 +02:00
vladest
8afdb27c1b
Reworked WindowScriptingInterface save method for async methods
2017-08-15 22:55:44 +02:00
SamGondelman
1c27335193
a couple logging fixes
2017-08-14 17:34:32 -07:00
David Rowe
5d1732c5aa
Merge branch 'master' into vr-edit-a
2017-08-05 20:45:12 +12:00
Howard Stearns
71ce5a6494
Merge pull request #11016 from highfidelity/context-overlays
...
Context Overlays
2017-08-03 16:28:14 -07:00
David Rowe
e2dccc1420
Merge branch 'master' into vr-edit-a
2017-08-04 07:33:18 +12:00
vladest
2d4396ac8e
Merge branch 'master' into fix_toolbar_apps_switch
2017-08-02 16:34:49 +02:00
vladest
4330e31212
Toolbar mode: 1. Fixed switching between different apps. 2. Fixed switching from Create
2017-08-02 16:32:09 +02:00
David Kelly
bd7c4b3b26
Merge remote-tracking branch 'upstream/master' into context-overlays
2017-07-31 13:14:53 -07:00
Menithal
6020154867
Removed some whitespaces to trigger new build
2017-07-31 22:49:11 +03:00
Matti Lahtinen
5fab6c37a3
Removed stray variable test
2017-07-31 08:56:04 +03:00
Menithal
734330dc06
Fixed Particle Editor Update event
...
Particle Editor was agressively refreshing when ever a particle was be
ing up dated
Added a flag check to make sure the particle was always using the latest
version
2017-07-29 15:48:31 +03:00
David Rowe
52bb4a0f77
Merge branch 'master' into vr-edit-a
2017-07-27 20:37:46 +12:00
Chris Collins
ef67029837
Merge pull request #10912 from amvmoody/21374
...
WL 21374: Allow lights/particles to be dragged by icon
2017-07-26 22:07:36 -07:00
utkarshgautamnyu
71ddf1e7c1
Removed Compound Collision type
2017-07-26 10:20:17 -07:00
utkarshgautamnyu
65192aa620
added additional collision types to asset browser and new model dialog
2017-07-25 17:12:13 -07:00
Mike Moody
a4585b9400
Merge branch 'master' of git://github.com/highfidelity/hifi into 21374
2017-07-24 13:31:27 -07:00
David Kelly
b7be727b4c
turn off ContextOverlay for pal, edit. Improve clicks too
2017-07-20 11:30:55 -07:00
Mike Moody
c56450b986
Moved function to a differnt location that handles both mouse and controller inputs.
2017-07-19 01:49:39 -07:00
David Rowe
787815e939
Merge branch 'master' into vr-edit-a
2017-07-18 20:53:48 +12:00
Andrew Meadows
9584035aa4
Merge pull request #10886 from 1P-Cusack/21420
...
[Worklist #21420 ] Implement Create button disabled state (details below).
2017-07-14 10:06:45 -07:00
LaShonda Hopper
3ee9d8b766
[Worklist #21420 ] Ran lint on edit script (details below).
...
Prior to and after addressing Worklist Item #21420 , it was observed that the
tool bar buttons popping in and out during load. Taking a while to become visible.
Ran JSHint on the edit.js script to see if something stood out.
Testing with the various lint fixes the odd loading behavior wasn't observed locally any longer.
Pushing this up for testing. This may be what @CainFoool was seeing regarding the create button
not appearing when testing a different PR as at times it took quite some time for the buttons
to load properly.
JSHint Issues Addressed:
* Resolved instance of \"Use the function form of \"use strict\"\"
** Moved use strict declaration to the file function level.
** This fixed various unknown or not defined errors.
* Resolved instances of \"\'const\' is available in ES6 (use 'esversion: 6') or Mozilla JS extensions (use moz).\"
** Switched const to var to avoid using keywords respected by only a subset of browsers.
* Resolved various multiply defined vars.
** Notable callouts being position var and properties var.
** This should fix issues where the same var was being used though the intent of use may have varied.
* Resolved instances of missing semi-colons
PreFix: 51 JSHint issues detected
PostFix: 0 JSHint issues detected.
Changes to be committed:
modified: scripts/system/edit.js
2017-07-10 12:23:28 -04:00
Mike Moody
53f581c3d4
Fixed Icons not being selectable while not highlighted.
2017-07-08 02:52:27 -07:00
David Rowe
a447e07ba5
Merge branch 'master' into vr-edit-a
2017-07-08 12:33:55 +12:00
Mike Moody
be68d99bed
added ability to drag ParticleEffects and Light Entities around via Overlay Icon.
2017-07-06 23:17:23 -07:00
LaShonda Hopper
85111131da
[Worklist #21420 ] Resolves issue where domain changes didn't refresh the icon (details below).
...
* Adds a local message/event: "Toolbar-DomainChanged"
** This message is sent by the application via its registered domain handlers:
*** hostnameChanged
*** connectedToDomain
*** disconnectedFromDomain
* edit.js subscribes to the "Toolbar-DomainChanged" event and updates the Create
button icon as long as there's a valid known valid create button.
Item Ticket Link: https://worklist.net/21420
Changes to be committed:
modified: interface/src/Application.cpp
modified: scripts/system/edit.js
2017-07-06 15:27:15 -04:00
LaShonda Hopper
9cae868492
[Worklist #21420 ] Implement Create button disabled state (details below).
...
* The create button icon is set to its disabled resource when the user
enters a domain where they have _neither_ Rez or TempRez permissions.
** If the user has either of the Rez permission levels then the normal edit-i.svg
icon is used and the user is able to create items as before.
* When the user clicks the button in this state, the INSUFFICIENT_PERMISSIONS_ERROR_MSG
is shown and creation menu is not shown.
* The disabled icon, edit-disabled.svg, is based on the edit-i.svg and is set to 33% opacity.
Item Ticket Link: https://worklist.net/21420
Changes to be committed:
new file: interface/resources/icons/tablet-icons/edit-disabled.svg
modified: scripts/system/edit.js
2017-07-06 10:53:46 -04:00
Mohammed Nafees
eb354a4333
Cleanup menu shortcut keys
2017-07-05 14:50:48 +05:30
David Rowe
a863e37eb5
Communicate VR edit enabled state to hand controller script
2017-06-30 12:11:06 +12:00
David Rowe
513e0cd232
Fix import of JSON with parent-child relationships
2017-06-20 16:44:25 +12:00
Anthony Thibault
0d46b78bff
Merge pull request #10541 from Menithal/21324
...
Reworked Particle Editor UI
2017-06-13 13:00:54 -07:00
Menithal
c2c1e607c0
Formating
2017-06-13 20:31:41 +03:00
Menithal
00701eb5c7
Merge remote-tracking branch 'origin/master' into 21324
2017-06-13 19:08:37 +03:00
Vladyslav Stelmakhovskyi
b7f8cc7f0b
Fix intendantion
2017-06-08 22:58:40 +02:00
Vladyslav Stelmakhovskyi
dc2c79baab
Merge with master
2017-06-08 21:10:30 +02:00
Seth Alves
dcbd279bd8
Merge pull request #10589 from vladest/create_in_landscape
...
Implements landscape mode for tablet as rotation instead of stretching [DO NOT MERGE]
2017-06-05 12:46:03 -07:00
Menithal
4842de8f07
Fixed issue with orientation
2017-06-04 00:03:14 +03:00
Vladyslav Stelmakhovskyi
4dbe646c17
Set ective button property isActive before Home menu redraw. Makes sure redraw will read proper value of isActive property
2017-06-03 15:40:25 +02:00
