Merge branch 'master' into textinput

Author: AllyTally

.github/workflows/ci.yml

@@ -125,29 +125,45 @@ jobs:
         submodules: true
 
     - name: Cache SDL
-      uses: actions/cache@v2
+      id: cache-windows-sdl
+      uses: actions/cache@v3
       env:
         cache-name: cache-sdl
       with:
-        path: C:\SDL
-        key: ${{ runner.os }}-build-${{ env.cache-name }}
+        path: C:\SDL2-*
+        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ env.SDL_VERSION }}
 
-    - name: Download SDL if not cached
+    - if: ${{ steps.cache-windows-sdl.outputs.cache-hit != 'true' }}
+      name: Download SDL if not cached
       run: |
-        if (-Not (Test-Path C:\SDL))
-        {
-          Invoke-WebRequest "https://github.com/libsdl-org/SDL/releases/download/release-$env:SDL_VERSION/SDL2-devel-$env:SDL_VERSION-VC.zip" -o C:\SDL.zip
-          Expand-Archive C:\SDL.zip -DestinationPath C:\
-        }
+        Invoke-WebRequest "https://github.com/libsdl-org/SDL/releases/download/release-$env:SDL_VERSION/SDL2-devel-$env:SDL_VERSION-VC.zip" -o C:\SDL.zip
+        Expand-Archive C:\SDL.zip -DestinationPath C:\
 
-    - name: CMake configure (default version)
+    - name: Cache build folder for this CMakeLists.txt
+      id: cache-windows-build-folder
+      uses: actions/cache@v3
+      env:
+        cache-name: cache-windows-build-folder-VS2022
+      with:
+        path: |
+          desktop_version/build
+          desktop_version/CMakeLists.txt
+        key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('desktop_version/CMakeLists.txt') }}-SDL${{ env.SDL_VERSION }}
+
+    - if: ${{ steps.cache-windows-build-folder.outputs.cache-hit != 'true' }}
+      name: CMake initial configure/generate
       run: |
         mkdir $env:SRC_DIR_PATH/build
         cd $env:SRC_DIR_PATH/build
         $env:LDFLAGS =  "/LIBPATH:C:\SDL2-$env:SDL_VERSION\lib\x86 "
         cmake -G "Visual Studio 17 2022" -A Win32 `
               -DSDL2_INCLUDE_DIRS="C:\SDL2-$env:SDL_VERSION\include" `
               -DSDL2_LIBRARIES="SDL2;SDL2main" ..
+
+    - name: CMake configure (default version)
+      run: |
+        cd $env:SRC_DIR_PATH/build
+        cmake ..
     - name: Build (default version)
       run: |
         cd $env:SRC_DIR_PATH/build

desktop_version/CMakeLists.txt

@@ -71,6 +71,7 @@ endif()
 set(VVV_SRC
     src/BinaryBlob.cpp
     src/BlockV.cpp
+    src/ButtonGlyphs.cpp
     src/CWrappers.cpp
     src/Ent.cpp
     src/Entity.cpp
@@ -350,8 +351,9 @@ endif()
 
 
 if(MSVC)
-    # Statically link Microsoft's runtime library so end users don't have to install it
-    list(APPEND GLOBAL_COMPILE_FLAGS /MT)
+    # Statically link Microsoft's runtime library so end users don't have to install it (/MT)
+    # Also, build with multiple processors (/MP)
+    list(APPEND GLOBAL_COMPILE_FLAGS /MT /MP)
 endif()
 
 

desktop_version/lang/ca/cutscenes.xml

@@ -76,10 +76,11 @@
     <cutscene id="bigopenworldskip" explanation="">
         <dialogue speaker="purple" english="I&apos;ll be right here if you need any help!" translation="Si necessites ajuda, seré aquí!"/>
     </cutscene>
-    <cutscene id="talkpurple_intro" explanation="">
+    <cutscene id="talkpurple_intro" explanation="***ENTER is OUTDATED***">
         <dialogue speaker="player" english="I&apos;m feeling a bit overwhelmed, Doctor." translation="Tot això m’aclapara una mica, doctora."/>
         <dialogue speaker="player" english="Where do I begin?" translation="Per on començo?"/>
         <dialogue speaker="purple" english="Remember that you can press ENTER to check where you are on the map!" translation="Recorda que pots prémer Retorn per a veure on ets del mapa!"/>
+        <dialogue speaker="purple" english="Remember that you can press {b_map} to check where you are on the map!" translation="" buttons="1"/>
         <dialogue speaker="purple" english="Look for areas where the rest of the crew might be..." translation="Cerca zones on pugui haver-hi altres tripulants..."/>
         <dialogue speaker="purple" english="If you get lost, you can get back to the ship from any teleporter." translation="Si et perds, pots tornar a la nau a partir de qualsevol teletransportador."/>
         <dialogue speaker="purple" english="And don&apos;t worry! We&apos;ll find everyone!" translation="I no pateixis! Segur que trobarem tothom!"/>

desktop_version/lang/ca/meta.xml

@@ -11,6 +11,9 @@
     <!-- On the language screen, hard limit 40 8x8 characters. Space/Z/V sets this as the language -->
     <action_hint>Prem Espai, Z o V per a seleccionar</action_hint>
 
+    <!-- Same as above, but for a gamepad button (hard limit 40 8x8 characters) -->
+    <gamepad_hint>Press {button} to select</gamepad_hint>
+
     <!-- Enable automatic word wrapping instead of having to manually insert newlines -->
     <autowordwrap>1</autowordwrap>