Skip to content

Commit

Permalink
Merge branch 'master' of github.com:hpi-swa-lab/godot-pronto
Browse files Browse the repository at this point in the history
  • Loading branch information
leogeier committed Nov 10, 2023
2 parents 8234660 + 34ee252 commit 71f39b7
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 1 deletion.
1 change: 1 addition & 0 deletions .github/workflows/build-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ on:
push:
branches:
- 'game-*'
- 'dev-game-*'

env:
GODOT_VERSION: 4.1
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
script-instances
log
build/
*.tmp
5 changes: 5 additions & 0 deletions project.godot
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,11 @@ player_2_jump={
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":73,"key_label":0,"unicode":105,"echo":false,"script":null)
]
}
input_left_mouse={
"deadzone": 0.5,
"events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":1,"position":Vector2(240, 17),"global_position":Vector2(244, 58),"factor":1.0,"button_index":1,"canceled":false,"pressed":true,"double_click":false,"script":null)
]
}

[rendering]

Expand Down
8 changes: 7 additions & 1 deletion scripts/check_for_export.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,11 @@ if [ $COUNT -eq 1 ]
then
echo $GAME_FOLDER
else
echo "Error: Found ${COUNT} scenes with ExportBehavior."
# IMPORTANT: This message needs to start with "Error:" so that the CI fails
echo "Error: Found ${COUNT} scenes with ExportBehavior:"
# Print all scenes with ExportBehavior in them:
for scene in $EXPORT_SCENES
do
echo $scene
done
fi

0 comments on commit 71f39b7

Please sign in to comment.