Skip to content

Commit

Permalink
Merge branch 'game-esportsreadymario' of github.com:hpi-swa-lab/godot…
Browse files Browse the repository at this point in the history
…-pronto into game-esportsreadymario
  • Loading branch information
SaturnHafen committed Nov 9, 2023
2 parents 4479250 + 69c5fd4 commit 333f2fc
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
5 changes: 3 additions & 2 deletions prototypes/game-esportsreadymario/game-esportsreadymario.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,6 @@ render_target_update_mode = 4
[node name="ExportBehavior" type="Node2D" parent="."]
position = Vector2(576, 324)
script = ExtResource("1")
title = "esportsreadymario"
authors = PackedStringArray("Max, Luke")
title = "Esportsreadymario"
authors = PackedStringArray("Max", "Luke")
description = "The two marios have to try and get the (not implemented) flag of the opposing team and cary it home. Player one uses wasd, Player 2 uses the arrow keys."
6 changes: 4 additions & 2 deletions prototypes/game-esportsreadymario/game_info.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
{
"authors": [
"Max, Luke"
"Max",
"Luke"
],
"description": "The two marios have to try and get the (not implemented) flag of the opposing team and cary it home. Player one uses wasd, Player 2 uses the arrow keys.",
"time": "2023-11-09",
"title": "esportsreadymario"
"title": "Esportsreadymario"
}
1 change: 0 additions & 1 deletion prototypes/game-esportsreadymario/level.tscn
Original file line number Diff line number Diff line change
Expand Up @@ -1287,7 +1287,6 @@ script = ExtResource("12_2uwir")
metadata/pronto_connections = [SubResource("Resource_m1nrh"), SubResource("Resource_btlro")]
[node name="GroupDrawer" parent="Area2D3/SpawnerBehavior" instance=ExtResource("13_cp8el")]
visible = false
position = Vector2(1000, 0)
[node name="_Node2D_42797" type="Node2D" parent="Area2D3/SpawnerBehavior/GroupDrawer"]
Expand Down

0 comments on commit 333f2fc

Please sign in to comment.