Skip to content

Commit

Permalink
Update to Godot 3.4
Browse files Browse the repository at this point in the history
  • Loading branch information
OverloadedOrama committed Nov 9, 2021
1 parent 6e5c4fc commit 1278553
Show file tree
Hide file tree
Showing 13 changed files with 729 additions and 745 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/dev-clickable-builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ on:
- "installer/po/*"

env:
GODOT_VERSION: 3.3
GODOT_VERSION: 3.4
EXPORT_NAME: Pixelorama

jobs:
build_pck:
name: Create Pixelorama pack data
runs-on: ubuntu-latest
container:
image: docker://barichello/godot-ci:3.3
image: docker://barichello/godot-ci:3.4
steps:
- name: Clone source
uses: actions/checkout@v2
Expand Down
18 changes: 9 additions & 9 deletions .github/workflows/dev-desktop-builds.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@ on:
- "installer/po/*"

env:
GODOT_VERSION: 3.3
GODOT_VERSION_MAC: 3.3
GODOT_VERSION: 3.4
GODOT_VERSION_MAC: 3.4
EXPORT_NAME: Pixelorama

jobs:
export-windows:
name: Windows Export 🗔
runs-on: ubuntu-latest
container:
image: docker://barichello/godot-ci:3.3
image: docker://barichello/godot-ci:3.4
steps:
- name: Setup WINE and rcedit 🍷
run: |
Expand Down Expand Up @@ -57,7 +57,7 @@ jobs:
name: Linux Export 🐧
runs-on: ubuntu-latest
container:
image: docker://barichello/godot-ci:3.3
image: docker://barichello/godot-ci:3.4
steps:
- name: Checkout 🛎️
uses: actions/checkout@v1
Expand Down Expand Up @@ -97,7 +97,7 @@ jobs:
submodules: true
- name: Setup environment 🔧
run: |
export GODOT_VERSION=3.3
export GODOT_VERSION=3.4
export EXPORT_NAME=Pixelorama
- name: Download and extract export templates 💾
run: |
Expand All @@ -107,15 +107,15 @@ jobs:
mv ./templates/* ~/.local/share/godot/templates/${GODOT_VERSION_MAC}.stable
- name: Download Godot headless binary 🤖
run: |
wget https://github.com/huskeee/godot-headless-mac/releases/download/3.3-stable/Godot_v3.3-stable_mac_headless.64.zip
wget https://github.com/huskeee/godot-headless-mac/releases/download/3.4-stable/Godot_v3.4-stable_mac_headless.64.zip
unzip -a Godot_v${GODOT_VERSION_MAC}-stable_mac_headless.64.zip
- name: Setup 💻
run: mkdir -v -p ./build/mac
- name: Mac Build 🔧
run: |
chown runner ./Godot
chmod +x ./Godot
./Godot -v --export "Mac OSX" ./build/mac/Pixelorama.zip
chown runner ./bin/Godot
chmod +x ./bin/Godot
./bin/Godot -v --export "Mac OSX" ./build/mac/Pixelorama.zip
- name: Make application executable 🔧
run: |
unzip -a ./build/mac/Pixelorama.zip -d ./build/mac
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dev-web.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ on:
branches: [ master ]

env:
GODOT_VERSION: 3.3
GODOT_VERSION: 3.4
EXPORT_NAME: Pixelorama

jobs:
export-web:
name: Web Export 🌐
runs-on: ubuntu-latest
container:
image: docker://barichello/godot-ci:3.3
image: docker://barichello/godot-ci:3.4
steps:
- name: Checkout 🛎️
uses: actions/checkout@v1
Expand Down
24 changes: 12 additions & 12 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ on:
branches: [ release ]

env:
GODOT_VERSION: 3.3
GODOT_VERSION_MAC: 3.3
GODOT_VERSION: 3.4
GODOT_VERSION_MAC: 3.4
EXPORT_NAME: Pixelorama
TAG: v0.9
TAG: v0.9.1
BUTLER_API_KEY: ${{ secrets.BUTLER_API_KEY }}

jobs:
export-windows:
name: Windows Export 🗔
runs-on: ubuntu-latest
container:
image: docker://barichello/godot-ci:3.3
image: docker://barichello/godot-ci:3.4
steps:
- name: Setup WINE, rcedit and NSIS 🍷
run: |
Expand Down Expand Up @@ -88,7 +88,7 @@ jobs:
name: Linux Export 🐧
runs-on: ubuntu-latest
container:
image: docker://barichello/godot-ci:3.3
image: docker://barichello/godot-ci:3.4
steps:
- name: Checkout 🛎️
uses: actions/checkout@v1
Expand Down Expand Up @@ -142,7 +142,7 @@ jobs:
name: Create Pixelorama pack data for Clickable
runs-on: ubuntu-latest
container:
image: docker://barichello/godot-ci:3.3
image: docker://barichello/godot-ci:3.4
steps:
- name: Clone source
uses: actions/checkout@v2
Expand Down Expand Up @@ -214,7 +214,7 @@ jobs:
submodules: true
- name: Setup environment 🔧
run: |
export GODOT_VERSION=3.3
export GODOT_VERSION=3.4
export EXPORT_NAME=Pixelorama
- name: Download and extract export templates 💾
run: |
Expand All @@ -224,15 +224,15 @@ jobs:
mv ./templates/* ~/.local/share/godot/templates/${GODOT_VERSION_MAC}.stable
- name: Download Godot headless binary 🤖
run: |
wget https://github.com/huskeee/godot-headless-mac/releases/download/3.3-stable/Godot_v3.3-stable_mac_headless.64.zip
wget https://github.com/huskeee/godot-headless-mac/releases/download/3.4-stable/Godot_v3.4-stable_mac_headless.64.zip
unzip -a Godot_v${GODOT_VERSION_MAC}-stable_mac_headless.64.zip
- name: Setup 💻
run: mkdir -v -p ./build/mac
- name: Mac Build 🔧
run: |
chown runner ./Godot
chmod +x ./Godot
./Godot -v --export "Mac OSX" ./build/mac/Pixelorama.zip
chown runner ./bin/Godot
chmod +x ./bin/Godot
./bin/Godot -v --export "Mac OSX" ./build/mac/Pixelorama.zip
- name: Make application executable 🔧
run: |
unzip -a ./build/mac/Pixelorama.zip -d ./build/mac
Expand Down Expand Up @@ -265,7 +265,7 @@ jobs:
name: Web Export 🌐
runs-on: ubuntu-latest
container:
image: docker://barichello/godot-ci:3.3
image: docker://barichello/godot-ci:3.4
steps:
- name: Checkout 🛎️
uses: actions/checkout@v1
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ You can find Online Documentation for Pixelorama here: https://orama-interactive
It's still work in progress so there are some pages missing. If you want to contribute, you can do so in [Pixelorama-Docs' GitHub Repository](https://github.com/Orama-Interactive/Pixelorama-Docs).

## Cloning Instructions
Pixelorama uses Godot 3.3, so you will need to have it in order to run the project.
Pixelorama uses Godot 3.4, so you will need to have it in order to run the project. Older versions may not work.
As of right now, most of the code is written using GDScript, so the mono version of Godot is not required, but Pixelorama should also work with it.

## Current features as of version v0.9:
Expand Down
Loading

0 comments on commit 1278553

Please sign in to comment.