Mirrors/mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2026-10-02 11:10:50 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Anuken/Mindustry into array-textures

Browse Source 
# Conflicts:
#	gradle.properties
This commit is contained in:
Anuken
2026-07-02 15:41:49 -04:00
parent 4a2e76c415 1af06f58ce
commit 69f7fbfbb2
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/ui/fragments/PerformanceFragment.java
+3 -1
View File
@@ -77,7 +77,9 @@ public class PerformanceFragment{
@Override @Override
public void draw(){ public void draw(){
Vec2 mouse = screenToLocalCoordinates(Core.input.mouse()).add(x, y); Vec2 mouse = screenToLocalCoordinates(Core.input.mouse()).add(x, y);
float total = frame.valueMs(); float sum = 0;
for(var counter : displayedCounters) sum += counter.valueMs();
float total = Math.max(sum, frame.valueMs());
float accumulator = 0f; float accumulator = 0f;
PerfCounter hoveredCounter = null; PerfCounter hoveredCounter = null;
gradle.properties
+1 -1
View File
@@ -26,4 +26,4 @@ org.gradle.caching=true
org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.socketTimeout=100000
org.gradle.internal.http.connectionTimeout=100000 org.gradle.internal.http.connectionTimeout=100000
android.enableR8.fullMode=false android.enableR8.fullMode=false
archash=9ab6e1e02b archash=34ae63d126