Skip to content

Commit

Permalink
Merge branch 'master' of github.com:WeLoveGodot/GameOff2019
Browse files Browse the repository at this point in the history
update the background of main menu
  • Loading branch information
xibo-sun committed Dec 1, 2019
2 parents b0c0eed + 508dc6f commit aa98ffb
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 50 deletions.
26 changes: 11 additions & 15 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,18 +26,8 @@ jobs:
mkdir -p $HOME/.local/share/godot/templates/3.1.1.stable
mv templates/* $HOME/.local/share/godot/templates/3.1.1.stable
rm -f Godot_v3.1.1-stable_export_templates.tpz
- name: Build Game
- name: Build Win64
run: |
# debug
# where i am
echo "==> pwd"
pwd
# home
echo "==> home"
echo $HOME
# tell me
echo "==> start build"
# Export for Windows
echo "==> building windows 64"
mkdir -p win64
Expand All @@ -46,32 +36,38 @@ jobs:
echo "==> build windows 64 ok"
zip -r win64 ./win64
- name: Build Win32
run: |
echo "==> building windows 32"
mkdir -p win32
$HOME/godot --export "win32" project.godot "win32/dark-forest.exe"
echo "==> build windows 32 ok"
zip -r win32 ./win32
# Export for linux
- name: Build Linux64
run: |
echo "==> building linux 64"
mkdir -p linux64
$HOME/godot --export "linux64" project.godot "linux64/dark-forest"
echo "==> build linux 64 ok"
zip -r linux64 linux64
- name: Build Linux32
run: |
echo "==> building linux 32"
mkdir -p linux32
$HOME/godot --export "linux32" project.godot "linux32/dark-forest"
echo "==> build linux 32 ok"
zip -r linux32 linux32
# Export for OSX
- name: Build Mac
run: |
echo "==> building mac"
$HOME/godot --export "mac" project.godot "mac.zip"
$HOME/godot --export "mac" project.godot "mac"
mv mac mac.zip
echo "==> build mac ok"
# zip -r mac mac
echo "==> building finish"
Expand Down
2 changes: 1 addition & 1 deletion project.godot
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ _global_script_class_icons={

config/name="New Game Project"
run/main_scene="res://scene/GUI/Menu.tscn"
config/icon="res://resource/art/icon.png"
config/icon="res://resource/art/planet.png"

[autoload]

Expand Down
Binary file removed resource/art/icon.png
Binary file not shown.
34 changes: 0 additions & 34 deletions resource/art/icon.png.import

This file was deleted.

0 comments on commit aa98ffb

Please sign in to comment.