Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bundles updated / Fixed player name color changing join/leave text

Browse Source
This commit is contained in:
Anuken
2018-07-19 14:20:51 -04:00
parent 56fc40a64d
commit 9f723c39ef
17 changed files with 170 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/io/anuke/mindustry/core/NetServer.java
View File

@@ -269,7 +269,7 @@ public class NetServer extends Module{
public static void onDisconnect(Player player){
if(player.con.hasConnected){
Call.sendMessage("[accent]" + player.name + " has disconnected.");
Call.sendMessage("[accent]" + player.name + " [accent]has disconnected.");
Call.onPlayerDisconnect(player.id);
}
player.remove();
@@ -316,7 +316,7 @@ public class NetServer extends Module{
public static void connectConfirm(Player player){
player.add();
player.con.hasConnected = true;
Call.sendMessage("[accent]" + player.name + " has connected.");
Call.sendMessage("[accent]" + player.name + " [accent]has connected.");
Log.info("&y{0} has connected.", player.name);
}

20
core/src/io/anuke/mindustry/input/DesktopInput.java
View File

@@ -31,22 +31,14 @@ public class DesktopInput extends InputHandler{
//controller info
private float controlx, controly;
private boolean controlling;
/**
* Current cursor type.
*/
/**Current cursor type.*/
private CursorType cursorType = normal;
/**
* Position where the player started dragging a line.
*/
/**Position where the player started dragging a line.*/
private int selectX, selectY;
/**
* Whether selecting mode is active.
*/
/**Whether selecting mode is active.*/
private PlaceMode mode;
/**
* Animation scale for line.
*/
/**Animation scale for line.*/
private float selectScale;
public DesktopInput(Player player){
@@ -54,9 +46,7 @@ public class DesktopInput extends InputHandler{
this.section = "player_" + (player.playerIndex + 1);
}
/**
* Draws a placement icon for a specific block.
*/
/**Draws a placement icon for a specific block.*/
void drawPlace(int x, int y, Block block, int rotation){
if(validPlace(x, y, block, rotation)){
Draw.color();

4
core/src/io/anuke/mindustry/maps/generation/WorldGenerator.java
View File

@@ -216,8 +216,8 @@ public class WorldGenerator{
Block floor = Blocks.stone;
Block wall = Blocks.air;
double elevation = sim.octaveNoise2D(3, 0.5, 1f / 500, x, y) * 4.1 - 1;
double temp = sim3.octaveNoise2D(7, 0.54, 1f / 820f, x, y);
double elevation = sim.octaveNoise2D(detailed ? 7 : 2, 0.5, 1f / 500, x, y) * 4.1 - 1;
double temp = sim3.octaveNoise2D(detailed ? 12 : 6, 0.54, 1f / 820f, x, y);
double r = sim2.octaveNoise2D(1, 0.6, 1f / 70, x, y);
double edgeDist = Math.max(sectorSize / 2, sectorSize / 2) - Math.max(Math.abs(x - sectorSize / 2), Math.abs(y - sectorSize / 2));

1
core/src/io/anuke/mindustry/ui/fragments/PlayerListFragment.java
View File

@@ -63,6 +63,7 @@ public class PlayerListFragment extends Fragment{
menu.addButton("$text.server.bans", ui.bans::show).disabled(b -> Net.client());
menu.addButton("$text.server.admins", ui.admins::show).disabled(b -> Net.client());
menu.addButton("$text.close", this::toggle);
}).margin(0f).pad(10f).growX();
}).touchable(Touchable.enabled).margin(14f);