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

454 commits

Author SHA1 Message Date
Thijs Wenker
92888e9d3e tooltip CR changes 2018-10-31 18:26:23 +01:00
Thijs Wenker
83051940a8 Fix QA feedback 2018-10-25 02:46:15 +02:00
Thijs Wenker
a3b874f9aa property tooltips 2018-10-25 02:46:14 +02:00
David Back
b3e0d51260 Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor 2018-10-24 11:48:56 -07:00
Ryan Huffman
6221b9ee59
Merge pull request #14149 from thoys/feat/create/entityList-autoScroll 
MS19054: [CreateApp/EntityList] auto scroll
 2018-10-24 10:36:21 -07:00
Brad Hefta-Gaub
f8e38e98e1
Merge pull request #14214 from huffman/feat/edit-defaults 
Update default entity properties in Create
 2018-10-24 10:00:46 -07:00
Thijs Wenker
776b8b8fc7 CR and style fixes 2018-10-24 17:58:06 +02:00
unknown
c7ba386be1 darn prints somehow slipping past me 2018-10-23 20:56:53 -07:00
David Back
2b9dcd0875 fix particle properties and keylight direction, remove columns, fix orderings, fix sliders 2018-10-23 18:38:05 -07:00
David Back
9df8ea35bb Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor 2018-10-23 13:28:35 -07:00
Ryan Huffman
d7dce456b2 Fix incorrect default entity properties in Create 2018-10-22 18:29:27 -07:00
David Back
e8bda1793f Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor 2018-10-22 15:12:45 -07:00
Ryan Huffman
573df2d922 Move copy/paste/cut to SelectionManager 2018-10-22 13:56:08 -07:00
Ryan Huffman
e0851c4807 Add cut to Create, and update shortcuts 2018-10-22 13:56:08 -07:00
Ryan Huffman
65fdd16d90 Cleanup copy/paste changes 2018-10-22 13:56:07 -07:00
Ryan Huffman
9cc2add4a0 Add copy/paste functionality to edit.js 2018-10-22 13:56:07 -07:00
Ryan Huffman
9d13902cd3 Improve paramater names in model dialog window 2018-10-20 11:26:12 -07:00
Ryan Huffman
f1258e4445 Add a 'grabbable' option to the new-model dialog 2018-10-19 16:42:45 -07:00
John Conklin II
37dce01dcb
Merge pull request #14099 from humbletim/fb18305-grabbable-menu-fix 
More reliable "Create Entities as Grabbable" settings persistence.
 2018-10-18 18:26:48 -07:00
Ryan Huffman
a4adf2c716
Fix name of Particles to ParticleEffect for default properties in edit.js 2018-10-18 17:39:24 -07:00
David Back
6b5e616d2a
Merge branch 'master' into entityPropertiesRefactor 2018-10-17 20:01:15 -07:00
David Back
50becb5c37 merge particle explorer into properties, resurrect sliders, other tidying/fixes 2018-10-16 12:39:34 -07:00
Ryan Huffman
738ac30f1d Update default entity properties in Create 2018-10-15 13:42:10 -07:00
Seth Alves
834699fa12 Move grab pseudo-properties (userData) into first-class EntityItemProperties. 2018-10-02 08:54:12 -07:00
Brad Hefta-Gaub
7c9464572a
Merge pull request #14027 from huffman/feat/deprecate-undo-stack 
Remove UndoStack API
 2018-10-01 17:13:48 -07:00
humbletim
025bc19d62 save "Create Grabbable" in menuItemEvent, not scriptEnding 2018-09-27 17:08:49 -04:00
Ryan Huffman
09b2565e76 Remove UndoStack API 
edit.js shares a global undo stack through the UndoStack API. Because
the stack is globally shared, disabling the feature while create is
disabled doesn't make a lot of sense because it might disabling the
ability to undo/redo with another feature. Because UndoStack is only
used by edit.js, UndoStack is being removed in favor of a local undo
stack implemented within edit.js.
 2018-09-26 14:43:11 -07:00
Ryan Huffman
8805ce49e3 Remove verbose logging of keyboard messages in edit.js and gridTool.js 2018-09-19 15:06:58 -07:00
David Back
3da442a8f9 allow highlights in hmd, fix center scale hmd math 2018-09-12 14:44:04 -07:00
Thijs Wenker
dd6801219b Create entities from avatar a bit lower to be able to transform them away from the user easier 2018-09-07 19:54:26 +02:00
David Back
0e53fa3f8b only focus with selection 2018-08-29 12:05:46 -07:00
David Back
dcf2074d7e remove [ camera key, allow F to enter camera without selection 2018-08-29 11:56:37 -07:00
David Back
511478a563 use not Mac instead of Windows 2018-08-27 18:11:19 -07:00
David Back
f81fe6b29f add more inputs to controller mapping 2018-08-27 16:35:36 -07:00
David Back
b6edb2c9d6 platform states, edit controller mapping, separate mac/win delete 2018-08-27 14:53:13 -07:00
Ryan Huffman
ead0126365
Merge pull request #13815 from thoys/fix/create/createZeroRotationEntities 
MS17562: CreateApp - newly created Entity rotation should be zero
 2018-08-20 09:07:38 -07:00
Ryan Huffman
2f833f16d8 Force entity list tool to refresh when opened 2018-08-15 14:19:20 -07:00
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