Merge branch 'dev' into dev-ai

This commit is contained in:
Jonas Mucke
2020-04-20 13:32:24 +02:00
committed by GitHub
119 changed files with 2484 additions and 396 deletions

View File

@@ -34,11 +34,6 @@ _global_script_classes=[ {
"language": "GDScript",
"path": "res://Player/Player.gd"
}, {
"base": "KinematicBody2D",
"class": "SlimeBoss",
"language": "GDScript",
"path": "res://Boss/SlimeBoss/SlimeBoss.gd"
}, {
"base": "Button",
"class": "TitleSceenButton",
"language": "GDScript",
@@ -55,7 +50,6 @@ _global_script_class_icons={
"Hero": "",
"Minion": "",
"Player": "",
"SlimeBoss": "",
"TitleSceenButton": "",
"TitleScreen": ""
}
@@ -69,6 +63,7 @@ config/icon="res://icon.png"
[autoload]
SoundControler="*res://Autoloads/SoundControler.gd"
Steering="*res://Autoloads/Steering.gd"
[display]