Kalakoi/GDevelop
1
0
Fork 0
mirror of https://github.com/4ian/GDevelop.git synced 2025-10-15 10:19:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/instructions-wording' of github.com:4ian/GD into cleanup

Browse Source
This commit is contained in:
Florian Rival
2015-08-17 16:08:22 +02:00
parent 22baf2260e d41db505c2
commit cc5f9e6381
16 changed files with 225 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Core/GDCore/BuiltinExtensions/AdvancedExtension.cpp
View File

@@ -21,7 +21,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAdvancedExtension(gd::P
#if defined(GD_IDE_ONLY)
extension.AddCondition("Toujours",
_("Always"),
_("This condition returns always true ( and always false if contrary is checked )."),
_("This condition returns always true (or always false if condition is inverted)."),
_("Always"),
_("Other"),
"res/conditions/toujours24.png",

74
Core/GDCore/BuiltinExtensions/AudioExtension.cpp
View File

@@ -21,17 +21,17 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
#if defined(GD_IDE_ONLY)
extension.AddAction("PlaySoundCanal",
_("Play a sound on a channel"),
_("Play a sound ( small audio file ) on a specific channel,\nso as to be able to manipulate it."),
_("Play a sound (small audio file) on a specific channel,\nso as to be able to manipulate it."),
_("Play the sound _PARAM1_ on the channel _PARAM2_"),
_("Audio/Sounds on channels"),
"res/actions/son24.png",
"res/actions/son.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("soundfile", _("Audio file"), "",false)
.AddParameter("expression", _("Canal ( 0 - 15 )"), "",false)
.AddParameter("yesorno", _("Repeat the sound \?"), "",true).SetDefaultValue("no")
.AddParameter("expression", _("Volume ( From 0 to 100, 100 by default )"), "",true).SetDefaultValue("100")
.AddParameter("expression", _("Pitch ( speed ) ( 1 by default )"), "",true).SetDefaultValue("1")
.AddParameter("expression", _("Channel identifier"), "",false)
.AddParameter("yesorno", _("Repeat the sound"), "",true).SetDefaultValue("no")
.AddParameter("expression", _("Volume (from 0 to 100, 100 by default)"), "",true).SetDefaultValue("100")
.AddParameter("expression", _("Pitch (speed) (1 by default)"), "",true).SetDefaultValue("1")
.MarkAsAdvanced();
extension.AddAction("StopSoundCanal",
@@ -42,7 +42,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
"res/actions/son24.png",
"res/actions/son.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("expression", _("Canal ( 0 - 15 )"), "",false)
.AddParameter("expression", _("Channel identifier"), "",false)
.MarkAsAdvanced();
extension.AddAction("PauseSoundCanal",
@@ -53,7 +53,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
"res/actions/son24.png",
"res/actions/son.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("expression", _("Canal ( 0 - 15 )"), "",false)
.AddParameter("expression", _("Channel identifier"), "",false)
.MarkAsAdvanced();
extension.AddAction("RePlaySoundCanal",
@@ -64,7 +64,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
"res/actions/son24.png",
"res/actions/son.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("expression", _("Canal ( 0 - 15 )"), "",false)
.AddParameter("expression", _("Channel identifier"), "",false)
.MarkAsAdvanced();
extension.AddAction("PlayMusicCanal",
@@ -76,10 +76,10 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
"res/actions/music.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("musicfile", _("Audio file"), "",false)
.AddParameter("expression", _("Canal ( 0 - 15 )"), "",false)
.AddParameter("yesorno", _("Repeat the sound \?"), "",true).SetDefaultValue("no")
.AddParameter("expression", _("Volume ( From 0 to 100, 100 by default )"), "",true).SetDefaultValue("100")
.AddParameter("expression", _("Pitch ( speed ) ( 1 by default )"), "",true).SetDefaultValue("1")
.AddParameter("expression", _("Channel identifier"), "",false)
.AddParameter("yesorno", _("Repeat the sound"), "",true).SetDefaultValue("no")
.AddParameter("expression", _("Volume (from 0 to 100, 100 by default)"), "",true).SetDefaultValue("100")
.AddParameter("expression", _("Pitch (speed) (1 by default)"), "",true).SetDefaultValue("1")
.MarkAsAdvanced();
extension.AddAction("StopMusicCanal",
@@ -90,7 +90,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
"res/actions/music24.png",
"res/actions/music.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("expression", _("Canal ( 0 - 15 )"), "",false)
.AddParameter("expression", _("Channel identifier"), "",false)
.MarkAsAdvanced();
extension.AddAction("PauseMusicCanal",
@@ -101,7 +101,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
"res/actions/music24.png",
"res/actions/music.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("expression", _("Canal ( 0 - 15 )"), "",false)
.AddParameter("expression", _("Channel identifier"), "",false)
.MarkAsAdvanced();
extension.AddAction("RePlayMusicCanal",
@@ -112,7 +112,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
"res/actions/music24.png",
"res/actions/music.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("expression", _("Canal ( 0 - 15 )"), "",false)
.AddParameter("expression", _("Channel identifier"), "",false)
.MarkAsAdvanced();
extension.AddAction("ModVolumeSoundCanal",
@@ -123,7 +123,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
"res/actions/sonVolume24.png",
"res/actions/sonVolume.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("expression", _("Canal ( 0 - 15 )"), "",false)
.AddParameter("expression", _("Channel identifier"), "",false)
.AddParameter("operator", _("Modification's sign"), "",false)
.AddParameter("expression", _("Value"), "",false)
.MarkAsAdvanced()
@@ -137,7 +137,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
"res/actions/musicVolume24.png",
"res/actions/musicVolume.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("expression", _("Canal ( 0 - 15 )"), "",false)
.AddParameter("expression", _("Channel identifier"), "",false)
.AddParameter("operator", _("Modification's sign"), "",false)
.AddParameter("expression", _("Value"), "",false)
.MarkAsAdvanced()
@@ -158,13 +158,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
extension.AddAction("ModPitchSoundChannel",
_("Pitch of the sound of a channel"),
_("This action modify pitch ( speed ) of the sound on a channel.\n1 is the default pitch."),
_("This action modify pitch (speed) of the sound on a channel.\n1 is the default pitch."),
_("Do _PARAM2__PARAM3_ to the pitch of the sound on channel _PARAM1_"),
_("Audio/Sounds on channels"),
"res/actions/son24.png",
"res/actions/son.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("expression", _("Canal ( 0 - 15 )"), "",false)
.AddParameter("expression", _("Channel identifier"), "",false)
.AddParameter("operator", _("Modification's sign"), "",false)
.AddParameter("expression", _("Value"), "",false)
.MarkAsAdvanced()
@@ -178,7 +178,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
"res/actions/music24.png",
"res/actions/music.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("expression", _("Canal ( 0 - 15 )"), "",false)
.AddParameter("expression", _("Channel identifier"), "",false)
.AddParameter("operator", _("Modification's sign"), "",false)
.AddParameter("expression", _("Value"), "",false)
.MarkAsAdvanced()
@@ -192,7 +192,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
"res/actions/son24.png",
"res/actions/son.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("expression", _("Canal ( 0 - 15 )"), "",false)
.AddParameter("expression", _("Channel identifier"), "",false)
.AddParameter("operator", _("Modification's sign"), "",false)
.AddParameter("expression", _("Value"), "",false)
.MarkAsAdvanced()
@@ -206,7 +206,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
"res/actions/music24.png",
"res/actions/music.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("expression", _("Canal ( 0 - 15 )"), "",false)
.AddParameter("expression", _("Channel identifier"), "",false)
.AddParameter("operator", _("Modification's sign"), "",false)
.AddParameter("expression", _("Value"), "",false)
.MarkAsAdvanced()
@@ -221,9 +221,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
"res/actions/son.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("soundfile", _("Audio file"), "",false)
.AddParameter("yesorno", _("Repeat the sound \?"), "",true).SetDefaultValue("no")
.AddParameter("expression", _("Volume ( From 0 to 100, 100 by default )"), "",true).SetDefaultValue("100")
.AddParameter("expression", _("Pitch ( speed ) ( 1 by default )"), "",true).SetDefaultValue("1")
.AddParameter("yesorno", _("Repeat the sound"), "",true).SetDefaultValue("no")
.AddParameter("expression", _("Volume (from 0 to 100, 100 by default)"), "",true).SetDefaultValue("100")
.AddParameter("expression", _("Pitch (speed) (1 by default)"), "",true).SetDefaultValue("1")
.MarkAsSimple();
extension.AddAction("PlayMusic",
@@ -235,9 +235,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
"res/actions/music.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("musicfile", _("Audio file"), "",false)
.AddParameter("yesorno", _("Repeat the sound \?"), "",true).SetDefaultValue("no")
.AddParameter("expression", _("Volume ( From 0 to 100, 100 by default )"), "",true).SetDefaultValue("100")
.AddParameter("expression", _("Pitch ( speed ) ( 1 by default )"), "",true).SetDefaultValue("1")
.AddParameter("yesorno", _("Repeat the sound"), "",true).SetDefaultValue("no")
.AddParameter("expression", _("Volume (from 0 to 100, 100 by default)"), "",true).SetDefaultValue("100")
.AddParameter("expression", _("Pitch (speed) (1 by default)"), "",true).SetDefaultValue("1")
.MarkAsSimple();
extension.AddCondition("MusicPlaying",
@@ -314,7 +314,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
"res/conditions/sonVolume24.png",
"res/conditions/sonVolume.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("expression", _("Canal ( 0 - 15 )"), "",false)
.AddParameter("expression", _("Channel identifier"), "",false)
.AddParameter("relationalOperator", _("Sign of the test"), "",false)
.AddParameter("expression", _("Volume to test"), "",false)
.MarkAsAdvanced()
@@ -328,7 +328,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
"res/conditions/musicVolume24.png",
"res/conditions/musicVolume.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("expression", _("Canal ( 0 - 15 )"), "",false)
.AddParameter("expression", _("Channel identifier"), "",false)
.AddParameter("relationalOperator", _("Sign of the test"), "",false)
.AddParameter("expression", _("Volume to test"), "",false)
.MarkAsAdvanced()
@@ -354,7 +354,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
"res/conditions/sonVolume24.png",
"res/conditions/sonVolume.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("expression", _("Canal ( 0 - 15 )"), "",false)
.AddParameter("expression", _("Channel identifier"), "",false)
.AddParameter("relationalOperator", _("Sign of the test"), "",false)
.AddParameter("expression", _("Pitch to test"), "",false)
.MarkAsAdvanced()
@@ -362,13 +362,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
extension.AddCondition("MusicChannelPitch",
_("Pitch of the music on a channel"),
_("Test the pitch ( speed ) of the music on specified channel. 1 is the default pitch."),
_("Test the pitch (speed) of the music on specified channel. 1 is the default pitch."),
_("The volume of the music on channel _PARAM1_ is _PARAM2__PARAM3_"),
_("Audio/Musics on channels"),
"res/conditions/musicVolume24.png",
"res/conditions/musicVolume.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("expression", _("Canal ( 0 - 15 )"), "",false)
.AddParameter("expression", _("Channel identifier"), "",false)
.AddParameter("relationalOperator", _("Sign of the test"), "",false)
.AddParameter("expression", _("Pitch to test"), "",false)
.MarkAsAdvanced()
@@ -382,9 +382,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
"res/conditions/sonVolume24.png",
"res/conditions/sonVolume.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("expression", _("Canal ( 0 - 15 )"), "",false)
.AddParameter("expression", _("Channel identifier"), "",false)
.AddParameter("relationalOperator", _("Sign of the test"), "",false)
.AddParameter("expression", _("Position ( in seconds )"), "",false)
.AddParameter("expression", _("Playing position (in seconds)"), "",false)
.MarkAsAdvanced()
.SetManipulatedType("number");
@@ -396,9 +396,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsAudioExtension(gd::Plat
"res/conditions/musicVolume24.png",
"res/conditions/musicVolume.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("expression", _("Canal ( 0 - 15 )"), "",false)
.AddParameter("expression", _("Channel identifier"), "",false)
.AddParameter("relationalOperator", _("Sign of the test"), "",false)
.AddParameter("expression", _("Position ( in seconds )"), "",false)
.AddParameter("expression", _("Playing position (in seconds)"), "",false)
.MarkAsAdvanced()
.SetManipulatedType("number");

92
Core/GDCore/BuiltinExtensions/BaseObjectExtension.cpp
View File

@@ -167,21 +167,21 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
.MarkAsAdvanced();
obj.AddAction("AddForceXY",
_("Add a force to an object"),
_("Add a force to an object. The object will move according to\nall forces it owns. This action create the force with its X and Y coordinates."),
_("Add a force"),
_("Add a force to an object. The object will move according to all forces it has."),
_("Add to _PARAM0_ a force of _PARAM1_ p/s on X axis and _PARAM2_ p/s on Y axis"),
_("Movement"),
"res/actions/force24.png",
"res/actions/force.png")
.AddParameter("object", _("Object"))
.AddParameter("expression", _("X coordinate of moving"))
.AddParameter("expression", _("Y coordinate of moving"))
.AddParameter("expression", _("Speed on X axis (in pixels per second)"))
.AddParameter("expression", _("Speed on Y axis (in pixels per second)"))
.AddParameter("expression", _("Damping (Default: 0)"));
obj.AddAction("AddForceAL",
_("Add a force ( angle )"),
_("Add a force to an object. The object will move according to\nall forces it owns. This action creates the force using the specified angle and length."),
_("Add a force (angle)"),
_("Add a force to an object. The object will move according to all forces it has. This action creates the force using the specified angle and length."),
_("Add to _PARAM0_ a force, angle: _PARAM1_ degrees and length: _PARAM2_ pixels"),
_("Movement"),
"res/actions/force24.png",
@@ -189,13 +189,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
.AddParameter("object", _("Object"))
.AddParameter("expression", _("Angle"))
.AddParameter("expression", _("Length (in pixels)"))
.AddParameter("expression", _("Speed (in pixels per second)"))
.AddParameter("expression", _("Damping (Default: 0)"))
.MarkAsAdvanced();
obj.AddAction("AddForceVersPos",
_("Add a force so as to move to a position"),
_("Add a force to an object so as it moves to the position."),
_("Add a force to move toward a position"),
_("Add a force to an object to make it move toward a position."),
_("Move _PARAM0_ to _PARAM1_;_PARAM2_ with a force of _PARAM3_ pixels"),
_("Movement"),
"res/actions/force24.png",
@@ -204,14 +204,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
.AddParameter("object", _("Object"))
.AddParameter("expression", _("X position"))
.AddParameter("expression", _("Y position"))
.AddParameter("expression", _("Length (in pixels)"))
.AddParameter("expression", _("Speed (in pixels per second)"))
.AddParameter("expression", _("Damping (Default: 0)"))
.MarkAsAdvanced();
obj.AddAction("AddForceTournePos",
_("Add a force so as to move around a position"),
_("Add a force to an object so as it rotates toward a position.\nNote that the moving is not precise, especially if the speed is high.\nTo position an object around a position more precisly, use the actions in the category \"Position\"."),
_("Rotate _PARAM0_ around _PARAM1_;_PARAM2_ with _PARAM3_ deg/sec and _PARAM4_ pixels away"),
_("Add a force to move around an position"),
_("Add a force to an object to make it rotate around a position.\nNote that the movement is not precise, especially if the speed is high.\nTo position an object around a position more precisly, use the actions in the category \"Position\"."),
_("Rotate _PARAM0_ around _PARAM1_;_PARAM2_ at _PARAM3_ deg/sec and _PARAM4_ pixels away"),
_("Movement"),
"res/actions/forceTourne24.png",
"res/actions/forceTourne.png")
@@ -510,12 +510,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
.AddParameter("object", _("Object"))
.AddParameter("automatism", _("Automatism"))
.AddParameter("yesorno", _("Activate \?"))
.AddParameter("yesorno", _("Activate?"))
.MarkAsAdvanced();
obj.AddAction("AddForceVers",
_("Add a force so as to move to an object"),
_("Add a force to an object so as it moves to another."),
_("Add a force to move toward an object"),
_("Add a force to an object to make it move toward another."),
_("Move _PARAM0_ to _PARAM1_ with a force of _PARAM2_ pixels"),
_("Movement"),
"res/actions/forceVers24.png",
@@ -523,22 +523,22 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
.AddParameter("object", _("Object"))
.AddParameter("objectPtr", _("Target Object"))
.AddParameter("expression", _("Length in pixel"))
.AddParameter("expression", _("Speed (in pixels per second)"))
.AddParameter("expression", _("Damping (Default: 0)"))
.MarkAsAdvanced();
obj.AddAction("AddForceTourne",
_("Add a force so as to move around an object"),
_("Add a force to an object so as it rotates around another.\nNote that the moving is not precise, especially if the speed is high.\nTo position an object around a position more precisly, use the actions in the category \"Position\"."),
_("Rotate _PARAM0_ around _PARAM1_ with _PARAM2_ deg/sec and _PARAM3_ pixels away"),
_("Add a force to move around an object"),
_("Add a force to an object to make it rotate around another.\nNote that the movement is not precise, especially if the speed is high.\nTo position an object around a position more precisly, use the actions in category \"Position\"."),
_("Rotate _PARAM0_ around _PARAM1_ at _PARAM2_ deg/sec and _PARAM3_ pixels away"),
_("Movement"),
"res/actions/forceTourne24.png",
"res/actions/forceTourne.png")
.AddParameter("object", _("Object"))
.AddParameter("objectPtr", _("Rotate around this object"))
.AddParameter("expression", _("Speed ( Degrees per second )"))
.AddParameter("expression", _("Distance ( in pixel )"))
.AddParameter("expression", _("Speed (in degrees per second)"))
.AddParameter("expression", _("Distance (in pixels)"))
.AddParameter("expression", _("Damping (Default: 0)"))
.MarkAsAdvanced();
@@ -561,34 +561,34 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
obj.AddAction("Rebondir",
_("Move an object away from another"),
_("Move an object away from another, using forces."),
_("Move away _PARAM0_ of _PARAM1_ ( only _PARAM0_ will move )"),
_("Move _PARAM0_ away of _PARAM1_ (only _PARAM0_ will move)"),
_("Movement"),
"res/actions/ecarter24.png",
"res/actions/ecarter.png")
.SetHidden()
.AddParameter("object", _("Object"))
.AddParameter("objectList", _("Object 2 ( won't move )"));
.AddParameter("objectList", _("Object 2 (won't move)"));
//Deprecated action
obj.AddAction("Ecarter",
_("Move an object away from another"),
_("Move an object away from another without using forces."),
_("Move away _PARAM0_ of _PARAM2_ ( only _PARAM0_ will move )"),
_("Move _PARAM0_ away of _PARAM2_ (only _PARAM0_ will move)"),
_("Position"),
"res/actions/ecarter24.png",
"res/actions/ecarter.png")
.SetHidden()
.AddParameter("object", _("Object"))
.AddParameter("objectList", _("Object 2 ( won't move )"));
.AddParameter("objectList", _("Object 2 (won't move)"));
obj.AddAction("SeparateFromObjects",
_("Separate two objects"),
_("Move an object away from another using their collision masks.\nBe sure to call this action on a reasonable number of objects so as\nnot to slow down the game."),
_("Move away _PARAM0_ of _PARAM1_ (only _PARAM0_ will move)"),
_("Move _PARAM0_ away of _PARAM1_ (only _PARAM0_ will move)"),
_("Position"),
"res/actions/ecarter24.png",
"res/actions/ecarter.png")
@@ -671,7 +671,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
.AddParameter("objectListWithoutPicking", _("Object to create"))
.AddParameter("expression", _("X position"))
.AddParameter("expression", _("Y position"))
.AddParameter("layer", _("Layer ( Base layer if empty )"), "", true).SetDefaultValue("\"\"")
.AddParameter("layer", _("Layer (base layer if empty)"), "", true).SetDefaultValue("\"\"")
.MarkAsSimple();
extension.AddAction("CreateByName",
@@ -686,13 +686,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
.AddParameter("string", _("Text representing the name of the object to create"))
.AddParameter("expression", _("X position"))
.AddParameter("expression", _("Y position"))
.AddParameter("layer", _("Layer ( Base layer if empty )"), "", true).SetDefaultValue("\"\"")
.AddParameter("layer", _("Layer (base layer if empty)"), "", true).SetDefaultValue("\"\"")
.MarkAsAdvanced();
extension.AddAction("AjoutObjConcern",
_("Consider objects"),
_("Pick all objects"),
_("Pick all objects with this name."),
_("Consider all _PARAM1_ "),
_("Pick all _PARAM1_"),
_("Objects"),
"res/actions/add24.png",
"res/actions/add.png")
@@ -701,9 +701,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
.MarkAsAdvanced();
extension.AddAction("AjoutHasard",
_("Take a random object"),
_("Take only one object with this name among all"),
_("Take a random _PARAM1_ "),
_("Pick a random object"),
_("Pick only one object with this name among all"),
_("Pick a random _PARAM1_"),
_("Objects"),
"res/actions/ajouthasard24.png",
"res/actions/ajouthasard.png")
@@ -712,9 +712,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
.MarkAsSimple();
extension.AddAction("MoveObjects",
_("Make objects moving"),
_("Apply objects movement"),
_("Moves the objects according to the forces they have. GDevelop call this action at the end of the events by default."),
_("Make objects moving"),
_("Apply objects movement"),
_("Movement"),
"res/actions/doMove24.png",
"res/actions/doMove.png")
@@ -722,8 +722,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
.MarkAsAdvanced();
extension.AddCondition("SeDirige",
_("An object is moving to another"),
_("Test if an object moves towards another.\nThe first object must move."),
_("An object is moving toward another"),
_("Check if an object moves toward another.\nThe first object must move."),
_("_PARAM0_ is moving toward _PARAM1_"),
_("Movement"),
"res/conditions/sedirige24.png",
@@ -736,7 +736,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
extension.AddCondition("Distance",
_("Distance between two objects"),
_("Test the distance between two objects.\nIf condition is inverted, only objects that have a distance greater than specified to any other object will be picked."),
_("Compare the distance between two objects.\nIf condition is inverted, only objects that have a distance greater than specified to any other object will be picked."),
_("_PARAM0_ distance to _PARAM1_ is below _PARAM2_ pixels"),
_("Position"),
"res/conditions/distance24.png",
@@ -748,9 +748,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
.MarkAsSimple();
extension.AddCondition("AjoutObjConcern",
_("Consider objects"),
_("Pick all objects"),
_("Pick all objects with this name."),
_("Consider all _PARAM1_ "),
_("Pick all _PARAM1_"),
_("Objects"),
"res/conditions/add24.png",
"res/conditions/add.png")
@@ -759,9 +759,9 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
.MarkAsAdvanced();
extension.AddCondition("AjoutHasard",
_("Take a random object"),
_("Take only one object with this name among all"),
_("Take a random _PARAM1_ "),
_("Pick a random object"),
_("Pick only one object with this name among all"),
_("Pick a random _PARAM1_"),
_("Objects"),
"res/conditions/ajouthasard24.png",
"res/conditions/ajouthasard.png")
@@ -783,8 +783,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsBaseObjectExtension(gd:
.MarkAsSimple();
extension.AddCondition("NbObjet",
_("Number of objects"),
_("Test the number of concerned objects."),
_("Objects count"),
_("Compare the number of picked objects"),
_("The number of _PARAM0_ is _PARAM1__PARAM2_"),
_("Objects"),
"res/conditions/nbObjet24.png",

116
Core/GDCore/BuiltinExtensions/CameraExtension.cpp
View File

@@ -22,60 +22,60 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(gd::Pla
extension.AddCondition("CameraX",
_("Camera center X position"),
_("Compare the X position of a the center of a camera."),
_("X position of camera _PARAM4_ is _PARAM1__PARAM2_ ( Layer: _PARAM3_ )"),
_("X position of camera _PARAM4_ is _PARAM1__PARAM2_ (layer: _PARAM3_)"),
_("Layers and cameras"),
"res/conditions/camera24.png",
"res/conditions/camera.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("relationalOperator", _("Sign of the test"), "",false)
.AddParameter("expression", _("Value to test"), "",false)
.AddParameter("layer", _("Layer ( Base layer if empty )"), "",true).SetDefaultValue("\"\"")
.AddParameter("expression", _("Camera number ( default : 0 )"), "",true).SetDefaultValue("0")
.AddParameter("layer", _("Layer (base layer if empty)"), "",true).SetDefaultValue("\"\"")
.AddParameter("expression", _("Camera number (default : 0)"), "",true).SetDefaultValue("0")
.MarkAsAdvanced()
.SetManipulatedType("number");
extension.AddCondition("CameraY",
_("Camera center Y position"),
_("Compare the Y position of a the center of a camera."),
_("The Y position of camera _PARAM4_ is _PARAM1__PARAM2_ ( Layer: _PARAM3_ )"),
_("The Y position of camera _PARAM4_ is _PARAM1__PARAM2_ (layer: _PARAM3_)"),
_("Layers and cameras"),
"res/conditions/camera24.png",
"res/conditions/camera.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("relationalOperator", _("Sign of the test"), "",false)
.AddParameter("expression", _("Value to test"), "",false)
.AddParameter("layer", _("Layer ( Base layer if empty )"), "",false).SetDefaultValue("\"\"")
.AddParameter("expression", _("Camera number ( default : 0 )"), "",false).SetDefaultValue("0")
.AddParameter("layer", _("Layer (base layer if empty)"), "",false).SetDefaultValue("\"\"")
.AddParameter("expression", _("Camera number (default : 0)"), "",false).SetDefaultValue("0")
.MarkAsAdvanced()
.SetManipulatedType("number");
extension.AddAction("CameraX",
_("Camera center X position"),
_("Change X position of the center of the specified camera."),
_("Do _PARAM1__PARAM2_ to X position of camera _PARAM4_ ( Layer: _PARAM3_ )"),
_("Do _PARAM1__PARAM2_ to X position of camera _PARAM4_ (layer: _PARAM3_)"),
_("Layers and cameras"),
"res/conditions/camera24.png",
"res/conditions/camera.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("operator", _("Modification's sign"), "",false)
.AddParameter("expression", _("Value"), "",false)
.AddParameter("layer", _("Layer ( Base layer if empty )"), "",true).SetDefaultValue("\"\"")
.AddParameter("expression", _("Camera number ( default : 0 )"), "",true).SetDefaultValue("0")
.AddParameter("layer", _("Layer (base layer if empty)"), "",true).SetDefaultValue("\"\"")
.AddParameter("expression", _("Camera number (default : 0)"), "",true).SetDefaultValue("0")
.MarkAsAdvanced()
.SetManipulatedType("number");
extension.AddAction("CameraY",
_("Camera center Y position"),
_("Change Y position of the center of the specified camera."),
_("Do _PARAM1__PARAM2_ to Y position of camera _PARAM4_ ( Layer: _PARAM3_ )"),
_("Do _PARAM1__PARAM2_ to Y position of camera _PARAM4_ (layer: _PARAM3_)"),
_("Layers and cameras"),
"res/conditions/camera24.png",
"res/conditions/camera.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("operator", _("Modification's sign"), "",false)
.AddParameter("expression", _("Value"), "",false)
.AddParameter("layer", _("Layer ( Base layer if empty )"), "",true).SetDefaultValue("\"\"")
.AddParameter("expression", _("Camera number ( default : 0 )"), "",true).SetDefaultValue("0")
.AddParameter("layer", _("Layer (base layer if empty)"), "",true).SetDefaultValue("\"\"")
.AddParameter("expression", _("Camera number (default : 0)"), "",true).SetDefaultValue("0")
.MarkAsAdvanced()
.SetManipulatedType("number");
@@ -102,7 +102,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(gd::Pla
"res/conditions/camera24.png",
"res/conditions/camera.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("layer", _("Layer ( Base layer if empty )"), "",false).SetDefaultValue("\"\"")
.AddParameter("layer", _("Layer (base layer if empty)"), "",false).SetDefaultValue("\"\"")
.AddParameter("expression", _("Camera number"), "",false)
.AddParameter("relationalOperator", _("Sign of the test"), "",false)
.AddParameter("expression", _("Value to test"), "",false)
@@ -112,30 +112,30 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(gd::Pla
extension.AddCondition("CameraAngle",
_("Angle of a camera of a layer"),
_("Test a camera angle."),
_("Angle of camera is _PARAM1__PARAM2_ ( layer : _PARAM3_, camera : _PARAM4_ )"),
_("Angle of camera is _PARAM1__PARAM2_ (layer: _PARAM3_, camera: _PARAM4_)"),
_("Layers and cameras"),
"res/conditions/camera24.png",
"res/conditions/camera.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("relationalOperator", _("Sign of the test"), "",false)
.AddParameter("expression", _("Value to test"), "",false)
.AddParameter("layer", _("Layer ( Base layer if empty )"), "",true).SetDefaultValue("\"\"")
.AddParameter("expression", _("Camera number ( default : 0 )"), "",true).SetDefaultValue("0")
.AddParameter("layer", _("Layer (base layer if empty)"), "",true).SetDefaultValue("\"\"")
.AddParameter("expression", _("Camera number (default : 0)"), "",true).SetDefaultValue("0")
.MarkAsAdvanced()
.SetManipulatedType("number");
extension.AddAction("RotateCamera",
_("Change camera angle"),
_("This action modify the angle of a camera of the specified layer."),
_("Do _PARAM1__PARAM2_ to angle of camera ( layer : _PARAM3_, camera : _PARAM4_ )"),
_("Do _PARAM1__PARAM2_ to angle of camera (layer: _PARAM3_, camera: _PARAM4_)"),
_("Layers and cameras"),
"res/actions/camera24.png",
"res/actions/camera.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("operator", _("Modification's sign"), "",false)
.AddParameter("expression", _("Value"), "",false)
.AddParameter("layer", _("Layer ( Base layer if empty )"), "",true).SetDefaultValue("\"\"")
.AddParameter("expression", _("Camera number ( default : 0 )"), "",true).SetDefaultValue("0")
.AddParameter("layer", _("Layer (base layer if empty)"), "",true).SetDefaultValue("\"\"")
.AddParameter("expression", _("Camera number (default : 0)"), "",true).SetDefaultValue("0")
.SetManipulatedType("number");
extension.AddAction("AddCamera",
@@ -146,13 +146,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(gd::Pla
"res/actions/camera24.png",
"res/actions/camera.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("layer", _("Layer ( Base layer if empty )"), "",false).SetDefaultValue("\"\"")
.AddParameter("layer", _("Layer (base layer if empty)"), "",false).SetDefaultValue("\"\"")
.AddParameter("expression", _("Width"), "",true)
.AddParameter("expression", _("Height"), "",true)
.AddParameter("expression", _("Render zone: Top left side: X Position ( Between 0 and 1 )"), "",true)
.AddParameter("expression", _("Render zone: Top left side: Y Position ( Between 0 and 1 )"), "",true)
.AddParameter("expression", _("Render zone: Bottom right side: X Position ( Between 0 and 1 )"), "",true)
.AddParameter("expression", _("Render zone: Bottom right side: Y Position ( Between 0 and 1 )"), "",true)
.AddParameter("expression", _("Render zone: Top left side: X Position (between 0 and 1)"), "",true)
.AddParameter("expression", _("Render zone: Top left side: Y Position (between 0 and 1)"), "",true)
.AddParameter("expression", _("Render zone: Bottom right side: X Position (between 0 and 1)"), "",true)
.AddParameter("expression", _("Render zone: Bottom right side: Y Position (between 0 and 1)"), "",true)
.MarkAsComplex();
extension.AddAction("DeleteCamera",
@@ -163,7 +163,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(gd::Pla
"res/actions/camera24.png",
"res/actions/camera.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("layer", _("Layer ( Base layer if empty )"), "",false).SetDefaultValue("\"\"")
.AddParameter("layer", _("Layer (base layer if empty)"), "",false).SetDefaultValue("\"\"")
.AddParameter("expression", _("Camera number"), "",false)
.MarkAsComplex();
@@ -175,7 +175,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(gd::Pla
"res/actions/camera24.png",
"res/actions/camera.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("layer", _("Layer ( Base layer if empty )"), "",false).SetDefaultValue("\"\"")
.AddParameter("layer", _("Layer (base layer if empty)"), "",false).SetDefaultValue("\"\"")
.AddParameter("expression", _("Camera number"), "",false)
.AddParameter("expression", _("Width"), "",false)
.AddParameter("expression", _("Height"), "",false)
@@ -189,30 +189,30 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(gd::Pla
"res/actions/camera24.png",
"res/actions/camera.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("layer", _("Layer ( Base layer if empty )"), "",false).SetDefaultValue("\"\"")
.AddParameter("layer", _("Layer (base layer if empty)"), "",false).SetDefaultValue("\"\"")
.AddParameter("expression", _("Camera number"), "",false)
.AddParameter("expression", _("Render zone: Top left side: X Position ( Between 0 and 1 )"), "",false)
.AddParameter("expression", _("Render zone: Top left side: Y Position ( Between 0 and 1 )"), "",false)
.AddParameter("expression", _("Render zone: Bottom right side: X Position ( Between 0 and 1 )"), "",false)
.AddParameter("expression", _("Render zone: Bottom right side: Y Position ( Between 0 and 1 )"), "",false)
.AddParameter("expression", _("Render zone: Top left side: X Position (between 0 and 1)"), "",false)
.AddParameter("expression", _("Render zone: Top left side: Y Position (between 0 and 1)"), "",false)
.AddParameter("expression", _("Render zone: Bottom right side: X Position (between 0 and 1)"), "",false)
.AddParameter("expression", _("Render zone: Bottom right side: Y Position (between 0 and 1)"), "",false)
.MarkAsComplex();
extension.AddAction("ZoomCamera",
_("Change camera zoom."),
_("Change camera zoom."),
_("Change camera zoom to _PARAM1_ ( layer : _PARAM2_, camera : _PARAM3_ )"),
_("Change camera zoom to _PARAM1_ (layer : _PARAM2_, camera : _PARAM3_)"),
_("Layers and cameras"),
"res/actions/camera24.png",
"res/actions/camera.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("expression", _("Value ( 1:Initial zoom, 2:Zoom x2, 0.5:Unzoom x2...)"), "",false)
.AddParameter("layer", _("Layer ( Base layer if empty )"), "",true).SetDefaultValue("\"\"")
.AddParameter("expression", _("Camera number ( default : 0 )"), "",true).SetDefaultValue("0");
.AddParameter("expression", _("Value (1:Initial zoom, 2:Zoom x2, 0.5:Unzoom x2...)"), "",false)
.AddParameter("layer", _("Layer (base layer if empty)"), "",true).SetDefaultValue("\"\"")
.AddParameter("expression", _("Camera number (default : 0)"), "",true).SetDefaultValue("0");
extension.AddAction("FixCamera",
_("Center the camera on an object within limits"),
_("Center the camera on the specified object, without leaving the specified limits."),
_("Center the camera on _PARAM1_ ( limit : from _PARAM2_;_PARAM3_ to _PARAM4_;_PARAM5_ ) ( layer : _PARAM7_, camera : _PARAM8_ )"),
_("Center the camera on _PARAM1_ (limit : from _PARAM2_;_PARAM3_ to _PARAM4_;_PARAM5_) (layer: _PARAM7_, camera: _PARAM8_)"),
_("Layers and cameras"),
"res/actions/camera24.png",
"res/actions/camera.png")
@@ -222,23 +222,23 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(gd::Pla
.AddParameter("expression", _("Top left side of the boundary: Y Position"), "",false)
.AddParameter("expression", _("Bottom right side of the boundary: X Position"), "",false)
.AddParameter("expression", _("Bottom right side of the boundary: Y Position"), "",false)
.AddParameter("yesorno", _("Anticipating the displacement of the object (yes by default)"), "",true).SetDefaultValue("true")
.AddParameter("layer", _("Layer ( Base layer if empty )"), "",true).SetDefaultValue("\"\"")
.AddParameter("expression", _("Camera number ( default : 0 )"), "",true).SetDefaultValue("0")
.AddParameter("yesorno", _("Anticipate the movement of the object (yes by default)"), "",true).SetDefaultValue("true")
.AddParameter("layer", _("Layer (base layer if empty)"), "",true).SetDefaultValue("\"\"")
.AddParameter("expression", _("Camera number (default : 0)"), "",true).SetDefaultValue("0")
.MarkAsAdvanced();
extension.AddAction("CentreCamera",
_("Center the camera on an object"),
_("Center the camera on the specified object."),
_("Center camera on _PARAM1_ ( layer : _PARAM3_, camera : _PARAM4_ )"),
_("Center camera on _PARAM1_ (layer: _PARAM3_, camera: _PARAM4_)"),
_("Layers and cameras"),
"res/actions/camera24.png",
"res/actions/camera.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("objectPtr", _("Object"))
.AddParameter("yesorno", _("Anticipating the displacement of the object (yes by default)"), "",true).SetDefaultValue("true")
.AddParameter("layer", _("Layer ( Base layer if empty )"), "",true).SetDefaultValue("\"\"")
.AddParameter("expression", _("Camera number ( default : 0 )"), "",true).SetDefaultValue("0")
.AddParameter("yesorno", _("Anticipate the movement of the object (yes by default)"), "",true).SetDefaultValue("true")
.AddParameter("layer", _("Layer (base layer if empty)"), "",true).SetDefaultValue("\"\"")
.AddParameter("expression", _("Camera number (default : 0)"), "",true).SetDefaultValue("0")
.MarkAsSimple();
extension.AddAction("ShowLayer",
@@ -249,7 +249,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(gd::Pla
"res/actions/layer24.png",
"res/actions/layer.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("layer", _("Layer ( Base layer if empty )"), "",false).SetDefaultValue("\"\"")
.AddParameter("layer", _("Layer (base layer if empty)"), "",false).SetDefaultValue("\"\"")
.MarkAsAdvanced();
extension.AddAction("HideLayer",
@@ -260,7 +260,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(gd::Pla
"res/actions/layer24.png",
"res/actions/layer.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("layer", _("Layer ( Base layer if empty )"), "",false).SetDefaultValue("\"\"")
.AddParameter("layer", _("Layer (base layer if empty)"), "",false).SetDefaultValue("\"\"")
.MarkAsAdvanced();
extension.AddCondition("LayerVisible",
@@ -271,71 +271,71 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsCameraExtension(gd::Pla
"res/conditions/layer24.png",
"res/conditions/layer.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("layer", _("Layer ( Base layer if empty )"), "",false).SetDefaultValue("\"\"")
.AddParameter("layer", _("Layer (base layer if empty)"), "",false).SetDefaultValue("\"\"")
.MarkAsAdvanced();
extension.AddExpression("CameraWidth", _("Width of a camera of a layer"), _("Width of a camera of a layer"), _("Camera"), "res/actions/camera.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("layer", _("Layer"), "",false)
.AddParameter("expression", _("Camera number ( default : 0 )"), "",false).SetDefaultValue("0");
.AddParameter("expression", _("Camera number (default : 0)"), "",false).SetDefaultValue("0");
extension.AddExpression("CameraHeight", _("Height of a camera of a layer"), _("Height of a camera of a layer"), _("Camera"), "res/actions/camera.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("layer", _("Layer"), "",false)
.AddParameter("expression", _("Camera number ( default : 0 )"), "",false).SetDefaultValue("0");
.AddParameter("expression", _("Camera number (default : 0)"), "",false).SetDefaultValue("0");
extension.AddExpression("CameraViewportLeft", _("X position of the top left side point of a render zone"), _("X position of the top left side point of a render zone"), _("Camera"), "res/actions/camera.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("layer", _("Layer"), "",false)
.AddParameter("expression", _("Camera number ( default : 0 )"), "",false).SetDefaultValue("0");
.AddParameter("expression", _("Camera number (default : 0)"), "",false).SetDefaultValue("0");
extension.AddExpression("CameraViewportTop", _("Y position of the top left side point of a render zone"), _("Y position of the top left side point of a render zone"), _("Camera"), "res/actions/camera.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("layer", _("Layer"), "",false)
.AddParameter("expression", _("Camera number ( default : 0 )"), "",false).SetDefaultValue("0");
.AddParameter("expression", _("Camera number (default : 0)"), "",false).SetDefaultValue("0");
extension.AddExpression("CameraViewportRight", _("X position of the bottom right side point of a render zone"), _("X position of the bottom right side point of a render zone"), _("Camera"), "res/actions/camera.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("layer", _("Layer"), "",false)
.AddParameter("expression", _("Camera number ( default : 0 )"), "",false).SetDefaultValue("0");
.AddParameter("expression", _("Camera number (default : 0)"), "",false).SetDefaultValue("0");
extension.AddExpression("CameraViewportBottom", _("Y position of the bottom right side point of a render zone"), _("Y position of the bottom right side point of a render zone"), _("Camera"), "res/actions/camera.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("layer", _("Layer"), "",false)
.AddParameter("expression", _("Camera number ( default : 0 )"), "",false).SetDefaultValue("0");
.AddParameter("expression", _("Camera number (default : 0)"), "",false).SetDefaultValue("0");
extension.AddExpression("CameraX", _("Camera X position"), _("Camera X position"), _("Camera"), "res/actions/camera.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("layer", _("Layer"), "",true).SetDefaultValue("\"\"")
.AddParameter("expression", _("Camera number ( default : 0 )"), "",true).SetDefaultValue("0");
.AddParameter("expression", _("Camera number (default : 0)"), "",true).SetDefaultValue("0");
extension.AddExpression("VueX", _("Camera X position"), _("Camera X position"), _("Camera"), "res/actions/camera.png")
.SetHidden()
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("layer", _("Layer"), "",true).SetDefaultValue("\"\"")
.AddParameter("expression", _("Camera number ( default : 0 )"), "",true).SetDefaultValue("0");
.AddParameter("expression", _("Camera number (default : 0)"), "",true).SetDefaultValue("0");
extension.AddExpression("CameraY", _("Camera Y position"), _("Camera Y position"), _("Camera"), "res/actions/camera.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("layer", _("Layer"), "",true).SetDefaultValue("\"\"")
.AddParameter("expression", _("Camera number ( default : 0 )"), "",true).SetDefaultValue("0");
.AddParameter("expression", _("Camera number (default : 0)"), "",true).SetDefaultValue("0");
extension.AddExpression("VueY", _("Camera Y position"), _("Camera Y position"), _("Camera"), "res/actions/camera.png")
.SetHidden()
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("layer", _("Layer"), "",true).SetDefaultValue("\"\"")
.AddParameter("expression", _("Camera number ( default : 0 )"), "",true).SetDefaultValue("0");
.AddParameter("expression", _("Camera number (default : 0)"), "",true).SetDefaultValue("0");
extension.AddExpression("CameraRotation", _("Angle of a camera of a layer"), _("Angle of a camera of a layer"), _("Camera"), "res/actions/camera.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("layer", _("Layer"), "",true).SetDefaultValue("\"\"")
.AddParameter("expression", _("Camera number ( default : 0 )"), "",true).SetDefaultValue("0");
.AddParameter("expression", _("Camera number (default : 0)"), "",true).SetDefaultValue("0");
extension.AddExpression("VueRotation", _("Angle of a camera of a layer"), _("Angle of a camera of a layer"), _("Camera"), "res/actions/camera.png")
.SetHidden()
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("layer", _("Layer"), "",true).SetDefaultValue("\"\"")
.AddParameter("expression", _("Camera number ( default : 0 )"), "",true).SetDefaultValue("0");
.AddParameter("expression", _("Camera number (default : 0)"), "",true).SetDefaultValue("0");
#endif
}

12
Core/GDCore/BuiltinExtensions/FileExtension.cpp
View File

@@ -21,7 +21,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(gd::Platf
#if defined(GD_IDE_ONLY)
extension.AddCondition("GroupExists",
_("Existence of a group"),
_("Test if an element ( Example : PlayerState/CurrentLevel ) exists in the file.\nWarning! Spaces are forbidden in element's names."),
_("Check if an element (example : PlayerState/CurrentLevel) exists in the file.\nSpaces are forbidden in element names."),
_("_PARAM1_ exists in file _PARAM0_"),
_("Storage"),
"res/conditions/fichier24.png",
@@ -52,7 +52,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(gd::Platf
extension.AddAction("EcrireFichierExp",
_("Write a value"),
_("Write the result of the expression in the file, in the specified element.\nSpecify the structure leading to the element using / ( Example : Root/Level/Current)\nWarning ! Spaces are forbidden in elements' names."),
_("Write the result of the expression in the file, in the specified element.\nSpecify the structure leading to the element using / (example : Root/Level/Current)\nSpaces are forbidden in element names."),
_("Write _PARAM2_ in _PARAM1_ of file _PARAM0_"),
_("Storage"),
"res/actions/fichier24.png",
@@ -63,7 +63,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(gd::Platf
extension.AddAction("EcrireFichierTxt",
_("Write a text"),
_("Write the text in the file, in the specified element.\nSpecify the structure leading to the element using / ( Example : Root/Level/Current)\nWarning ! Spaces are forbidden in elements' names."),
_("Write the text in the file, in the specified element.\nSpecify the structure leading to the element using / (example : Root/Level/Current)\nSpaces are forbidden in element names."),
_("Write _PARAM2_ in _PARAM1_ of file _PARAM0_"),
_("Storage"),
"res/actions/fichier24.png",
@@ -74,7 +74,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(gd::Platf
extension.AddAction("LireFichierExp",
_("Read a value"),
_("Read the value saved in the specified element and\nstore it in a variable.\nSpecify the structure leading to the element using / ( Example : Root/Level/Current)\nWarning ! Spaces are forbidden in elements' names."),
_("Read the value saved in the specified element and store it in a variable.\nSpecify the structure leading to the element using / (example : Root/Level/Current)\nSpaces are forbidden in element names."),
_("Read _PARAM1_ from file _PARAM0_ and store value in _PARAM3_"),
_("Storage"),
"res/actions/fichier24.png",
@@ -86,7 +86,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(gd::Platf
extension.AddAction("LireFichierTxt",
_("Read a text"),
_("Read the text saved in the specified element and\nstore it in a variable.\nSpecify the structure leading to the element using / ( Example : Root/Level/Current)\nWarning ! Spaces are forbidden in elements' names."),
_("Read the text saved in the specified element and store it in a variable.\nSpecify the structure leading to the element using / (example : Root/Level/Current)\nSpaces are forbidden in element names."),
_("Read _PARAM1_ from file _PARAM0_ and store as text in _PARAM3_"),
_("Storage"),
"res/actions/fichier24.png",
@@ -98,7 +98,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsFileExtension(gd::Platf
extension.AddAction("DeleteGroupFichier",
_("Delete an element"),
_("This action delete the specified element from the structured file.\nSpecify the structure leading to the element using / ( Example : Root/Level/Current)\nWarning ! Spaces are forbidden in elements' names."),
_("This action delete the specified element from the structured file.\nSpecify the structure leading to the element using / (example : Root/Level/Current)\nSpaces are forbidden in element names."),
_("Delete _PARAM1_ from the file _PARAM0_"),
_("Storage"),
"res/actions/delete24.png",

10
Core/GDCore/BuiltinExtensions/JoystickExtension.cpp
View File

@@ -27,7 +27,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsJoystickExtension(gd::P
"res/conditions/joystick24.png",
"res/conditions/joystick.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("expression", _("Joystick number ( First joystick: 0 )"), "",false)
.AddParameter("expression", _("Joystick number (first joystick: 0)"), "",false)
.AddParameter("expression", _("Button"), "",false);
extension.AddCondition("JoystickAxis",
@@ -38,7 +38,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsJoystickExtension(gd::P
"res/conditions/joystick24.png",
"res/conditions/joystick.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("expression", _("Joystick number ( First joystick: 0 )"), "",false)
.AddParameter("expression", _("Joystick number (first joystick: 0)"), "",false)
.AddParameter("joyaxis", _("Axis"), "",false)
.AddParameter("relationalOperator", _("Sign of the test"), "",false)
.AddParameter("expression", _("Value to test"), "",false)
@@ -46,13 +46,13 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsJoystickExtension(gd::P
extension.AddAction("GetJoystickAxis",
_("Get the value of the axis of a joystick"),
_("Save in the variable the value of the axis of the joystick ( from -100 to 100 )."),
_("Save in the variable the value of the axis of the joystick (from -100 to 100)."),
_("Save in _PARAM3_ the value of axis _PARAM2_ of joystick _PARAM1_"),
_("Joystick"),
"res/actions/joystick24.png",
"res/actions/joystick.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("expression", _("Joystick number ( First joystick: 0 )"), "",false)
.AddParameter("expression", _("Joystick number (first joystick: 0)"), "",false)
.AddParameter("joyaxis", _("Axis"), "",false)
.AddParameter("scenevar", _("Save result to scene variable"), "",false)
.SetManipulatedType("number");
@@ -64,7 +64,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsJoystickExtension(gd::P
"res/conditions/joystick.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("expression", _("Joystick number ( First joystick: 0 )"), "",false)
.AddParameter("expression", _("Joystick number (first joystick: 0)"), "",false)
.AddParameter("joyaxis", _("Axis"), "",false);
#endif
}

10
Core/GDCore/BuiltinExtensions/MathematicalToolsExtension.cpp
View File

@@ -26,8 +26,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtens
extension.AddExpression("mod", _("Modulo"), _("x mod y"), _("Mathematical tools"), "res/mathfunction.png")
.AddParameter("expression", _("x ( as in x mod y )"))
.AddParameter("expression", _("y ( as in x mod y )"));
.AddParameter("expression", _("x (as in x mod y)"))
.AddParameter("expression", _("y (as in x mod y)"));
extension.AddExpression("min", _("Minimum of two numbers"), _("Minimum of two numbers"), _("Mathematical tools"), "res/mathfunction.png")
@@ -64,7 +64,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtens
.AddParameter("expression", _("Expression"));
extension.AddExpression("atan2", _("2 argument arctangent"), _("2 argument arctangent ( atan2 )"), _("Mathematical tools"), "res/mathfunction.png")
extension.AddExpression("atan2", _("2 argument arctangent"), _("2 argument arctangent (atan2)"), _("Mathematical tools"), "res/mathfunction.png")
.AddParameter("expression", _("Y"))
.AddParameter("expression", _("X"));
@@ -141,14 +141,14 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMathematicalToolsExtens
extension.AddExpression("pow", _("Power"), _("Raise a number to power n"), _("Mathematical tools"), "res/mathfunction.png")
.AddParameter("expression", _("Number"))
.AddParameter("expression", _("The exponent ( n in x^n )"));
.AddParameter("expression", _("The exponent (n in x^n)"));
extension.AddExpression("sec", _("Secant"), _("Secant"), _("Mathematical tools"), "res/mathfunction.png")
.AddParameter("expression", _("Expression"));
extension.AddExpression("sign", _("Sign of a number"), _("Return the sign of a number ( 1,-1 or 0 )"), _("Mathematical tools"), "res/mathfunction.png")
extension.AddExpression("sign", _("Sign of a number"), _("Return the sign of a number (1,-1 or 0)"), _("Mathematical tools"), "res/mathfunction.png")
.AddParameter("expression", _("Expression"));

16
Core/GDCore/BuiltinExtensions/MouseExtension.cpp
View File

@@ -122,8 +122,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(gd::Plat
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("relationalOperator", _("Sign of the test"))
.AddParameter("expression", _("X position"))
.AddParameter("layer", _("Layer ( Base layer if empty )"), "", true).SetDefaultValue("\"\"")
.AddParameter("expression", _("Camera number ( default : 0 )"), "", true).SetDefaultValue("0")
.AddParameter("layer", _("Layer (base layer if empty)"), "", true).SetDefaultValue("\"\"")
.AddParameter("expression", _("Camera number (default : 0)"), "", true).SetDefaultValue("0")
.SetManipulatedType("number");
extension.AddCondition("SourisY",
@@ -136,8 +136,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(gd::Plat
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("relationalOperator", _("Sign of the test"))
.AddParameter("expression", _("Y position"))
.AddParameter("layer", _("Layer ( Base layer if empty )"), "", true).SetDefaultValue("\"\"")
.AddParameter("expression", _("Camera number ( default : 0 )"), "", true).SetDefaultValue("0")
.AddParameter("layer", _("Layer (base layer if empty)"), "", true).SetDefaultValue("\"\"")
.AddParameter("expression", _("Camera number (default : 0)"), "", true).SetDefaultValue("0")
.SetManipulatedType("number");
extension.AddCondition("SourisBouton",
@@ -173,8 +173,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(gd::Plat
.AddParameter("expression", _("Touch identifier"))
.AddParameter("relationalOperator", _("Sign of the test"))
.AddParameter("expression", _("X position"))
.AddParameter("layer", _("Layer ( Base layer if empty )"), "", true).SetDefaultValue("\"\"")
.AddParameter("expression", _("Camera number ( default : 0 )"), "", true).SetDefaultValue("0")
.AddParameter("layer", _("Layer (base layer if empty)"), "", true).SetDefaultValue("\"\"")
.AddParameter("expression", _("Camera number (default : 0)"), "", true).SetDefaultValue("0")
.SetManipulatedType("number");
extension.AddCondition("TouchY",
@@ -188,8 +188,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsMouseExtension(gd::Plat
.AddParameter("expression", _("Touch identifier"))
.AddParameter("relationalOperator", _("Sign of the test"))
.AddParameter("expression", _("X position"))
.AddParameter("layer", _("Layer ( Base layer if empty )"), "", true).SetDefaultValue("\"\"")
.AddParameter("expression", _("Camera number ( default : 0 )"), "", true).SetDefaultValue("0")
.AddParameter("layer", _("Layer (base layer if empty)"), "", true).SetDefaultValue("\"\"")
.AddParameter("expression", _("Camera number (default : 0)"), "", true).SetDefaultValue("0")
.SetManipulatedType("number");
extension.AddCondition("PopStartedTouch",

10
Core/GDCore/BuiltinExtensions/NetworkExtension.cpp
View File

@@ -26,7 +26,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsNetworkExtension(gd::Pl
_("Network"),
"res/actions/net24.png",
"res/actions/net.png")
.AddParameter("string", _(".php page URL ( Don't forget the protocol http:// ) "), "",false)
.AddParameter("string", _(".php page URL (don't forget the protocol http://)"), "",false)
.AddParameter("password", _("Password"), "", false)
.AddParameter("string", _("Data 1"), "", false)
.AddParameter("string", _("Data 2"), "", true)
@@ -38,12 +38,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsNetworkExtension(gd::Pl
extension.AddAction("SendRequest",
_("Send a request to a web page"),
_("Send a request to the specified web page.\n\nPlease note that for the web platform games, the game must be hosted on the same host as specified below, except if the server is configured to answer to all requests ( Cross-domain requests ). "),
_("Send a request to the specified web page.\n\nPlease note that for the web platform games, the game must be hosted on the same host as specified below, except if the server is configured to answer to all requests (cross-domain requests)."),
_("Send _PARAM3_ request to _PARAM0__PARAM1_ with body: _PARAM2_"),
_("Network"),
"res/actions/net24.png",
"res/actions/net.png")
.AddParameter("string", _("Host (Example: http://www.some-server.org/)"), "", false )
.AddParameter("string", _("Host (example: http://www.some-server.org/)"), "", false )
.AddParameter("string", _("Path to page (Example: /page.php)"), "", false )
.AddParameter("string", _("Request body content"), "", false )
.AddParameter("string", _("Method: \"POST\" or \"GET\" (if empty, GET will be used)"), "", true ).SetDefaultValue("\"GET\"")
@@ -58,8 +58,8 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsNetworkExtension(gd::Pl
_("Network"),
"res/actions/net24.png",
"res/actions/net.png")
.AddParameter("string", _("Host ( For example : http://www.website.com )"), "",false)
.AddParameter("string", _("Path to file ( For example : /folder/file.txt )"), "",false)
.AddParameter("string", _("Host (for example : http://www.website.com)"), "",false)
.AddParameter("string", _("Path to file (for example : /folder/file.txt)"), "",false)
.AddParameter("string", _("Save as"), "",false);
extension.AddAction("JSONToVariableStructure",

65
Core/GDCore/BuiltinExtensions/SpriteExtension/Sprite.h
View File

@@ -18,9 +18,10 @@ namespace gd
{
/**
* \brief Represents a sprite to be included in a Direction and to display on the screen
* \brief Represents a sprite to be displayed on the screen.
*
* A sprite contains a SFML sprite to be displayed, some points, and can also have its own image ( rather than a image from ImageManager ).
* A sprite contains a SFML sprite to be displayed, some points,
* and can also have its own texture (rather than a texture from ImageManager).
*
* \see Direction
* \see SpriteObject
@@ -33,22 +34,22 @@ public:
virtual ~Sprite();
/**
* Change the name of the Sprite's image
* \brief Change the name of the sprite image.
*/
inline void SetImageName(const gd::String & image_) { image = image_; }
/**
* Get the name of the Sprite's image
* \brief Get the name of the sprite image.
*/
inline const gd::String & GetImageName() const { return image; }
/**
* Get a reference to the name of the image
* \brief Get the name of the sprite image.
*/
inline gd::String & GetImageName() { return image; }
/**
* Get the collision mask ( custom or automatically generated owing to IsCollisionMaskAutomatic() )
* \brief Get the collision mask (custom or automatically generated owing to IsCollisionMaskAutomatic())
*
* \warning If the image has not been loaded ( using LoadImage ) and the collision mask is set as automatic,
* the returned mask won't be correct.
@@ -56,89 +57,89 @@ public:
std::vector<Polygon2d> GetCollisionMask() const;
/**
* Set the custom collision mask.
* Call then SetCollisionMaskAutomatic() to use it.
* \brief Set the custom collision mask.
* Call then `SetCollisionMaskAutomatic(false)` to use it.
*/
void SetCustomCollisionMask(const std::vector<Polygon2d> & collisionMask);
/**
* Return true if the collision mask is a bounding box, false if a custom collision mask is used.
* \brief Return true if the collision mask is a bounding box, false if a custom collision mask is used.
*/
inline bool IsCollisionMaskAutomatic() const { return automaticCollisionMask; }
/**
* Un/Set use of the custom collision mask.
* \brief Un/set use of the custom collision mask.
*/
inline void SetCollisionMaskAutomatic(bool enabled) { automaticCollisionMask = enabled; };
/**
* Return all points without origin and center
* \brief Return all points, excluding origin and center.
*/
inline std::vector < Point > & GetAllNonDefaultPoints() { return points; }
/**
* Return all points without origin and center
* \brief Return all points, excluding origin and center.
*/
inline const std::vector < Point > & GetAllNonDefaultPoints() const { return points; }
/**
* Add a point
* \brief Add a point
*/
void AddPoint( const Point & point );
/**
* Delete point with the specified name
* \brief Delete a point
*/
void DelPoint( const gd::String & name );
/**
* Return point with name passed in argument
* \brief Get the specified point.
*/
const Point & GetPoint( const gd::String & name) const;
/**
* Return point with name passed in argument
* \brief Get the specified point.
*/
Point & GetPoint(const gd::String & name);
/**
* Return true if the point exists.
* \brief Return true if the point exists.
*/
bool HasPoint( const gd::String & name ) const;
/**
* Return Origin point.
* \brief Return Origin point.
*/
inline const Point & GetOrigin() const { return origine; }
/**
* Return Origin point.
* \brief Return Origin point.
*/
inline Point & GetOrigin() { return origine; }
/**
* Return Centre point.
* \brief Return Center point.
*
* \warning If the image has not been loaded ( using LoadImage ) and the center point is set as automatic,
* \warning If the image has not been loaded (using LoadImage) and the center point is set as automatic,
* the returned point won't be correct.
*/
inline const Point & GetCenter() const { return centre; }
/**
* Return Centre point.
* \brief Return Center point.
*
* \warning If the image has not been loaded ( using LoadImage ) and the center point is set as automatic,
* \warning If the image has not been loaded (using LoadImage) and the center point is set as automatic,
* the returned point won't be correct.
*/
inline Point & GetCenter() { automaticCentre = false; return centre; }
/**
* Return true if the center point is automatically computed
* \brief Return true if the center point is automatically computed.
*/
inline bool IsDefaultCenterPoint() const { return automaticCentre; }
/**
* Un/Set automatic centre
* \brief Un/set center as being automatically computed.
*/
bool SetDefaultCenterPoint(bool enabled);
@@ -148,33 +149,33 @@ public:
*/
///@{
/**
* Get the SFML Sprite associated with the Sprite
* \brief Get the SFML sprite associated with the sprite
*/
inline const sf::Sprite & GetSFMLSprite() const { return sfmlSprite; }
/**
* Get the SFML Sprite associated with the Sprite
* \brief Get the SFML sprite associated with the sprite
*/
inline sf::Sprite & GetSFMLSprite() { return sfmlSprite; }
/**
* Set a new image to the Sprite
* \brief Set the SFML texture of the sprite
*/
void LoadImage(std::shared_ptr<SFMLTextureWrapper> image);
/**
* Get SFML Image used by the sprite
* \brief Get SFML texture used by the sprite
*/
std::shared_ptr<SFMLTextureWrapper> GetSFMLTexture() { return sfmlImage; };
/**
* Get SFML Image used by the sprite
* \brief Get SFML texture used by the sprite
*/
const std::shared_ptr<SFMLTextureWrapper> GetSFMLTexture() const { return sfmlImage; };
/**
* Make the sprite, if it uses an image from ImageManager,
* copy this image and own it inside.
* \brief Make the sprite, if it uses a texture from ImageManager,
* copy this texture and take ownership of it.
*/
void MakeSpriteOwnsItsImage();
///@}

2
Core/GDCore/BuiltinExtensions/SpriteExtension/SpriteExtension.cpp
View File

@@ -296,7 +296,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsSpriteExtension(gd::Pla
.AddParameter("object", _("Object"), "Sprite", false)
.AddParameter("relationalOperator", _("Sign of the test"), "",false)
.AddParameter("expression", _("Value to test ( 0 : Alpha, 1 : Add, 2 : Multiply, 3 : None )"), "",false)
.AddParameter("expression", _("Value to test (0: Alpha, 1: Add, 2: Multiply, 3: None)"), "",false)
.MarkAsAdvanced()
.SetManipulatedType("number");

12
Core/GDCore/BuiltinExtensions/StringInstructionsExtension.cpp
View File

@@ -32,7 +32,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsStringInstructionsExten
"res/conditions/toujours24.png")
.AddParameter("string", _("Text"), "",false)
.AddParameter("expression", _("Start position of the portion ( The first letter is at position 0 )"), "",false)
.AddParameter("expression", _("Start position of the portion (the first letter is at position 0)"), "",false)
.AddParameter("expression", _("Length of the portion"), "",false);
extension.AddStrExpression("StrAt",
@@ -42,7 +42,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsStringInstructionsExten
"res/conditions/toujours24.png")
.AddParameter("string", _("Text"), "",false)
.AddParameter("expression", _("Position of the character ( The first letter is at position 0 )"), "",false);
.AddParameter("expression", _("Position of the character (the first letter is at position 0)"), "",false);
extension.AddExpression("StrLength",
_("Length of a text"),
@@ -56,7 +56,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsStringInstructionsExten
extension.AddExpression("StrFind",
_("Search in a text"),
_("Search in a text ( Return the position of the result or -1 if not found )"),
_("Search in a text (return the position of the result or -1 if not found)"),
_("Manipulation on text"),
"res/conditions/toujours24.png")
@@ -67,7 +67,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsStringInstructionsExten
extension.AddExpression("StrRFind",
_("Search in a text from end"),
_("Search in a text from the end ( Return the position of the result or -1 if not found )"),
_("Search in a text from the end (return the position of the result or -1 if not found)"),
_("Manipulation on text"),
"res/conditions/toujours24.png")
@@ -78,7 +78,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsStringInstructionsExten
extension.AddExpression("StrFindFrom",
_("Search in a text, starting from a position"),
_("Search in a text starting from a position ( Return the position of the result or -1 if not found )"),
_("Search in a text starting from a position (return the position of the result or -1 if not found)"),
_("Manipulation on text"),
"res/conditions/toujours24.png")
@@ -90,7 +90,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsStringInstructionsExten
extension.AddExpression("StrRFindFrom",
_("Search in a text from the end, starting from a position"),
_("Search in a text from the end, starting from a position ( Return the position of the result or -1 if not found )"),
_("Search in a text from the end, starting from a position (return the position of the result or -1 if not found)"),
_("Manipulation on text"),
"res/conditions/toujours24.png")

6
Core/GDCore/BuiltinExtensions/WindowExtension.cpp
View File

@@ -22,7 +22,7 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(gd::Pla
extension.AddAction("EcrireTexte",
_("Display a text"),
_("Display the specified text to screen"),
_("Display _PARAM1_ at _PARAM2_;_PARAM3_ ( color : _PARAM4_ , size : _PARAM5_, font : _PARAM6_ )"),
_("Display _PARAM1_ at _PARAM2_;_PARAM3_ (color: _PARAM4_ , size: _PARAM5_, font: _PARAM6_)"),
_("Scene"),
"res/actions/texte24.png",
"res/actions/texte.png")
@@ -34,12 +34,12 @@ void GD_CORE_API BuiltinExtensionsImplementer::ImplementsWindowExtension(gd::Pla
.AddParameter("color", _("Color"), "",false)
.AddParameter("expression", _("Size"), "",false)
.AddParameter("police", _("Font"), "",true)
.AddParameter("layer", _("Layer ( Base layer if empty )"), "",true).SetDefaultValue("\"\"");
.AddParameter("layer", _("Layer (base layer if empty)"), "",true).SetDefaultValue("\"\"");
extension.AddAction("SetFullScreen",
_("De/activate fullscreen"),
_("This action activate or desactivate fullscreen."),
_("Activate fullscreen: _PARAM1_ (Keep aspect ratio: _PARAM2_)"),
_("Activate fullscreen: _PARAM1_ (keep aspect ratio: _PARAM2_)"),
_("Game's window"),
"res/actions/fullscreen24.png",
"res/actions/fullscreen.png")

16
GDJS/GDJS/BuiltinExtensions/CameraExtension.cpp
View File

@@ -56,7 +56,7 @@ CameraExtension::CameraExtension()
"res/actions/camera24.png",
"res/actions/camera.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("layer", _("Layer ( Base layer if empty )"), "",false).SetDefaultValue("\"\"")
.AddParameter("layer", _("Layer (base layer if empty)"), "",false).SetDefaultValue("\"\"")
.AddParameter("expression", _("Width"), "",true)
.AddParameter("expression", _("Height"), "",true)
.AddParameter("expression", _("Render zone: Top left side: X Position ( Between 0 and 1 )"), "",true)
@@ -73,7 +73,7 @@ CameraExtension::CameraExtension()
"res/actions/camera24.png",
"res/actions/camera.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("layer", _("Layer ( Base layer if empty )"), "",false).SetDefaultValue("\"\"")
.AddParameter("layer", _("Layer (base layer if empty)"), "",false).SetDefaultValue("\"\"")
.AddParameter("expression", _("Camera number"), "",false)
.SetFunctionName("DeleteCamera").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h");
@@ -85,7 +85,7 @@ CameraExtension::CameraExtension()
"res/actions/camera24.png",
"res/actions/camera.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("layer", _("Layer ( Base layer if empty )"), "",false).SetDefaultValue("\"\"")
.AddParameter("layer", _("Layer (base layer if empty)"), "",false).SetDefaultValue("\"\"")
.AddParameter("expression", _("Camera number"), "",false)
.AddParameter("expression", _("Width"), "",false)
.AddParameter("expression", _("Height"), "",false)
@@ -99,7 +99,7 @@ CameraExtension::CameraExtension()
"res/actions/camera24.png",
"res/actions/camera.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("layer", _("Layer ( Base layer if empty )"), "",false).SetDefaultValue("\"\"")
.AddParameter("layer", _("Layer (base layer if empty)"), "",false).SetDefaultValue("\"\"")
.AddParameter("expression", _("Camera number"), "",false)
.AddParameter("expression", _("Render zone: Top left side: X Position ( Between 0 and 1 )"), "",false)
.AddParameter("expression", _("Render zone: Top left side: X Position ( Between 0 and 1 )"), "",false)
@@ -110,28 +110,28 @@ CameraExtension::CameraExtension()
AddExpression("CameraViewportLeft", _("X position of the top left side point of a render zone"), _("X position of the top left side point of a render zone"), _("Camera"), "res/actions/camera.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("layer", _("Layer"), "",false)
.AddParameter("expression", _("Camera number ( default : 0 )"), "",false).SetDefaultValue("0")
.AddParameter("expression", _("Camera number (default : 0)"), "",false).SetDefaultValue("0")
.SetFunctionName("GetCameraViewportLeft").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h");
AddExpression("CameraViewportTop", _("Y position of the top left side point of a render zone"), _("Y position of the top left side point of a render zone"), _("Camera"), "res/actions/camera.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("layer", _("Layer"), "",false)
.AddParameter("expression", _("Camera number ( default : 0 )"), "",false).SetDefaultValue("0")
.AddParameter("expression", _("Camera number (default : 0)"), "",false).SetDefaultValue("0")
.SetFunctionName("GetCameraViewportTop").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h");
AddExpression("CameraViewportRight", _("X position of the bottom right side point of a render zone"), _("X position of the bottom right side point of a render zone"), _("Camera"), "res/actions/camera.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("layer", _("Layer"), "",false)
.AddParameter("expression", _("Camera number ( default : 0 )"), "",false).SetDefaultValue("0")
.AddParameter("expression", _("Camera number (default : 0)"), "",false).SetDefaultValue("0")
.SetFunctionName("GetCameraViewportRight").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h");
AddExpression("CameraViewportBottom", _("Y position of the bottom right side point of a render zone"), _("Y position of the bottom right side point of a render zone"), _("Camera"), "res/actions/camera.png")
.AddCodeOnlyParameter("currentScene", "")
.AddParameter("layer", _("Layer"), "",false)
.AddParameter("expression", _("Camera number ( default : 0 )"), "",false).SetDefaultValue("0")
.AddParameter("expression", _("Camera number (default : 0)"), "",false).SetDefaultValue("0")
.SetFunctionName("GetCameraViewportBottom").SetIncludeFile("GDCpp/BuiltinExtensions/RuntimeSceneCameraTools.h");

2
IDE/MainFrame.cpp
View File

@@ -348,7 +348,7 @@ MainFrame::MainFrame( wxWindow* parent ) :
static int widths[2] = { -1, 175 };
statusBar->SetFieldsCount(2);
statusBar->SetStatusWidths(2, widths);
statusBar->SetStatusText( "2008-2014", 1 );
statusBar->SetStatusText( "2008-2015", 1 );
SetStatusBar(statusBar);
std::vector<wxWindow*> controlsToBeDisabledOnPreview; //Used below:

4
scripts/source.pot
View File

@@ -15247,7 +15247,7 @@ msgstr ""
#: ../Core/GDCore/BuiltinExtensions/MouseExtension.cpp:176
#: ../Core/GDCore/BuiltinExtensions/MouseExtension.cpp:191
#: ../Core/GDCore/BuiltinExtensions/WindowExtension.cpp:37
msgid "Layer ( Base layer if empty )"
msgid "Layer (base layer if empty)"
msgstr ""
#: ../Core/GDCore/BuiltinExtensions/BaseObjectExtension.cpp:678
@@ -15434,7 +15434,7 @@ msgstr ""
#: ../Core/GDCore/BuiltinExtensions/MouseExtension.cpp:140
#: ../Core/GDCore/BuiltinExtensions/MouseExtension.cpp:177
#: ../Core/GDCore/BuiltinExtensions/MouseExtension.cpp:192
msgid "Camera number ( default : 0 )"
msgid "Camera number (default : 0)"
msgstr ""
#: ../Core/GDCore/BuiltinExtensions/CameraExtension.cpp:38