Merge branch 'develop' into modnark

2022-10-07 17:15:13 -04:00
parent 7f8cdc0f33 36153c293b
commit 52c2f114a5
24 changed files with 1027700 additions and 87 deletions
--- a/src/source/DataModelV2/LevelInstance.cpp
+++ b/src/source/DataModelV2/LevelInstance.cpp
@@ -218,7 +218,7 @@ void LevelInstance::Step(SimTime sdt)
 				score -= 1;
 			break;
 	}
-	if (timer >= 0.1f){ //Due to timing used this could cause the number go into negatives for one step
+	if (timer >= sdt){
 		timer -= sdt;
 	}
 	else{