commit to merge conflicts
Showing
- cmi2/assets/Karla-Bold.ttf 0 additions, 0 deletionscmi2/assets/Karla-Bold.ttf
- cmi2/scenes/MainMenu.tscn 11695 additions, 45 deletionscmi2/scenes/MainMenu.tscn
- cmi2/scenes/MultiMode.tscn 3 additions, 3 deletionscmi2/scenes/MultiMode.tscn
- cmi2/scenes/mainMenu.gd 56 additions, 1 deletioncmi2/scenes/mainMenu.gd
- cmi2/testTheme.tres 1 addition, 1 deletioncmi2/testTheme.tres
Please register or sign in to comment