Merge branch 'master' into electron-32

Author: arthuro555

Extensions/Spine/CMakeLists.txt

@@ -1,20 +1,23 @@
-cmake_minimum_required(VERSION 2.6)
-cmake_policy(SET CMP0015 NEW)
+cmake_minimum_required(VERSION 3.5)
 
 project(SpineObject)
 gd_add_extension_includes()
 
-#Defines
-###
+# Defines
+#
 gd_add_extension_definitions(SpineObject)
 
-#The targets
-###
+# The targets
+#
 include_directories(.)
-file(GLOB source_files *.cpp *.h)
+file(
+  GLOB
+  source_files
+  *.cpp
+  *.h)
 gd_add_clang_utils(SpineObject "${source_files}")
 gd_add_extension_target(SpineObject "${source_files}")
 
-#Linker files for the IDE extension
-###
+# Linker files for the IDE extension
+#
 gd_extension_link_libraries(SpineObject)

GDevelop.js/scripts/generate-dts.mjs

@@ -262,6 +262,7 @@ for (const [
       attributes.push(
         `${attributeName}${optionalReturn ? '?' : ''}: ${returnType};`
       );
+      Parser.skipWhitespaces();
       continue;
     }
 

README.md

@@ -1,8 +1,8 @@
-![GDevelop logo](https://raw.githubusercontent.com/4ian/GDevelop/master/newIDE/GDevelop%20banner.png 'GDevelop logo')
+![GDevelop logo](https://raw.githubusercontent.com/4ian/GDevelop/master/newIDE/GDevelop%20banner.png "GDevelop logo")
 
 GDevelop is a **full-featured, no-code, open-source** game development software. You can build **2D, 3D and multiplayer games** for mobile (iOS, Android), desktop and the web. GDevelop is fast and easy to use: the game logic is built up using an intuitive and powerful event-based system and reusable behaviors.
 
-![The GDevelop editor when editing a game level](https://raw.githubusercontent.com/4ian/GDevelop/master/newIDE/GDevelop%20screenshot.png 'The GDevelop editor when editing a game level')
+![The GDevelop editor when editing a game level](https://raw.githubusercontent.com/4ian/GDevelop/master/newIDE/GDevelop%20screenshot.png "The GDevelop editor when editing a game level")
 
 ## Getting started
 
@@ -13,7 +13,7 @@ GDevelop is a **full-featured, no-code, open-source** game development software.
 | 🧑‍💻 Contribute to the editor or game engine        | Follow this [README](newIDE/README.md).                                                                                                                           |
 | 👾 Create or sell a game template                 | Submit a [free example or a paid template on the Asset Store](https://wiki.gdevelop.io/gdevelop5/community/guide-for-submitting-an-example/).                     |
 | 🎨 Share or sell an asset pack                    | Submit a [free or paid asset pack on the Asset Store](https://wiki.gdevelop.io/gdevelop5/community/sell-asset-pack-store).                                        |
-| 🌐 Help to translate GDevelop                     | Go on the [GDevelop project on Crowdin](https://crowdin.com/project/gdevelop) or translate [in-app tutorials](https://github.com/GDevelopApp/GDevelop-tutorials). |
+| 🌐 Help translate GDevelop                        | Go on the [GDevelop project on Crowdin](https://crowdin.com/project/gdevelop) or translate [in-app tutorials](https://github.com/GDevelopApp/GDevelop-tutorials). |
 | 👥 Get online game services or commercial support | See offers for [professionals, teams or individual creators](https://gdevelop.io/pricing).                                                                        |
 
 > Are you interested in contributing to GDevelop for the first time? Take a look at the list of **[good first issues](https://github.com/4ian/GDevelop/issues?q=is%3Aissue+is%3Aopen+label%3A%22%F0%9F%91%8Cgood+first+issue%22)**, **[good first contributions](https://github.com/4ian/GDevelop/discussions/categories/good-first-contribution)** or the **["🏐 not too hard" cards](https://trello.com/b/qf0lM7k8/gdevelop-roadmap?menu=filter&filter=label:Not%20too%20hard%20%E2%9A%BD%EF%B8%8F)** on the Roadmap.
@@ -24,7 +24,7 @@ GDevelop is a **full-featured, no-code, open-source** game development software.
 - See the [showcase of games](https://gdevelop.io/games) created with GDevelop and published on Steam, iOS (App Store), Android (Google Play), Itch.io, Newgrounds, CrazyGames, Poki...
   - Suggest your game to be [added to the showcase here](https://docs.google.com/forms/d/e/1FAIpQLSfjiOnkbODuPifSGuzxYY61vB5kyMWdTZSSqkJsv3H6ePRTQA/viewform).
 
-[![Some games made with GDevelop](https://raw.githubusercontent.com/4ian/GDevelop/master/newIDE/GDevelop%20games.png 'Some games made with GDevelop')](https://gdevelop.io/games)
+[![Some games made with GDevelop](https://raw.githubusercontent.com/4ian/GDevelop/master/newIDE/GDevelop%20games.png "Some games made with GDevelop")](https://gdevelop.io/games)
 
 ## Technical architecture
 

newIDE/app/scripts/import-zipped-editor.js

@@ -4,7 +4,6 @@
  * The zip should be uploaded with one of the git releases (use gitRelease variable for version where you released it)
  */
 var shell = require('shelljs');
-var fs = require('fs');
 var AdmZip = require('adm-zip');
 var process = require('process');
 var path = require('path');

newIDE/app/src/Credits/CreditsPackagesDialog.js

@@ -289,6 +289,10 @@ const CreditsPackagesDialog = ({
                   this guide
                 </Link>{' '}
                 to help you decide.
+              </Trans>{' '}
+              <Trans>
+                Follow GDevelop on socials and check your profile to get some
+                free credits!
               </Trans>
             </BackgroundText>
           </ColumnStackLayout>

newIDE/app/src/MainFrame/EditorContainers/AskAi/AiRequestChat.js

@@ -148,10 +148,14 @@ export const AiRequestChat = React.forwardRef<Props, AiRequestChatInterface>(
     const { isMobile } = useResponsiveWindowSize();
 
     const quotaOrCreditsExplanation = !quota ? null /* User is probably not even logged in. */ : !quota.limitReached ? (
-      quota.current < 1 || increaseQuotaOffering === 'subscribe' ? null : (
+      increaseQuotaOffering === 'subscribe' ? (
         <Trans>
-          You still have {quota.max - quota.current} free questions thanks to
-          your membership.
+          You still have {quota.max - quota.current} free answers from the AI.
+        </Trans>
+      ) : (
+        <Trans>
+          You still have {quota.max - quota.current} free answers with your
+          membership (refreshed every month).
         </Trans>
       )
     ) : aiRequestPriceInCredits ? (

newIDE/app/src/MainFrame/EditorContainers/AskAi/DislikeFeedbackDialog.js

@@ -88,6 +88,16 @@ export const DislikeFeedbackDialog = ({
             control={<Radio color="secondary" />}
             label={<Trans>The answer is out of scope for GDevelop</Trans>}
           />
+          <FormControlLabel
+            value="too-short"
+            control={<Radio color="secondary" />}
+            label={<Trans>The answer is too short</Trans>}
+          />
+          <FormControlLabel
+            value="too-long"
+            control={<Radio color="secondary" />}
+            label={<Trans>The answer is too long</Trans>}
+          />
           <FormControlLabel
             value="other"
             control={<Radio color="secondary" />}

newIDE/app/src/MainFrame/EditorContainers/HomePage/SectionContainer.js

@@ -124,7 +124,7 @@ const SectionContainer = React.forwardRef<Props, HTMLDivElement>(
     const shouldHideAnnouncements =
       !!authenticatedUser.limits &&
       !!authenticatedUser.limits.capabilities.classrooms &&
-      !!authenticatedUser.limits.capabilities.classrooms.hidePlayTab;
+      authenticatedUser.limits.capabilities.classrooms.hideAnnouncements;
 
     return (
       <Column expand useFullHeight noMargin>

newIDE/app/src/MainFrame/ElectronMainMenu.js

@@ -10,6 +10,7 @@ import {
   type MainMenuEvent,
 } from './MainMenu';
 import PreferencesContext from './Preferences/PreferencesContext';
+import AuthenticatedUserContext from '../Profile/AuthenticatedUserContext';
 const electron = optionalRequire('electron');
 const remote = optionalRequire('@electron/remote');
 const app = remote ? remote.app : null;
@@ -102,6 +103,12 @@ const ElectronMainMenu = ({
   const {
     values: { useShortcutToClosePreviewWindow },
   } = React.useContext(PreferencesContext);
+  const { limits } = React.useContext(AuthenticatedUserContext);
+
+  const hideAskAi =
+    !!limits &&
+    !!limits.capabilities.classrooms &&
+    limits.capabilities.classrooms.hideAskAi;
 
   useAppEventListener({
     event: 'browser-window-focus',
@@ -233,6 +240,7 @@ const ElectronMainMenu = ({
             recentProjectFiles,
             shortcutMap,
             isApplicationTopLevelMenu,
+            hideAskAi,
           })
         );
       }
@@ -245,6 +253,7 @@ const ElectronMainMenu = ({
       recentProjectFiles,
       shortcutMap,
       isApplicationTopLevelMenu,
+      hideAskAi,
     ]
   );
 

newIDE/app/src/MainFrame/MainMenu.js

@@ -23,6 +23,7 @@ export type BuildMainMenuProps = {|
   recentProjectFiles: Array<FileMetadataAndStorageProviderName>,
   shortcutMap: ShortcutMap,
   isApplicationTopLevelMenu: boolean,
+  hideAskAi: boolean,
 |};
 
 export type MainMenuCallbacks = {|
@@ -111,6 +112,7 @@ export const buildMainMenuDeclarativeTemplate = ({
   project,
   canSaveProjectAs,
   isApplicationTopLevelMenu,
+  hideAskAi,
 }: BuildMainMenuProps): Array<MenuDeclarativeItemTemplate> => {
   const fileTemplate: MenuDeclarativeItemTemplate = {
     label: i18n._(t`File`),
@@ -257,10 +259,14 @@ export const buildMainMenuDeclarativeTemplate = ({
     label: i18n._(t`Help`),
     role: 'help',
     submenu: [
-      {
-        label: i18n._(t`Ask AI (GDevelop chatbot)`),
-        onClickSendEvent: 'main-menu-open-ask-ai',
-      },
+      ...(hideAskAi
+        ? []
+        : [
+            {
+              label: i18n._(t`Ask AI (GDevelop chatbot)`),
+              onClickSendEvent: 'main-menu-open-ask-ai',
+            },
+          ]),
       {
         label: i18n._(t`GDevelop website`),
         onClickOpenLink: 'http://gdevelop.io',
@@ -323,7 +329,7 @@ export const buildMainMenuDeclarativeTemplate = ({
       },
       { type: 'separator' },
       {
-        label: i18n._(t`Help to Translate GDevelop`),
+        label: i18n._(t`Help translate GDevelop`),
         onClickOpenLink: 'https://crowdin.com/project/gdevelop',
       },
       {

newIDE/app/src/MainFrame/Preferences/LanguageSelector.js

@@ -46,23 +46,28 @@ const localesToDisplay = LocalesMetadata.filter(displayLocaleMetadata).map(
   }
 );
 const goodProgressLocales = localesToDisplay.filter(
-  localeMetadata => localeMetadata.translationRatio > 0.5
+  localeMetadata => localeMetadata.translationRatio > 0.3
 );
-const startedLocales = localesToDisplay.filter(
-  localeMetadata => localeMetadata.translationRatio < 0.5
+const incompleteLocales = localesToDisplay.filter(
+  localeMetadata => localeMetadata.translationRatio < 0.3
 );
 
 const renderLanguageSelectOption = localeMetadata => {
   const translationRatio = localeMetadata.translationRatio || 0;
   const percent = (100 * localeMetadata.translationRatio).toFixed(0);
+  const isIncomplete = translationRatio < 0.3;
   const isStarted = translationRatio > 0;
 
+  const label = !isIncomplete
+    ? `${localeMetadata.languageNativeName} (${localeMetadata.languageName})`
+    : `${localeMetadata.languageNativeName} (${
+        localeMetadata.languageName
+      } - ${percent}% translated)`;
+
   return (
     <SelectOption
       value={localeMetadata.languageCode}
-      label={`${localeMetadata.languageNativeName} (${
-        localeMetadata.languageName
-      })${isStarted ? ` - ~${percent}%` : ''}`}
+      label={label}
       disabled={!isStarted}
       key={localeMetadata.languageCode}
     />
@@ -92,7 +97,7 @@ const LanguageSelector = ({ onLanguageChanged }: Props) => {
             {goodProgressLocales.map(localeMetadata =>
               renderLanguageSelectOption(localeMetadata)
             )}
-            {startedLocales.map(localeMetadata =>
+            {incompleteLocales.map(localeMetadata =>
               renderLanguageSelectOption(localeMetadata)
             )}
           </CompactSelectField>
@@ -107,7 +112,7 @@ const LanguageSelector = ({ onLanguageChanged }: Props) => {
               Window.openExternalURL('https://crowdin.com/project/gdevelop')
             }
           >
-            help to translate GDevelop in your language
+            help translate GDevelop into your language
           </Link>
           .
         </Trans>

newIDE/app/src/MainFrame/TabsTitlebar.js

@@ -18,6 +18,7 @@ import PreferencesContext from './Preferences/PreferencesContext';
 import TextButton from '../UI/TextButton';
 import { useInterval } from '../Utils/UseInterval';
 import { useIsMounted } from '../Utils/UseIsMounted';
+import AuthenticatedUserContext from '../Profile/AuthenticatedUserContext';
 
 const WINDOW_DRAGGABLE_PART_CLASS_NAME = 'title-bar-draggable-part';
 const WINDOW_NON_DRAGGABLE_PART_CLASS_NAME = 'title-bar-non-draggable-part';
@@ -109,6 +110,7 @@ export default function TabsTitlebar({
   const gdevelopTheme = React.useContext(GDevelopThemeContext);
   const backgroundColor = gdevelopTheme.titlebar.backgroundColor;
   const preferences = React.useContext(PreferencesContext);
+  const { limits } = React.useContext(AuthenticatedUserContext);
   const [tooltipData, setTooltipData] = React.useState<?{|
     element: HTMLElement,
     editorTab: EditorTab,
@@ -181,8 +183,15 @@ export default function TabsTitlebar({
     []
   );
 
+  const hideAskAi =
+    !!limits &&
+    !!limits.capabilities.classrooms &&
+    limits.capabilities.classrooms.hideAskAi;
+
   const shouldDisplayAskAi =
-    preferences.values.showAiAskButtonInTitleBar && !hasAskAiOpened;
+    preferences.values.showAiAskButtonInTitleBar &&
+    !hasAskAiOpened &&
+    !hideAskAi;
   const isAskAiIconAnimated = useIsAskAiIconAnimated(shouldDisplayAskAi);
 
   return (

newIDE/app/src/MainFrame/index.js

@@ -3616,6 +3616,10 @@ const MainFrame = (props: Props) => {
     ]
   );
 
+  const hideAskAi =
+    !!authenticatedUser.limits &&
+    !!authenticatedUser.limits.capabilities.classrooms &&
+    authenticatedUser.limits.capabilities.classrooms.hideAskAi;
   const showLoader = isProjectOpening || isLoadingProject || previewLoading;
   const shortcutMap = useShortcutMap();
   const buildMainMenuProps = {
@@ -3625,6 +3629,7 @@ const MainFrame = (props: Props) => {
     recentProjectFiles: preferences.getRecentProjectFiles({ limit: 20 }),
     shortcutMap,
     isApplicationTopLevelMenu: false,
+    hideAskAi,
   };
   const mainMenuCallbacks = {
     onChooseProject: () => openOpenFromStorageProviderDialog(),

newIDE/app/src/ObjectGroupsList/index.js

@@ -326,9 +326,9 @@ const ObjectGroupsList = React.forwardRef<Props, ObjectGroupsListInterface>(
 
         const answer = await showConfirmation({
           title: t`Set as global group`,
-          message: t`Global elements help to manage objects across multiple scenes and it is recommended for the most used objects.
-          This action cannot be undone.
-          Do you want to set as global group?`,
+          message: t`Global elements help manage objects across multiple scenes and are recommended for frequently used objects. This action cannot be undone.
+
+            Do you want to set this as global group?`,
           confirmButtonLabel: t`Set as global`,
         });
         if (!answer) return;

newIDE/app/src/ObjectsList/index.js

@@ -819,9 +819,9 @@ const ObjectsList = React.forwardRef<Props, ObjectsListInterface>(
 
         const answer = Window.showConfirmDialog(
           i18n._(
-            t`Global elements help to manage objects across multiple scenes and it is recommended for the most used objects. This action cannot be undone.
+            t`Global elements help manage objects across multiple scenes and are recommended for frequently used objects. This action cannot be undone.
 
-            Do you want to set as global object?`
+            Do you want to set this as global object?`
           )
         );
         if (!answer) return;

newIDE/app/src/UI/Text.js

@@ -109,7 +109,7 @@ const getTextColorFromColor = (color: ?TextColor) => {
 };
 
 // A Text to be displayed in the app. Prefer using this
-// than a `<p>`/`<span>` or `<div>` as this will help to maintain
+// than a `<p>`/`<span>` or `<div>` as this will help maintain
 // consistency of text in the whole app.
 const Text = React.forwardRef<Props, Interface>(
   (

newIDE/app/src/Utils/GDevelopServices/Usage.js

@@ -81,6 +81,8 @@ export type Capabilities = {|
     allowedIdPrefixes: Array<string>,
   },
   classrooms?: {
+    hideAskAi: boolean,
+    hideAnnouncements: boolean,
     hidePlayTab: boolean,
     hideSocials: boolean,
     hidePremiumProducts: boolean,

newIDE/app/src/fixtures/GDevelopServicesTestData/index.js

@@ -534,6 +534,8 @@ export const limitsForTeacherUser: Limits = {
       hideUpgradeNotice: false,
       hideSocials: false,
       showClassroomTab: true,
+      hideAskAi: false,
+      hideAnnouncements: false,
     },
     multiplayer: {
       lobbiesCount: -1,
@@ -596,6 +598,8 @@ export const limitsForStudentUser: Limits = {
       hideSocials: true,
       hideUpgradeNotice: true,
       showClassroomTab: false,
+      hideAskAi: true,
+      hideAnnouncements: true,
     },
     multiplayer: {
       lobbiesCount: -1,