Skip to content
This repository was archived by the owner on Oct 1, 2022. It is now read-only.

Some bug fixes #778

Open
wants to merge 12 commits into
base: master
Choose a base branch
from
Open

Some bug fixes #778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
840f51a
backport d24ed35, fix BackendSelector on jre11
paulwedeck Oct 11, 2019
4b33c83
fix MapCreator
paulwedeck Oct 13, 2019
d38fc0d
fix nativeScale with glfw
paulwedeck Oct 25, 2019
4880cb5
Remove unnecessary block="true" attributes and always default to bloc…
paulwedeck Mar 12, 2020
8dfa71b
fix comment
paulwedeck Apr 19, 2020
b1f005b
Fix SLAUGHTERHOUSE drawing in MapCreator
paulwedeck Apr 22, 2020
fe122f7
fix hover event in AbstractEventConverter
paulwedeck Apr 30, 2020
c18052e
Don't board enemy ferries, draw allied passengers in their player col…
paulwedeck May 1, 2020
90eb439
patch the second bug in #792
paulwedeck May 1, 2020
74f0f3d
include runtime dependencies in server bundle (#793)
paulwedeck May 12, 2020
4b9a46d
use compile instead of implementation because only compile gets copie…
paulwedeck May 12, 2020
17f7444
When settlers are suddenly forced outside of their partition
paulwedeck May 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 8 additions & 7 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,11 +88,11 @@ subprojects {
// Add streamsupport dependency
def addGlobalDependencies = {
dependencies {
implementation 'net.sourceforge.streamsupport:streamsupport:' + rootProject.ext.streamSupportVersion
implementation 'net.sourceforge.streamsupport:streamsupport-cfuture:' + rootProject.ext.streamSupportVersion
implementation 'net.sourceforge.streamsupport:streamsupport-atomic:' + rootProject.ext.streamSupportVersion
implementation 'net.sourceforge.streamsupport:streamsupport-flow:' + rootProject.ext.streamSupportVersion
implementation 'net.sourceforge.streamsupport:streamsupport-literal:' + rootProject.ext.streamSupportVersion
compile 'net.sourceforge.streamsupport:streamsupport:' + rootProject.ext.streamSupportVersion
compile 'net.sourceforge.streamsupport:streamsupport-cfuture:' + rootProject.ext.streamSupportVersion
compile 'net.sourceforge.streamsupport:streamsupport-atomic:' + rootProject.ext.streamSupportVersion
compile 'net.sourceforge.streamsupport:streamsupport-flow:' + rootProject.ext.streamSupportVersion
compile 'net.sourceforge.streamsupport:streamsupport-literal:' + rootProject.ext.streamSupportVersion

testImplementation 'junit:junit:4.12'
}
Expand Down Expand Up @@ -153,6 +153,7 @@ task releaseJSettlers(type: Zip) {
from { project.getRootProject().file('LICENSE.txt') }
from tasks.getByPath(':jsettlers.main.swing:releaseJar')
from tasks.getByPath(':jsettlers.mapcreator:releaseJar')
from tasks.getByPath(':jsettlers.network:releaseJar')

into('maps') {
from project.getRootProject().file('maps/release')
Expand All @@ -165,7 +166,7 @@ task releaseJSettlers(type: Zip) {


task releaseDedicatedServer(type: Copy) {
from tasks.getByPath(':jsettlers.network:jar')
from tasks.getByPath(':jsettlers.network:releaseJar')
into releaseDir
}

Expand All @@ -184,7 +185,7 @@ if (findProject(':jsettlers.main.android')) {
}


task release(dependsOn: ['releaseJSettlers', 'releaseDedicatedServer', 'releaseAndroid'])
task release(dependsOn: ['releaseJSettlers', 'releaseAndroid'])


task deployToGithub(type: Exec, dependsOn: 'release') {
Expand Down
6 changes: 5 additions & 1 deletion go.graphics.swing/src/main/java/go/graphics/swing/contextcreator/BackendSelector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,11 @@ public class BackendSelector extends JComboBox<EBackendType> {
public void actionPerformed(ActionEvent actionEvent) {
super.actionPerformed(actionEvent);

if(actionEvent.getActionCommand() == "comboBoxChanged") {
if(actionEvent.getActionCommand().equals("comboBoxChanged")) {
if(getSelectedItem() instanceof String) {
setSelectedItem(current_item);
return;
}
EBackendType bi = (EBackendType) getSelectedItem();
if (bi.platform != null && bi.platform != Platform.get()) {
setSelectedItem(current_item);
Expand Down
12 changes: 11 additions & 1 deletion go.graphics.swing/src/main/java/go/graphics/swing/opengl/LWJGL15DrawContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,17 @@ public boolean isValid() {
return contextValid;
}

protected float nativeScale = 0;

public void resize(int width, int height) {
if(nativeScale == 0) {
int[] vp = new int[4];
GL11.glGetIntegerv(GL11.GL_VIEWPORT, vp);
nativeScale = vp[2] / (float)width;

if(nativeScale < 0.1f) nativeScale = 1;
}

GL11.glMatrixMode(GL11.GL_PROJECTION);
GL11.glLoadIdentity();
// coordinate system origin at lower left with width and height same as
Expand All @@ -342,6 +352,6 @@ public void resize(int width, int height) {

GL11.glMatrixMode(GL11.GL_MODELVIEW);
GL11.glLoadIdentity();
GL11.glViewport(0, 0, width, height);
GL11.glViewport(0, 0, (int)(width*nativeScale), (int)(height*nativeScale));
}
}
11 changes: 10 additions & 1 deletion go.graphics.swing/src/main/java/go/graphics/swing/opengl/LWJGL20DrawContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,9 +215,18 @@ public void setGlobalAttributes(float x, float y, float z, float sx, float sy, f
}
}

protected float nativeScale = 0;

@Override
public void resize(int width, int height) {
GL11.glViewport(0, 0, width, height);
if(nativeScale == 0) {
int[] vp = new int[4];
GL11.glGetIntegerv(GL11.GL_VIEWPORT, vp);
nativeScale = vp[2] / (float)width;

if(nativeScale < 0.1f) nativeScale = 1;
}
GL11.glViewport(0, 0, (int)(width*nativeScale), (int)(height*nativeScale));

mat.identity();
mat.ortho(0, width, 0, height, -1, 1);
Expand Down
5 changes: 4 additions & 1 deletion go.graphics/src/main/java/go/graphics/event/interpreter/AbstractEventConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,10 @@ protected void startHover(UIPoint start) {
}

protected void updateHoverPosition(UIPoint current) {
if (ongoingHoverEvent != null) {
if (ongoingHoverEvent == null) {
// this only happens when the mouse already was above the component when we started listening
startHover(current);
} else {
ongoingHoverEvent.setMousePosition(current);
}
}
Expand Down
4 changes: 3 additions & 1 deletion jsettlers.common/src/main/java/jsettlers/common/buildings/loader/BuildingFile.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,9 @@ public void startElement(String uri, String localName, String tagName, Attribute
flag = readRelativeTile(attributes);
} else if (TAG_BLOCKED.equals(tagName)) {
RelativePoint point = readRelativeTile(attributes);
if ("true".equals(attributes.getValue("block"))) {

// block should only be false or true. true is the default value but android sometimes defaults to null.
if (!"false".equals(attributes.getValue("block"))) {
blocked.add(point);
}
protectedTiles.add(point);
Expand Down
50 changes: 25 additions & 25 deletions jsettlers.common/src/main/resources/jsettlers/common/buildings/baker.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,31 +5,31 @@
<ground groundtype="EARTH" />
<ground groundtype="FLATTENED" />

<blocked dx="-2" dy="-3" block="true" />
<blocked dx="-2" dy="-2" block="true" />
<blocked dx="-2" dy="-1" block="true" />
<blocked dx="-2" dy="0" block="true" />
<blocked dx="-1" dy="1" block="true" />
<blocked dx="-1" dy="0" block="true" />
<blocked dx="-1" dy="-1" block="true" />
<blocked dx="-1" dy="-2" block="true" />
<blocked dx="-1" dy="-3" block="true" />
<blocked dx="0" dy="-2" block="true" />
<blocked dx="0" dy="-1" block="true" />
<blocked dx="0" dy="0" block="true" />
<blocked dx="0" dy="1" block="true" />
<blocked dx="0" dy="2" block="true" />
<blocked dx="1" dy="3" block="true" />
<blocked dx="1" dy="2" block="true" />
<blocked dx="1" dy="1" block="true" />
<blocked dx="1" dy="0" block="true" />
<blocked dx="1" dy="-1" block="true" />
<blocked dx="2" dy="0" block="true" />
<blocked dx="2" dy="1" block="true" />
<blocked dx="2" dy="2" block="true" />
<blocked dx="2" dy="3" block="true" />
<blocked dx="3" dy="3" block="true" />
<blocked dx="3" dy="1" block="true" />
<blocked dx="-2" dy="-3" />
<blocked dx="-2" dy="-2" />
<blocked dx="-2" dy="-1" />
<blocked dx="-2" dy="0" />
<blocked dx="-1" dy="1" />
<blocked dx="-1" dy="0" />
<blocked dx="-1" dy="-1" />
<blocked dx="-1" dy="-2" />
<blocked dx="-1" dy="-3" />
<blocked dx="0" dy="-2" />
<blocked dx="0" dy="-1" />
<blocked dx="0" dy="0" />
<blocked dx="0" dy="1" />
<blocked dx="0" dy="2" />
<blocked dx="1" dy="3" />
<blocked dx="1" dy="2" />
<blocked dx="1" dy="1" />
<blocked dx="1" dy="0" />
<blocked dx="1" dy="-1" />
<blocked dx="2" dy="0" />
<blocked dx="2" dy="1" />
<blocked dx="2" dy="2" />
<blocked dx="2" dy="3" />
<blocked dx="3" dy="3" />
<blocked dx="3" dy="1" />

<blocked dx="4" dy="1" block="false" />
<blocked dx="4" dy="2" block="false" />
Expand Down
70 changes: 35 additions & 35 deletions jsettlers.common/src/main/resources/jsettlers/common/buildings/barrack.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,41 +5,41 @@
<ground groundtype="EARTH"/>
<ground groundtype="FLATTENED"/>

<blocked dx="0" dy="0" block="true" />
<blocked dx="1" dy="1" block="true" />
<blocked dx="1" dy="2" block="true" />
<blocked dx="0" dy="1" block="true" />
<blocked dx="-1" dy="0" block="true" />
<blocked dx="-2" dy="-1" block="true" />
<blocked dx="-2" dy="-2" block="true" />
<blocked dx="-1" dy="-2" block="true" />
<blocked dx="-1" dy="-3" block="true" />
<blocked dx="0" dy="-3" block="true" />
<blocked dx="1" dy="-3" block="true" />
<blocked dx="2" dy="-2" block="true" />
<blocked dx="3" dy="-1" block="true" />
<blocked dx="4" dy="0" block="true" />
<blocked dx="5" dy="1" block="true" />
<blocked dx="5" dy="0" block="true" />
<blocked dx="4" dy="-1" block="true" />
<blocked dx="4" dy="2" block="true" />
<blocked dx="4" dy="1" block="true" />
<blocked dx="-1" dy="-1" block="true" />
<blocked dx="0" dy="-1" block="true" />
<blocked dx="0" dy="-2" block="true" />
<blocked dx="1" dy="-2" block="true" />
<blocked dx="1" dy="-1" block="true" />
<blocked dx="1" dy="0" block="true" />
<blocked dx="2" dy="-1" block="true" />
<blocked dx="2" dy="0" block="true" />
<blocked dx="-2" dy="-3" block="true" />
<blocked dx="0" dy="-4" block="true" />
<blocked dx="-1" dy="-4" block="true" />
<blocked dx="-2" dy="-4" block="true" />
<blocked dx="-2" dy="-5" block="true" />
<blocked dx="-1" dy="-5" block="true" />
<blocked dx="3" dy="0" block="true" />
<blocked dx="3" dy="1" block="true" />
<blocked dx="0" dy="0" />
<blocked dx="1" dy="1" />
<blocked dx="1" dy="2" />
<blocked dx="0" dy="1" />
<blocked dx="-1" dy="0" />
<blocked dx="-2" dy="-1" />
<blocked dx="-2" dy="-2" />
<blocked dx="-1" dy="-2" />
<blocked dx="-1" dy="-3" />
<blocked dx="0" dy="-3" />
<blocked dx="1" dy="-3" />
<blocked dx="2" dy="-2" />
<blocked dx="3" dy="-1" />
<blocked dx="4" dy="0" />
<blocked dx="5" dy="1" />
<blocked dx="5" dy="0" />
<blocked dx="4" dy="-1" />
<blocked dx="4" dy="2" />
<blocked dx="4" dy="1" />
<blocked dx="-1" dy="-1" />
<blocked dx="0" dy="-1" />
<blocked dx="0" dy="-2" />
<blocked dx="1" dy="-2" />
<blocked dx="1" dy="-1" />
<blocked dx="1" dy="0" />
<blocked dx="2" dy="-1" />
<blocked dx="2" dy="0" />
<blocked dx="-2" dy="-3" />
<blocked dx="0" dy="-4" />
<blocked dx="-1" dy="-4" />
<blocked dx="-2" dy="-4" />
<blocked dx="-2" dy="-5" />
<blocked dx="-1" dy="-5" />
<blocked dx="3" dy="0" />
<blocked dx="3" dy="1" />
<blocked dx="2" dy="1" block="false" />
<blocked dx="2" dy="2" block="false" />
<blocked dx="2" dy="3" block="false" />
Expand Down
Loading