Skip to content

Commit

Permalink
Merge 2c5bc53 into 8ac6e82
Browse files Browse the repository at this point in the history
  • Loading branch information
mohithsrao authored Apr 13, 2021
2 parents 8ac6e82 + 2c5bc53 commit ef62df0
Show file tree
Hide file tree
Showing 204 changed files with 20,963 additions and 1,799 deletions.
31 changes: 29 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@ name: Build Godot Project
on:
pull_request: {} # Runs on all Pull-Request

env:
GODOT_VERSION: 3.2.3

jobs:
Godot:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -34,10 +37,34 @@ jobs:
with:
name: ${{ matrix.platform }}.tgz
path: ${{ matrix.platform }}.tgz
Release:

Test:
runs-on: ubuntu-latest
needs: Godot
container:
image: barichello/godot-ci:3.2.3
steps:
- name: Setup
run: |
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 install -y zip unzip
- name: Checkout
uses: actions/checkout@v2
with:
lfs: true

- name: Run Tests
run: |
cd ./ChoukaBaraGame
echo $(pwd)
godot -v addons/WAT/cli.tscn -run_all
Release:
runs-on: ubuntu-latest
needs: Test
steps:
- name: Extract Change Logs
id: extract-release-notes
Expand Down
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
# Godot-specific ignores
.import/
export.cfg
logs

# Mono-specific ignores
.mono/
Expand All @@ -10,4 +11,7 @@ export.cfg
Bin/

#VSCode-specific ignores
.vscode/
.vscode/

#test specific ignores
**/results.xml
2 changes: 2 additions & 0 deletions ChoukaBaraGame/Assets/LocalizationLanguage.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
keys,en
TESTKEY,This is a test key
16 changes: 16 additions & 0 deletions ChoukaBaraGame/Assets/LocalizationLanguage.csv.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
[remap]

importer="csv_translation"
type="Translation"

[deps]

files=[ "res://Assets/LocalizationLanguage.en.translation" ]

source_file="res://Assets/LocalizationLanguage.csv"
dest_files=[ "res://Assets/LocalizationLanguage.en.translation" ]

[params]

compress=true
delimiter=0
Binary file not shown.
52 changes: 2 additions & 50 deletions ChoukaBaraGame/Game.tscn
Original file line number Diff line number Diff line change
@@ -1,51 +1,3 @@
[gd_scene load_steps=12 format=2]
[gd_scene format=2]

[ext_resource path="res://Assets/Japaneese_Village_Background.png" type="Texture" id=1]
[ext_resource path="res://Scenes/TileMap.tscn" type="PackedScene" id=2]
[ext_resource path="res://Scripts/Game/Game.gd" type="Script" id=4]
[ext_resource path="res://TurnManager.gd" type="Script" id=5]
[ext_resource path="res://Scenes/HUD/Hud.tscn" type="PackedScene" id=6]
[ext_resource path="res://Scripts/StateMachine/GameStateMachine/GameStateManager.gd" type="Script" id=7]
[ext_resource path="res://Scripts/StateMachine/GameStateMachine/SelectNextPlayer.gd" type="Script" id=8]
[ext_resource path="res://Scripts/StateMachine/GameStateMachine/SelectPawn.gd" type="Script" id=9]
[ext_resource path="res://Scripts/StateMachine/GameStateMachine/MovePawn.gd" type="Script" id=10]
[ext_resource path="res://Scripts/StateMachine/GameStateMachine/CalculateGara.gd" type="Script" id=11]
[ext_resource path="res://Scenes/Player/HomeBase.tscn" type="PackedScene" id=12]

[node name="Game" type="Node2D"]
script = ExtResource( 4 )

[node name="Sprite" type="Sprite" parent="."]
position = Vector2( -512, -512 )
texture = ExtResource( 1 )
centered = false
offset = Vector2( 480, 480 )
region_enabled = true
region_rect = Rect2( 0, 0, 1152, 1024 )

[node name="TileMap" parent="." instance=ExtResource( 2 )]

[node name="TurnManager" type="YSort" parent="."]
script = ExtResource( 5 )
NUMBER_OF_PLAYERS = 3

[node name="HUD" parent="." instance=ExtResource( 6 )]

[node name="GameStateManager" type="Node" parent="."]
script = ExtResource( 7 )
START_STATE = NodePath("SelectNextPlayer")
OWNER = NodePath("../TurnManager")

[node name="SelectNextPlayer" type="Node" parent="GameStateManager"]
script = ExtResource( 8 )

[node name="CalculateGara" type="Node" parent="GameStateManager"]
script = ExtResource( 11 )

[node name="SelectPawn" type="Node" parent="GameStateManager"]
script = ExtResource( 9 )

[node name="MovePawn" type="Node" parent="GameStateManager"]
script = ExtResource( 10 )

[node name="Goal" parent="." instance=ExtResource( 12 )]
[node name="Node2D" type="Node2D"]
71 changes: 0 additions & 71 deletions ChoukaBaraGame/Scenes/Gara/GaraPopup.tscn

This file was deleted.

41 changes: 0 additions & 41 deletions ChoukaBaraGame/Scenes/Gara/Koude.tscn

This file was deleted.

20 changes: 0 additions & 20 deletions ChoukaBaraGame/Scenes/HUD/Hud.gd

This file was deleted.

Loading

0 comments on commit ef62df0

Please sign in to comment.