]> Skullheadx's Git Forge - Pygame-Jam.git/commitdiff
Merge branch 'main' of https://github.com/Skullheadx/Pygame-Jam
author711215 <711215@pdsb.net>
Wed, 13 Jul 2022 19:23:36 +0000 (15:23 -0400)
committer711215 <711215@pdsb.net>
Wed, 13 Jul 2022 19:23:36 +0000 (15:23 -0400)
1  2 
Game.py
UI/HealthBar.py
main.py

diff --cc Game.py
Simple merge
diff --cc UI/HealthBar.py
Simple merge
diff --cc main.py
index ddad7005a7dcf7000ea8956f83a538142ad6ce13,796ab2cdac8430b1bb79acca1699af6ce3d4ea1b..aa32ccf44cc0e443b295e1f0b1a8c3e5de82b7fa
+++ b/main.py
@@@ -14,9 -14,9 +14,9 @@@ from DevLevelSelect import DevLevelSele
  delta = 1000//fps
  # scene = Menu()
  # scene = TransitionScene()
- scene = DevLevelSelect()
+ scene = Menu()
  old_level = 0
 -level =4
 +level = 4
  next_level = 0
  
  # final_level = 6