Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reorganize extensions categories. #4345

Merged
merged 1 commit into from
Oct 4, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Core/GDCore/Extensions/Builtin/CameraExtension.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(
"object or a position.",
"Florian Rival",
"Open source (MIT License)")
.SetCategory("Camera")
.SetExtensionHelpPath("/interface/scene-editor/layers-and-cameras");
extension.AddInstructionOrExpressionGroupMetadata(_("Layers and cameras"))
.SetIcon("res/conditions/camera24.png");
Expand Down
2 changes: 1 addition & 1 deletion Core/GDCore/Extensions/Builtin/FileExtension.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(
"Florian Rival",
"Open source (MIT License)")
.SetExtensionHelpPath("/all-features/storage")
.SetCategory("Device");
.SetCategory("Advanced");
extension.AddInstructionOrExpressionGroupMetadata(_("Storage"))
.SetIcon("res/conditions/fichier24.png");

Expand Down
1 change: 1 addition & 0 deletions Core/GDCore/Extensions/Builtin/WindowExtension.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(
"these features can be applied.",
"Florian Rival",
"Open source (MIT License)")
.SetCategory("User interface")
.SetExtensionHelpPath("/all-features/window");
extension
.AddInstructionOrExpressionGroupMetadata(
Expand Down
2 changes: 1 addition & 1 deletion Extensions/AdvancedWindow/JsExtension.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ module.exports = {
'Arthur Pacaud (arthuro555)',
'MIT'
)
.setCategory('Device');
.setCategory('User interface');
extension
.addInstructionOrExpressionGroupMetadata(_('Advanced window management'))
.setIcon('res/actions/window24.png');
Expand Down
1 change: 1 addition & 0 deletions Extensions/AnchorBehavior/Extension.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ void DeclareAnchorBehaviorExtension(gd::PlatformExtension& extension) {
_("Anchor objects to the window's bounds."),
"Victor Levasseur",
"Open source (MIT License)")
.SetCategory("User interface")
.SetExtensionHelpPath("/behaviors/anchor");

gd::BehaviorMetadata& aut = extension.AddBehavior(
Expand Down
5 changes: 3 additions & 2 deletions Extensions/BBText/JsExtension.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,8 @@ module.exports = {
'Todor Imreorov',
'Open source (MIT License)'
)
.setExtensionHelpPath('/objects/bbtext');
.setExtensionHelpPath('/objects/bbtext')
.setCategory('User interface');

var objectBBText = new gd.ObjectJsImplementation();
// $FlowExpectedError
Expand Down Expand Up @@ -168,7 +169,7 @@ module.exports = {
.addIncludeFile(
'Extensions/BBText/pixi-multistyle-text/dist/pixi-multistyle-text.umd.js'
)
.setCategoryFullName(_('Texts'));
.setCategoryFullName(_('User interface'));

/**
* Utility function to add both a setter and a getter to a property from a list.
Expand Down
5 changes: 3 additions & 2 deletions Extensions/BitmapText/JsExtension.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ module.exports = {
'Aurélien Vivet',
'Open source (MIT License)'
)
.setExtensionHelpPath('/objects/bitmap_text');
.setExtensionHelpPath('/objects/bitmap_text')
.setCategory('User interface');

const bitmapTextObject = new gd.ObjectJsImplementation();
// $FlowExpectedError
Expand Down Expand Up @@ -171,7 +172,7 @@ module.exports = {
.addIncludeFile(
'Extensions/BitmapText/bitmaptextruntimeobject-pixi-renderer.js'
)
.setCategoryFullName(_('Texts'));
.setCategoryFullName(_('User interface'));

object
.addExpressionAndConditionAndAction(
Expand Down
1 change: 1 addition & 0 deletions Extensions/DestroyOutsideBehavior/Extension.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ void DeclareDestroyOutsideBehaviorExtension(gd::PlatformExtension& extension) {
"or other short-lived objects."),
"Florian Rival",
"Open source (MIT License)")
.SetCategory("Game mechanic")
.SetExtensionHelpPath("/behaviors/destroyoutside");

gd::BehaviorMetadata& aut =
Expand Down
2 changes: 1 addition & 1 deletion Extensions/DeviceSensors/JsExtension.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ module.exports = {
"Matthias Meike",
"Open source (MIT License)"
).setExtensionHelpPath("/all-features/device-sensors")
.setCategory('Device');
.setCategory('Input');
extension.addInstructionOrExpressionGroupMetadata(_("Device sensors"))
.setIcon("JsPlatform/Extensions/orientation_active32.png");

Expand Down
2 changes: 1 addition & 1 deletion Extensions/DeviceVibration/JsExtension.js
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ module.exports = {
'Open source (MIT License)'
)
.setExtensionHelpPath('/all-features/device-vibration')
.setCategory('Device');
.setCategory('User interface');
extension.addInstructionOrExpressionGroupMetadata(_("Device vibration"))
.setIcon("JsPlatform/Extensions/vibration_start32.png");

Expand Down
2 changes: 1 addition & 1 deletion Extensions/DialogueTree/JsExtension.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ module.exports = {
'Open source (MIT License)'
)
.setExtensionHelpPath('/all-features/dialogue-tree')
.setCategory('Advanced');
.setCategory('Game mechanic');
extension
.addInstructionOrExpressionGroupMetadata(_('Dialogue Tree (experimental)'))
.setIcon('JsPlatform/Extensions/yarn32.png');
Expand Down
1 change: 1 addition & 0 deletions Extensions/DraggableBehavior/Extension.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ void DeclareDraggableBehaviorExtension(gd::PlatformExtension& extension) {
"or disable the behavior when needed."),
"Florian Rival",
"Open source (MIT License)")
.SetCategory("User interface")
.SetExtensionHelpPath("/behaviors/draggable");

gd::BehaviorMetadata& aut = extension.AddBehavior(
Expand Down
4 changes: 3 additions & 1 deletion Extensions/Effects/JsExtension.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,9 @@ module.exports = {
'Lots of different effects to be used in your game.',
'Various contributors from PixiJS, PixiJS filters and GDevelop',
'MIT'
).setExtensionHelpPath('/interface/scene-editor/layer-effects');
)
.setCategory('Visual effect')
.setExtensionHelpPath('/interface/scene-editor/layer-effects');

// ℹ️ You can declare an effect here. Please order the effects by alphabetical order.
// This file is for common effects that are well-known/"battle-tested". If you have an
Expand Down
2 changes: 1 addition & 1 deletion Extensions/FileSystem/JsExtension.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ module.exports = {
'Open source (MIT License)'
)
.setExtensionHelpPath('/all-features/filesystem')
.setCategory('Device');
.setCategory('Advanced');
extension
.addInstructionOrExpressionGroupMetadata(_('File system'))
.setIcon('JsPlatform/Extensions/filesystem_create_folder32.png');
Expand Down
2 changes: 1 addition & 1 deletion Extensions/Inventory/Extension.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ void DeclareInventoryExtension(gd::PlatformExtension& extension) {
"Florian Rival",
"Open source (MIT License)")
.SetExtensionHelpPath("/all-features/inventory")
.SetCategory("Advanced");
.SetCategory("Game mechanic");
extension
.AddInstructionOrExpressionGroupMetadata(_("Inventories"))
.SetIcon("CppPlatform/Extensions/Inventoryicon.png");
Expand Down
5 changes: 3 additions & 2 deletions Extensions/Lighting/JsExtension.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ module.exports = {
'This provides a light object, and a behavior to mark other objects as being obstacles for the lights. This is a great way to create a special atmosphere to your game, along with effects, make it more realistic or to create gameplays based on lights.',
'Harsimran Virk',
'MIT'
);
)
.setCategory('Visual effect');

const lightObstacleBehavior = new gd.BehaviorJsImplementation();
// $FlowExpectedError - ignore Flow warning as we're creating a behavior
Expand Down Expand Up @@ -195,7 +196,7 @@ module.exports = {
.setIncludeFile('Extensions/Lighting/lightruntimeobject.js')
.addIncludeFile('Extensions/Lighting/lightruntimeobject-pixi-renderer.js')
.addIncludeFile('Extensions/Lighting/lightobstacleruntimebehavior.js')
.setCategoryFullName(_('Lights'));
.setCategoryFullName(_('Visual effect'));

object
.addAction(
Expand Down
3 changes: 2 additions & 1 deletion Extensions/ParticleSystem/Extension.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ void DeclareParticleSystemExtension(gd::PlatformExtension& extension) {
"explosions, magical effects, etc...",
"Florian Rival",
"Open source (MIT License)")
.SetCategory("Visual effect")
.SetExtensionHelpPath("/objects/particles_emitter");

// Declaration of all objects available
Expand All @@ -37,7 +38,7 @@ void DeclareParticleSystemExtension(gd::PlatformExtension& extension) {
_("Displays a large number of small particles to create visual "
"effects."),
"CppPlatform/Extensions/particleSystemicon.png")
.SetCategoryFullName(_("General"));
.SetCategoryFullName(_("Visual effect"));

// Declaration is too big to be compiled by GCC in one file, unless you have
// 4GB+ ram. :/
Expand Down
1 change: 1 addition & 0 deletions Extensions/PathfindingBehavior/Extension.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ void DeclarePathfindingBehaviorExtension(gd::PlatformExtension& extension) {
"avoiding obstacles on the way.",
"Florian Rival",
"Open source (MIT License)")
.SetCategory("Movement")
.SetExtensionHelpPath("/behaviors/pathfinding");

{
Expand Down
2 changes: 1 addition & 1 deletion Extensions/Physics2Behavior/JsExtension.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ module.exports = {
'MIT'
)
.setExtensionHelpPath('/behaviors/physics2')
.setCategory('Advanced');
.setCategory('Movement');
extension
.addInstructionOrExpressionGroupMetadata(_('Physics Engine 2.0'))
.setIcon('res/physics32.png');
Expand Down
1 change: 1 addition & 0 deletions Extensions/PhysicsBehavior/Extension.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ void DeclarePhysicsBehaviorExtension(gd::PlatformExtension& extension) {
"This is the old, deprecated physics engine. Prefer to use the Physics Engine 2.0.",
"Florian Rival",
"Open source (MIT License)")
.SetCategory("Movement")
.SetExtensionHelpPath("/behaviors/physics");

{
Expand Down
1 change: 1 addition & 0 deletions Extensions/PlatformBehavior/Extension.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ void DeclarePlatformBehaviorExtension(gd::PlatformExtension& extension) {
"could be used.",
"Florian Rival",
"Open source (MIT License)")
.SetCategory("Movement")
.SetExtensionHelpPath("/behaviors/platformer");
extension.AddInstructionOrExpressionGroupMetadata(_("Platform behavior"))
.SetIcon("CppPlatform/Extensions/platformerobjecticon.png");
Expand Down
2 changes: 1 addition & 1 deletion Extensions/Screenshot/JsExtension.js
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ module.exports = {
'Open source (MIT License)'
)
.setExtensionHelpPath('/all-features/screenshot')
.setCategory('Device');
.setCategory('Advanced');
extension
.addInstructionOrExpressionGroupMetadata(_('Screenshot'))
.setIcon('JsPlatform/Extensions/take_screenshot32.png');
Expand Down
2 changes: 1 addition & 1 deletion Extensions/SystemInfo/Extension.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ void DeclareSystemInfoExtension(gd::PlatformExtension& extension) {
_("Get information about the system and device running the game."),
"Florian Rival",
"Open source (MIT License)")
.SetCategory("Device");
.SetCategory("Advanced");
extension.AddInstructionOrExpressionGroupMetadata(_("System information"))
.SetIcon("CppPlatform/Extensions/systeminfoicon.png");

Expand Down
3 changes: 2 additions & 1 deletion Extensions/TextEntryObject/Extension.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ void DeclareTextEntryObjectExtension(gd::PlatformExtension& extension) {
"entered with a keyboard by a player."),
"Florian Rival",
"Open source (MIT License)")
.SetCategory("User interface")
.SetExtensionHelpPath("/objects/text_entry");

gd::ObjectMetadata& obj =
Expand All @@ -27,7 +28,7 @@ void DeclareTextEntryObjectExtension(gd::PlatformExtension& extension) {
_("Invisible object used to get the text "
"entered with the keyboard."),
"CppPlatform/Extensions/textentry.png")
.SetCategoryFullName(_("Advanced"));
.SetCategoryFullName(_("User interface"));

obj.AddAction("String",
_("Text in memory"),
Expand Down
5 changes: 3 additions & 2 deletions Extensions/TextInput/JsExtension.js
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@ module.exports = {
_('A text field the player can type text into.'),
'Florian Rival',
'MIT'
);
)
.setCategory('User interface');

const textInputObject = new gd.ObjectJsImplementation();
// $FlowExpectedError - ignore Flow warning as we're creating an object
Expand Down Expand Up @@ -277,7 +278,7 @@ module.exports = {
'JsPlatform/Extensions/text_input.svg',
textInputObject
)
.setCategoryFullName(_('Form control'))
.setCategoryFullName(_('User interface'))
.addUnsupportedBaseObjectCapability('effect')
.setIncludeFile('Extensions/TextInput/textinputruntimeobject.js')
.addIncludeFile(
Expand Down
3 changes: 2 additions & 1 deletion Extensions/TextObject/Extension.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ void DeclareTextObjectExtension(gd::PlatformExtension& extension) {
"some indicators, menu buttons, dialogues..."),
"Florian Rival and Victor Levasseur",
"Open source (MIT License)")
.SetCategory("User interface")
.SetExtensionHelpPath("/objects/text");

gd::ObjectMetadata& obj =
Expand All @@ -31,7 +32,7 @@ void DeclareTextObjectExtension(gd::PlatformExtension& extension) {
_("Text"),
_("Displays a text on the screen."),
"CppPlatform/Extensions/texticon.png")
.SetCategoryFullName(_("Texts"));
.SetCategoryFullName(_("User interface"));

obj.AddAction("String",
_("Modify the text"),
Expand Down
1 change: 1 addition & 0 deletions Extensions/TileMap/JsExtension.js
Original file line number Diff line number Diff line change
Expand Up @@ -858,6 +858,7 @@ module.exports = {
'Todor Imreorov',
'Open source (MIT License)'
)
.setCategory('Advanced')
.setExtensionHelpPath('/objects/tilemap');

defineTileMap(extension, _, gd);
Expand Down
1 change: 1 addition & 0 deletions Extensions/TopDownMovementBehavior/Extension.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ void DeclareTopDownMovementBehaviorExtension(gd::PlatformExtension& extension) {
"keyboard or using events."),
"Florian Rival",
"Open source (MIT License)")
.SetCategory("Movement")
.SetExtensionHelpPath("/behaviors/topdown");

gd::BehaviorMetadata& aut = extension.AddBehavior(
Expand Down
3 changes: 3 additions & 0 deletions Extensions/TweenBehavior/JsExtension.js
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,10 @@ module.exports = {
'Matthias Meike, Florian Rival',
'Open source (MIT License)'
)
.setCategory('Visual effect')
.setExtensionHelpPath('/behaviors/tween');
extension.addInstructionOrExpressionGroupMetadata(_("Tweening"))
.setIcon("JsPlatform/Extensions/tween_behavior32.png");

extension
.addExpression(
Expand Down
3 changes: 2 additions & 1 deletion Extensions/Video/JsExtension.js
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ module.exports = {
'Aurélien Vivet',
'Open source (MIT License)'
)
.setCategory('User interface')
.setExtensionHelpPath('/objects/video');

var videoObject = new gd.ObjectJsImplementation();
Expand Down Expand Up @@ -133,7 +134,7 @@ module.exports = {
)
.setIncludeFile('Extensions/Video/videoruntimeobject.js')
.addIncludeFile('Extensions/Video/videoruntimeobject-pixi-renderer.js')
.setCategoryFullName(_('Multimedia'));
.setCategoryFullName(_('User interface'));

object
.addAction(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -224,10 +224,6 @@ export const ExtensionOptionsEditor = ({
text: 'Camera',
value: 'Camera',
},
{
text: 'Device',
value: 'Device',
},
{
text: 'Input',
value: 'Input',
Expand Down