mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-09 22:59:13 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branches '6.0' and 'master' of https://github.com/Anuken/Mindustry into 6.0

Browse Source
This commit is contained in:
Anuken 2020-03-01 12:55:51 -05:00
commit c6fc103bff
3 changed files with 1270 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1263
core/assets/bundles/bundle_lt.properties Normal file
View File

File diff suppressed because it is too large Load Diff

11
desktop/src/mindustry/desktop/DesktopLauncher.java
View File

@ -3,6 +3,7 @@ package mindustry.desktop;
import arc.*;
import arc.Files.*;
import arc.backend.sdl.*;
import arc.backend.sdl.jni.*;
import arc.files.*;
import arc.func.*;
import arc.math.*;
@ -11,7 +12,6 @@ import arc.util.*;
import arc.util.serialization.*;
import club.minnced.discord.rpc.*;
import com.codedisaster.steamworks.*;
import io.anuke.arc.backends.sdl.jni.*;
import mindustry.*;
import mindustry.core.GameState.*;
import mindustry.core.*;
@ -181,13 +181,14 @@ public class DesktopLauncher extends ClientLauncher{
Cons<Runnable> dialog = Runnable::run;
boolean badGPU = false;
if(e.getMessage() != null && (e.getMessage().contains("Couldn't create window") || e.getMessage().contains("OpenGL 2.0 or higher") || e.getMessage().toLowerCase().contains("pixel format"))){
if(e.getMessage() != null && (e.getMessage().contains("Couldn't create window") ||
e.getMessage().contains("OpenGL 2.0 or higher") || e.getMessage().toLowerCase().contains("pixel format") || e.getMessage().contains("GLEW"))){
dialog.get(() -> message(
e.getMessage().contains("Couldn't create window") ? "A graphics initialization error has occured! Try to update your graphics drivers:\n" + e.getMessage() :
"Your graphics card does not support OpenGL 2.0!\n" +
"Try to update your graphics drivers.\n\n" +
"(If that doesn't work, your computer just doesn't support Mindustry.)"));
"Your graphics card does not support OpenGL 2.0 with the framebuffer_object extension!\n" +
"Try to update your graphics drivers. If this doesn't work, your computer may not support Mindustry.\n\n" +
"Full message: " + e.getMessage()));
badGPU = true;
}

2
fastlane/metadata/android/ru-RU/full_description.txt
View File

@ -3,7 +3,7 @@
Особенности игры:
- 24 встроенные карты
- Кампания, с полноценным технологическим древом и прогрессией карт
- Кампания с полноценным технологическим древом и прогрессией карт
- 4 вида мощных боссов
- Системы для транспорта электроэнергии, жидкостей и ресурсов
- 19 видов дронов, кораблей и наземных боевых единиц