Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-27 13:36:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
73770 commits 71 branches 56 tags 1.2 GiB
Commit graph

417 commits

Author SHA1 Message Date
Thijs Wenker
221dfb8979 typo fix 2018-08-11 05:46:48 +02:00
Thijs Wenker
a20be5b50d remove rotation for newly created entities 2018-08-11 02:28:01 +02:00
Thijs Wenker
876079bb81 deactivate Create App when desktop windows are closed 2018-08-11 00:41:50 +02:00
David Back
d88615219c CR changes 2018-08-07 10:19:48 -07:00
David Back
f9e25d36e7 use wrapper emitScriptEvent, change to Fetching 2018-08-06 17:52:27 -07:00
David Back
e5abd9d57d fix server script status event, use [ Getting status ] 2018-08-06 17:03:32 -07:00
John Conklin II
f02e91806c
Merge pull request #13686 from huffman/fix/undo-create-entity 
Fix added entities not being undoable in Create
 2018-08-01 13:11:17 -07:00
Ryan Huffman
6369cee0d1 Fix added entities not being undoable in Create 2018-08-01 09:40:29 -07:00
David Back
e8068fea0a block selecting overlays with other hand 2018-07-31 17:18:35 -07:00
Ryan Huffman
0e0966004c Fix edit.js not being able to delete after creating entity 
This fix puts focus back on the main window when creating an entity so that the user can use shortcuts like 'f' and 'delete'
 2018-07-25 14:52:56 -07:00
Qliemillar
3466d944fb
Merge pull request #13630 from huffman/fix/create-undo-while-disabled-visual 
Disable showing the entity edit tools when undoing while disabled
 2018-07-19 09:03:40 -06:00
Thijs Wenker
b29044fd7e
Merge pull request #13618 from dback2/clickHandleSwitchEntityFix 
Fix quickly clicking an edit handle causing selected entity change
 2018-07-18 22:49:11 +02:00
Ryan Huffman
b015845371 Disable showing the entity edit tools when undoing while disabled 2018-07-18 11:54:40 -07:00
Thijs Wenker
09e1090e72 Use create app in tablet mode when choosing to use tablet in desktop mode 2018-07-17 17:33:13 +02:00
Qliemillar
511b297be5
Merge pull request #13597 from dback2/entityListDeleteSpamFix 
Fix entity list refresh when entity deleted
 2018-07-16 09:49:25 -06:00
David Back
46a9521939 fix selecting an edit handle causing selected entity change 2018-07-13 17:40:24 -07:00
unknown
acae4df3c3 fix align to selection to grid 2018-07-12 19:23:06 -07:00
unknown
306a77c039 fix delete event 2018-07-12 12:46:18 -07:00
John Conklin II
25406fa464
Merge pull request #13495 from thoys/feat/create/native-windows 
Create App: Native windows
 2018-07-09 14:25:13 -07:00
Thijs Wenker
b1884b0841 CR fixes 2018-07-09 16:38:53 +02:00
Thijs Wenker
eea95161ab Merge branch 'master' of github.com:highfidelity/hifi into feat/create/native-windows 2018-07-06 20:06:50 +02:00
Thijs Wenker
42afd31325 default window width fixes 2018-07-06 19:48:35 +02:00
David Back
4763ccf1ec Merge branch 'master' of https://github.com/highfidelity/hifi into deselectInput 2018-07-05 14:53:21 -07:00
Thijs Wenker
574bfd177d Create app (desktop mode): 
- Fix insta-close on switching from other app to create app.
- Fix new model and particle dialogs.
 2018-07-05 17:57:00 +02:00
David Back
986864fc53 ctrl D for deselect 2018-07-03 15:09:11 -07:00
Thijs Wenker
d5fb094d8a enable Desktop.CLOSE_BUTTON_HIDES flag for create app native windows 2018-07-03 18:49:23 +02:00
Thijs Wenker
c583c07d9c Merge branch 'feat/create/interactive-window' into feat/create/native-windows 
# Conflicts:
#	scripts/system/libraries/entityList.js
#	scripts/system/particle_explorer/particleExplorerTool.js
 2018-07-03 18:47:38 +02:00
Thijs Wenker
7ed03c2f77 - native window presentation mode update 
- de-activate create on displayMode change.
 2018-07-03 17:26:18 +02:00
David Back
e1de226aae change toggle input to t 2018-07-02 11:11:02 -07:00
Thijs Wenker
7fe9365a76 create app - native windows 2018-06-28 19:12:03 +02:00
David Back
2cdda23169 more robustness for optional properties 2018-06-27 13:05:39 -07:00
John Conklin II
a38859e4da
Merge pull request #13397 from ctrlaltdavid/21893 
Fix Create app selection updating when entities are deleted
 2018-06-26 17:06:43 -07:00
David Back
09ccd3acf0 fix multi-selection color setting visible/locked to false 2018-06-22 18:13:40 -07:00
David Rowe
064f4ca204 Remove deleted entities from list without scrolling to top 2018-06-19 16:22:59 +12:00
David Rowe
5de451e8e0 Update entity list upon entity deletion 2018-06-19 14:52:49 +12:00
David Rowe
e8154b5df1 Fix Create app selection updating when entities are deleted 2018-06-17 08:35:45 +12:00
David Rowe
8c9bdf51a7 Remove superfluous variable 2018-05-30 17:16:08 +12:00
David Rowe
03cec8cb54 Fix properties not populating particle explorer tab 2018-05-30 17:15:33 +12:00
Dante Ruiz
249d22b4b4 Merge branch 'master' of github.com:highfidelity/hifi into menu-updates 2018-05-21 10:31:24 -07:00
Liv
0927cadf10
Merge pull request #13093 from RebeccaStankus/edit-bug-14671 
moved checkEditPermissionsAndUpdate function to higher scope
 2018-05-18 16:44:53 -07:00
RebeccaStankus
27638b9ced Removing duplicate function 2018-05-18 09:20:03 -07:00
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