FIx merge confict
This commit is contained in:
parent
5ee6a7c4a8
commit
004e47aba6
3 changed files with 19 additions and 2 deletions
|
|
@ -16,8 +16,11 @@ var defence_team: Array[int] = []
|
|||
var specators_team: Array[int] = []
|
||||
|
||||
# Host defined variables
|
||||
var win_score = 13
|
||||
var half_rounds = 12
|
||||
var win_score: int = 13
|
||||
var half_rounds :int = 12
|
||||
var bomb_time: float = 45.0
|
||||
var buy_time: float = 15.0
|
||||
var round_time: float = 150.0
|
||||
|
||||
func _ready() -> void:
|
||||
multiplayer.peer_disconnected.connect(player_left)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue