mirror of
https://github.com/Heretek-AI/GDevelop.git
synced 2026-07-24 03:54:34 -04:00
c98e97e60a
Conflicts: .travis.yml Core/GDCore/BuiltinExtensions/SpriteExtension/Dialogs/SpriteObjectEditor.cpp Core/GDCore/Events/Builtin/ForEachEvent.h Core/GDCore/Events/Event.cpp Core/GDCore/Events/Event.h Core/GDCore/Events/EventMetadata.cpp Core/GDCore/Events/EventMetadata.h Core/GDCore/Events/ExpressionMetadata.h Core/GDCore/Events/Instruction.h Core/GDCore/Events/InstructionMetadata.h Core/GDCore/IDE/Dialogs/EditLayerDialog.cpp Core/GDCore/PlatformDefinition/Object.cpp Core/GDCore/PlatformDefinition/PlatformExtension.cpp Core/GDCore/PlatformDefinition/PlatformExtension.h Extensions/Function/Extension.cpp Extensions/TextObject/TextObject.h Extensions/TimedEvent/Extension.cpp GDCpp/GDCpp/BuiltinExtensions/CommonInstructionsExtension.cpp GDCpp/GDCpp/BuiltinExtensions/KeyboardTools.h GDCpp/GDCpp/BuiltinExtensions/MouseTools.h GDCpp/GDCpp/BuiltinExtensions/SceneExtension.cpp GDCpp/GDCpp/InputManager.cpp GDCpp/GDCpp/RuntimeSpriteObject.cpp GDCpp/GDCpp/RuntimeSpriteObject.h GDJS/GDJS/BuiltinExtensions/BaseObjectExtension.cpp GDJS/GDJS/BuiltinExtensions/CommonInstructionsExtension.cpp GDJS/GDJS/BuiltinExtensions/SceneExtension.cpp GDJS/GDJS/BuiltinExtensions/VariablesExtension.cpp GDJS/GDJS/Exporter.cpp GDJS/GDJS/Exporter.h IDE/Dialogs/ObjectsEditor.cpp IDE/Preferences.cpp