merge dev into test #28

Merged
j23f0712 merged 29 commits from development into dev/test 2024-12-01 23:11:24 +01:00
128 changed files with 654 additions and 1904 deletions
Showing only changes of commit c08c81ea46 - Show all commits

View File

@@ -46,17 +46,21 @@ cir 5,4 0
cir 5,5 0
#Assets
jet -10,-1 45
ship 11,0 169
big_tent -9,-7 130
big_tent 7,-10 225
jet -12,0 45
jet -17,-2 55
small_tent -9,7 45
small_tent -10,5 60
small_tent -7,8 30
ship 11,0 169
small_tent 6,8 340
small_tent 8,7 320
big_tent -10,-9 130
big_tent 9,-10 225
radar 0,10 -20
small_tent 6,8 190
small_tent 8,7 160
tank -1,-10 135
tank 0,-18 180
tank 3,-18 180
tank -3,-18 180
#Yellow (CIR) wait Node
node_wait_yellow 4,5 0