Merge pull request #1 from opensuspect/main

test
TheSecondReal0 · Oct 15, 2020 · d1f59d8 · d1f59d8
2 parents d8bc5b2 + 61a0686
commit d1f59d8
Show file tree

Hide file tree

Showing 101 changed files with 952 additions and 2,005 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1 +1,2 @@
 *.png filter=lfs diff=lfs merge=lfs -text
+*.ttf filter=lfs diff=lfs merge=lfs -text
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -15,8 +15,8 @@ env:
 
 # A workflow run is made up of one or more jobs that can run sequentially or in parallel
 jobs:
-  export-linux:
-    name: Linux Export
+  export:
+    name: Export
     runs-on: ubuntu-latest
     container:
       image: barichello/godot-ci:3.2.3
@@ -27,15 +27,33 @@ jobs:
           lfs: true
       - name: Setup
         run: |
+          chown -R root:root $HOME
           mkdir -v -p ~/.local/share/godot/templates
           mv /root/.local/share/godot/templates/${GODOT_VERSION}.stable ~/.local/share/godot/templates/${GODOT_VERSION}.stable
+          apt-get update
+          apt-get install imagemagick wine-stable --yes
+          wget --progress=dot https://github.com/electron/rcedit/releases/download/v1.1.1/rcedit-x64.exe -O ~/rcedit.exe
       - name: Linux Build
         run: |
-          mkdir -v -p build/linux
-          cd src
-          godot -v --export "Client" ../build/linux/$EXPORT_NAME.x86_64
-      - name: Upload Artifact
+          mkdir -v -p $GITHUB_WORKSPACE/build/linux
+          cd $GITHUB_WORKSPACE/src
+          godot -v --export "Client" $GITHUB_WORKSPACE/build/linux/$EXPORT_NAME.x86_64
+      - name: Upload Linux Artifact
         uses: actions/upload-artifact@v1
         with:
           name: linux
           path: build/linux
+      - name: Windows Desktop Build
+        run: |
+          mkdir -v -p $GITHUB_WORKSPACE/build/windows-desktop
+          cd $GITHUB_WORKSPACE/src
+          godot -v --export "Windows Desktop" $GITHUB_WORKSPACE/build/windows-desktop/$EXPORT_NAME.exe
+      - name: Convert png to ico
+        run: convert $GITHUB_WORKSPACE/src/icon.png -define icon:auto-resize="256,128,96,64,48,32,16" ~/icon.ico
+      - name: Change exe icon
+        run: wine ~/rcedit.exe $GITHUB_WORKSPACE/build/windows-desktop/$EXPORT_NAME.exe --set-icon ~/icon.ico
+      - name: Upload Windows Artifact
+        uses: actions/upload-artifact@v1
+        with:
+          name: windows-desktop
+          path: build/windows-desktop
diff --git a/LICENSE.txt b/LICENSE.txt
@@ -672,3 +672,18 @@ may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
 <https://www.gnu.org/licenses/why-not-lgpl.html>.
+
+License notices for other projects used in this repository:
+
+
+
+    This game uses Godot Engine, available under the following license:
+
+    Copyright (c) 2007-2020 Juan Linietsky, Ariel Manzur. Copyright (c) 2014-2020 Godot Engine contributors.
+
+    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
diff --git a/README.md b/README.md
@@ -1,5 +1,7 @@
 <img alt="Little Suspect" src="https://github.com/moxvallix/opensuspect/blob/main/misc/images/icon_1.png">
 
+![CI](https://github.com/opensuspect/opensuspect/workflows/CI/badge.svg?branch=main)
+
 # OpenSuspect
 
 *One amongst us is not like the rest*

diff --git a/misc/images/black-character-assets/black left walk/black-l-walk-1-4.png b/misc/images/black-character-assets/black left walk/black-l-walk-1-4.png
diff --git a/misc/images/black-character-assets/black left walk/black-l-walk-2-4.png b/misc/images/black-character-assets/black left walk/black-l-walk-2-4.png
diff --git a/misc/images/black-character-assets/black left walk/black-l-walk-3-4.png b/misc/images/black-character-assets/black left walk/black-l-walk-3-4.png
diff --git a/misc/images/black-character-assets/black left walk/black-l-walk-4-4.png b/misc/images/black-character-assets/black left walk/black-l-walk-4-4.png
diff --git a/src/Assets/Characters/black/black-proto-1.png b/src/Assets/Characters/black/black-proto-1.png
diff --git a/src/Assets/Characters/black/walk-h/black-r-walk-1-4.png b/src/Assets/Characters/black/walk-h/black-r-walk-1-4.png
diff --git a/src/Assets/Characters/black/walk-h/black-r-walk-2-4.png b/src/Assets/Characters/black/walk-h/black-r-walk-2-4.png
diff --git a/src/Assets/Characters/black/walk-h/black-r-walk-3-4.png b/src/Assets/Characters/black/walk-h/black-r-walk-3-4.png
diff --git a/src/Assets/Characters/black/walk-h/black-r-walk-4-4.png b/src/Assets/Characters/black/walk-h/black-r-walk-4-4.png
diff --git a/src/Assets/Characters/black/walk-v/black-down.png.import b/src/Assets/Characters/black/walk-v/black-down.png.import
diff --git a/src/Assets/Fonts/Roboto-Bold.ttf b/src/Assets/Fonts/Roboto-Bold.ttf
diff --git a/src/Scenes/UI/Settings.tscn b/src/Scenes/UI/Settings.tscn
diff --git a/src/Scenes/player.tscn b/src/Scenes/player.tscn
diff --git a/src/Scripts/Settings.gd b/src/Scripts/Settings.gd
diff --git a/.../black-character-assets/black-proto-1.png → ...assets/characters/black/black-proto-1.png b/.../black-character-assets/black-proto-1.png → ...assets/characters/black/black-proto-1.png
diff --git a/...Characters/black/black-proto-1.png.import → ...characters/black/black-proto-1.png.import b/...Characters/black/black-proto-1.png.import → ...characters/black/black-proto-1.png.import
@@ -2,15 +2,15 @@
 
 importer="texture"
 type="StreamTexture"
-path="res://.import/black-proto-1.png-60bf95d2ea8d1d36c2abbe61e967bdba.stex"
+path="res://.import/black-proto-1.png-c7aff04cda67af01fef01eb42e6b1ab4.stex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://Assets/Characters/black/black-proto-1.png"
-dest_files=[ "res://.import/black-proto-1.png-60bf95d2ea8d1d36c2abbe61e967bdba.stex" ]
+source_file="res://assets/characters/black/black-proto-1.png"
+dest_files=[ "res://.import/black-proto-1.png-c7aff04cda67af01fef01eb42e6b1ab4.stex" ]
 
 [params]
 

diff --git a/...ets/black right walk/black-r-walk-1-4.png → ...racters/black/walk-h/black-r-walk-1-4.png b/...ets/black right walk/black-r-walk-1-4.png → ...racters/black/walk-h/black-r-walk-1-4.png