Merge 35b9673ce6 into 4733b7e1c9

.github/workflows/external.yml

@@ -1,11 +1,13 @@
-name: CI
+name: External Branch Build
+
 on:
   push:
-    branches:
+    branches-ignore:
-    - '*'
+      - main
   pull_request:
     branches:
     - '*'
+
 concurrency: ci-${{ github.ref }}
 jobs:
   build:
@@ -19,9 +21,10 @@ jobs:
     - name: Install WinLibs
       run: choco install winlibs -y --no-progress
     - name: Install Qt
-      uses: jurplel/install-qt-action@v2
+      uses: jurplel/install-qt-action@v3
       with:
         arch: win64_mingw81
+        cache: true
     - name: Run CMake
       run: |
         set PATH=C:\ProgramData\chocolatey\lib\winlibs\tools\mingw64\bin;%PATH%
@@ -36,7 +39,6 @@ jobs:
       run: |
         $src = Resolve-Path "${env:Qt5_DIR}\bin"
         $dest = "_Build\_Gcc\_bin"
-
         Copy-Item "${src}\libwinpthread-1.dll" -Destination $dest
         Copy-Item "${src}\libstdc++-6.dll" -Destination $dest
         Copy-Item "${src}\libgcc_s_seh-1.dll" -Destination $dest

.github/workflows/main.yml

@@ -0,0 +1,60 @@
+name: Main Compilation
+
+on:
+  push:
+    branches: [ "main" ]
+    
+env:
+  major: 0
+  minor: 2
+  version: v${{ env.major }}.${{ env.minor }}.${{ github.run_number }}
+
+concurrency: ci-${{ github.ref }}
+jobs:
+  build:
+    name: Build
+    runs-on: windows-2022
+    steps:
+    - name: Checkout source
+      uses: actions/checkout@v3
+      with:
+        lfs: true
+    - name: Install WinLibs
+      run: choco install winlibs -y --no-progress
+    - name: Install Qt
+      uses: jurplel/install-qt-action@v3
+      with:
+        arch: win64_mingw81
+        cache: true
+    - name: Run CMake
+      run: |
+        set PATH=C:\ProgramData\chocolatey\lib\winlibs\tools\mingw64\bin;%PATH%
+        cmake_EclipseMinGW.bat 4 _Gcc
+      working-directory: _Build
+      shell: cmd
+    - name: Build
+      run: _build.bat
+      working-directory: _Build/_Gcc
+      shell: cmd
+    - name: Copy Qt dependency DLLs
+      run: |
+        $src = Resolve-Path "${env:Qt5_DIR}\bin"
+        $dest = "_Build\_Gcc\_bin"
+        Copy-Item "${src}\libwinpthread-1.dll" -Destination $dest
+        Copy-Item "${src}\libstdc++-6.dll" -Destination $dest
+        Copy-Item "${src}\libgcc_s_seh-1.dll" -Destination $dest
+    - name: ZIP Kyty
+      uses: TheDoctor0/zip-release@main
+      with:
+        type: 'zip'
+        path: .\_Build\_Gcc\_bin\*
+        filename: Kyty-${{ env.version }}.zip
+      
+    - name: GH Release
+      uses: ncipollo/release-action@v1
+      with:
+        artifacts: "Kyty-${{ env.version }}.zip"
+        generateReleaseNotes: true
+        name: Release ${{ env.version }}
+        tag: ${{ env.version }}
+        token: ${{ secrets.GITHUB_TOKEN }}

source/launcher/forms/configuration_edit_dialog.ui

@@ -268,7 +268,7 @@
           <item row="1" column="0">
            <widget class="QLabel" name="label_16">
             <property name="text">
-             <string>Screen resoultion:</string>
+             <string>Screen resolution:</string>
             </property>
            </widget>
           </item>
@@ -289,7 +289,7 @@
           <item row="2" column="1">
            <widget class="QComboBox" name="comboBox_shader_optimization_type">
             <property name="toolTip">
-             <string>Optimize shaders for code size or performance</string>
+             <string>Optimize shaders for code size or May decrease performance if enabled.</string>
             </property>
            </widget>
           </item>
@@ -303,7 +303,7 @@
           <item row="3" column="1">
            <widget class="QComboBox" name="comboBox_shader_log_direction">
             <property name="toolTip">
-             <string>Dump shaders to file or console window. If enabled may decrease emulator performance</string>
+             <string>Dump shaders to file or console window. May decrease performance if enabled.</string>
             </property>
            </widget>
           </item>
@@ -351,7 +351,7 @@
           <item row="6" column="1">
            <widget class="QComboBox" name="comboBox_printf_direction">
             <property name="toolTip">
-             <string>Print logs to file or console window. If enabled may decrease emulator performance</string>
+             <string>Print logs to file or console window. May decrease performance if enabled.</string>
             </property>
            </widget>
           </item>
@@ -382,7 +382,7 @@
           <item row="8" column="1">
            <widget class="QComboBox" name="comboBox_profiler_direction">
             <property name="toolTip">
-             <string>Enable/disable profiler. If enabled may decrease emulator performance</string>
+             <string>Enable/disable profiler. May decrease performance if enabled.</string>
             </property>
            </widget>
           </item>

source/launcher/ts/launcher_ru_RU.ts

@@ -36,7 +36,7 @@
     </message>
     <message>
         <location filename="../forms/configuration_edit_dialog.ui" line="271"/>
-        <source>Screen resoultion:</source>
+        <source>Screen resolution:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -106,7 +106,7 @@
     </message>
     <message>
         <location filename="../forms/configuration_edit_dialog.ui" line="306"/>
-        <source>Dump shaders to file or console window. If enabled may decrease emulator performance</source>
+        <source>Dump shaders to file or console window. May decrease performance if enabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -121,7 +121,7 @@
     </message>
     <message>
         <location filename="../forms/configuration_edit_dialog.ui" line="354"/>
-        <source>Print logs to file or console window. If enabled may decrease emulator performance</source>
+        <source>Print logs to file or console window. May decrease performance if enabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -131,7 +131,7 @@
     </message>
     <message>
         <location filename="../forms/configuration_edit_dialog.ui" line="385"/>
-        <source>Enable/disable profiler. If enabled may decrease emulator performance</source>
+        <source>Enable/disable profiler. May decrease performance if enabled.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>