peet/Gruppe-01-fin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

merge the new developmentbranch into the test branch #39

Closed
j23f0712 wants to merge 431 commits from development2 into dev/test
pull from: development2
merge into: peet:dev/test
Conversation 1 Commits 431 Files Changed 269 +2154 -548
72 changed files with 2154 additions and 548 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0e6a2499b7 - Show all commits

12
Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java
View File

@@ -9,7 +9,7 @@
import pp.mdga.client.view.*;
import javax.imageio.ImageIO;
import java.awt.GraphicsEnvironment;
import java.awt.*;
import java.awt.image.BufferedImage;
import java.io.File;
import java.io.IOException;
@@ -82,6 +82,12 @@ public static void main(String[] args) {
settings.setSamples(128);
if(prefs.getBoolean("fullscreen", false)) {
Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
int screenWidth = (int) screenSize.getWidth();
int screenHeight = (int) screenSize.getHeight();
settings.setResolution(screenWidth, screenHeight);
settings.setFullscreen(true);
} else {
settings.setWidth(prefs.getInt("width", 1280));
@@ -270,6 +276,10 @@ public void updateResolution(int width, int height, float imageFactor, boolean i
float scaleFactor = Math.max((float) width / baseWidth, (float) height / baseHeight);
Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
int screenWidth = (int) screenSize.getWidth();
int screenHeight = (int) screenSize.getHeight();
settings.setResolution(screenWidth, screenHeight);
settings.setFullscreen(true);
prefs.putFloat("scale", scaleFactor);