From 1d307286b482a91cc24e86a4b0053beb023a5d28 Mon Sep 17 00:00:00 2001 From: SimonIT Date: Sat, 14 Dec 2019 10:51:36 +0100 Subject: protected Assembly children, building on travis --- .travis.yml | 12 ++++++++++++ README.md | 3 ++- core/src/ch/asynk/gdx/boardgame/ui/Assembly.java | 2 +- core/src/ch/asynk/gdx/boardgame/ui/Element.java | 2 +- 4 files changed, 16 insertions(+), 3 deletions(-) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..91b23a6 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,12 @@ +language: java +jdk: + - openjdk8 + +before_cache: + - rm -f $HOME/.gradle/caches/modules-2/modules-2.lock + - rm -fr $HOME/.gradle/caches/*/plugin-resolution/ + +cache: + directories: + - $HOME/.gradle/caches/ + - $HOME/.gradle/wrapper/ diff --git a/README.md b/README.md index 5a67a5f..d57fe51 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ # gdx-boardgame [![](https://jitpack.io/v/jeremyz/gdx-boardgame.svg)](https://jitpack.io/#jeremyz/gdx-boardgame) +[![Build Status](https://travis-ci.org/jeremyz/gdx-boardgame.svg?branch=master)](https://travis-ci.org/jeremyz/gdx-boardgame) is a [libgdx](https://libgdx.badlogicgames.com/) based framework to build 2D boardgames. @@ -25,7 +26,7 @@ Add the repository: Add the dependency to all subprojects: (You can replace `master-SNAPSHOT` with a tag from github) ```groovy dependencies { - implementation 'com.github.jeremyz:gdx-boardgame:master-SNAPSHOT' + implementation 'com.github.jeremyz:gdx-boardgame:master-SNAPSHOT' } ``` If you use the html module, you have to add also this module to its dependencies: diff --git a/core/src/ch/asynk/gdx/boardgame/ui/Assembly.java b/core/src/ch/asynk/gdx/boardgame/ui/Assembly.java index 5e71a46..b2b1e28 100644 --- a/core/src/ch/asynk/gdx/boardgame/ui/Assembly.java +++ b/core/src/ch/asynk/gdx/boardgame/ui/Assembly.java @@ -7,7 +7,7 @@ import ch.asynk.gdx.boardgame.utils.IterableSet; public abstract class Assembly extends Element { - private IterableSet children; + protected IterableSet children; private Element touched; public Assembly(int c) diff --git a/core/src/ch/asynk/gdx/boardgame/ui/Element.java b/core/src/ch/asynk/gdx/boardgame/ui/Element.java index a7a820a..abefdd5 100644 --- a/core/src/ch/asynk/gdx/boardgame/ui/Element.java +++ b/core/src/ch/asynk/gdx/boardgame/ui/Element.java @@ -97,7 +97,7 @@ public abstract class Element implements Drawable, Paddable, Positionable, Touch public final void setPosition(Rectangle r) { - setPosition(r.x, r.x, r.width, r.height); + setPosition(r.x, r.y, r.width, r.height); } @Override public final void setPosition(float x, float y) -- cgit v1.1-2-g2b99