Commit c7c1943c authored by Tim Scheiber's avatar Tim Scheiber
Browse files

Resolved conflicts

parent cce65035
Pipeline #3258 failed with stage
in 6 minutes and 55 seconds
......@@ -11,7 +11,7 @@ namespace phase_shifter::gameplay {
float time_to_beat = 0.f;
float avg_beat_time = 1.f;
int beats_left = 999.f;
int beats_left = 999;
};
// TODO: replace placeholder logic with actual beat detection
......
......@@ -93,11 +93,7 @@ namespace phase_shifter {
.position(glm::rotate(sun_dir, glm::vec3(0, 0, 1)) * 40.f)
.create();
<<<<<<< HEAD
=======
_level_system->load("dummy");
>>>>>>> develop
}
Meta_system::~Meta_system()
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment