Skip to content

Commit 328137c

Browse files
IngPippoIngPippo
IngPippo
authored and
IngPippo
committed
Merge branch 'master' of https://github.com/electronstudio/cats 
2 parents 3bbcf38 + 96795bb commit 328137c

File tree

12 files changed

+719
-263
lines changed

12 files changed

+719
-263
lines changed

‎build.gradle‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ buildscript {
99
}
1010
dependencies {
1111
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
12+
classpath group: 'de.dynamicfiles.projects.gradle.plugins', name: 'javafx-gradle-plugin', version: '8.8.2'
1213

1314
}
1415
}
@@ -25,6 +26,7 @@ allprojects {
2526
box2DLightsVersion = '1.4'
2627
ashleyVersion = '1.7.0'
2728
aiVersion = '1.8.0'
29+
gdxUtilsVersion = '0.13.4'
2830
}
2931

3032
repositories {
@@ -54,6 +56,7 @@ project(":core") {
5456
dependencies {
5557
compile "com.badlogicgames.gdx:gdx:$gdxVersion"
5658
compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
59+
compile "net.dermetfan.libgdx-utils:libgdx-utils:$gdxUtilsVersion"
5760
}
5861
}
5962

‎core/assets/big.fnt‎

Lines changed: 184 additions & 0 deletions
Large diffs are not rendered by default.

‎core/assets/big.png‎

4.15 KB
Loading

‎core/assets/level1.tmx‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<map version="1.0" tiledversion="1.1.0" orientation="orthogonal" renderorder="right-down" width="15" height="8" tilewidth="128" tileheight="128" infinite="0" nextobjectid="1">
2+
<map version="1.0" tiledversion="1.1.1" orientation="orthogonal" renderorder="right-down" width="15" height="8" tilewidth="128" tileheight="128" infinite="0" nextobjectid="1">
33
<tileset firstgid="1" source="tiles.tsx"/>
44
<tileset firstgid="65" source="template_assets_v1.tsx"/>
55
<layer name="Tile Layer 1" width="15" height="8">
66
<data encoding="csv">
7-
135,0,0,0,0,0,0,0,0,0,117,0,0,0,0,
8-
0,0,119,0,0,0,0,0,119,0,0,0,0,0,0,
7+
135,0,116,0,0,0,0,0,0,122,117,0,0,0,0,
8+
0,0,0,0,0,0,122,0,0,122,0,0,0,0,0,
99
0,0,0,101,0,0,0,0,0,0,0,0,0,0,102,
10-
0,0,0,0,0,0,0,134,119,0,0,0,119,0,0,
10+
122,0,0,119,0,0,122,134,0,122,0,0,0,0,0,
1111
0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
12-
103,0,0,0,0,0,0,0,0,0,116,0,0,0,0,
12+
103,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
1313
158,159,160,161,162,163,164,165,166,167,168,158,159,160,160,
14-
173,174,175,176,177,178,179,180,181,182,183,173,174,175,175
14+
173,174,175,176,177,178,179,180,181,182,183,173,182,183,184
1515
</data>
1616
</layer>
1717
</map>

‎core/assets/template_assets_v1.png‎

-6.35 KB
Loading

‎core/assets/template_assets_v1.tsx‎

Lines changed: 77 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,60 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<tileset name="template_assets_v1" tilewidth="128" tileheight="128" tilecount="120" columns="15">
33
<image source="template_assets_v1.png" width="1920" height="1080"/>
4+
<tile id="18">
5+
<properties>
6+
<property name="obstacle" type="bool" value="true"/>
7+
</properties>
8+
</tile>
9+
<tile id="19">
10+
<properties>
11+
<property name="obstacle" type="bool" value="true"/>
12+
</properties>
13+
</tile>
14+
<tile id="33">
15+
<properties>
16+
<property name="obstacle" type="bool" value="true"/>
17+
</properties>
18+
</tile>
19+
<tile id="34">
20+
<properties>
21+
<property name="obstacle" type="bool" value="true"/>
22+
</properties>
23+
</tile>
424
<tile id="36">
525
<properties>
6-
<property name="origin" type="bool" value="true"/>
26+
<property name="obstacle" type="bool" value="true"/>
27+
</properties>
28+
</tile>
29+
<tile id="37">
30+
<properties>
31+
<property name="obstacle" type="bool" value="true"/>
32+
</properties>
33+
</tile>
34+
<tile id="38">
35+
<properties>
36+
<property name="obstacle" type="bool" value="true"/>
37+
</properties>
38+
</tile>
39+
<tile id="48">
40+
<properties>
41+
<property name="obstacle" type="bool" value="true"/>
42+
</properties>
43+
</tile>
44+
<tile id="49">
45+
<properties>
46+
<property name="obstacle" type="bool" value="true"/>
747
</properties>
848
</tile>
949
<tile id="51">
1050
<properties>
1151
<property name="goal" type="bool" value="true"/>
52+
<property name="obstacle" type="bool" value="true"/>
53+
</properties>
54+
</tile>
55+
<tile id="52">
56+
<properties>
57+
<property name="obstacle" type="bool" value="true"/>
1258
</properties>
1359
</tile>
1460
<tile id="54">
@@ -31,4 +77,34 @@
3177
<property name="mirror" type="int" value="0"/>
3278
</properties>
3379
</tile>
80+
<tile id="63">
81+
<properties>
82+
<property name="obstacle" type="bool" value="true"/>
83+
</properties>
84+
</tile>
85+
<tile id="64">
86+
<properties>
87+
<property name="obstacle" type="bool" value="true"/>
88+
</properties>
89+
</tile>
90+
<tile id="68">
91+
<properties>
92+
<property name="obstacle" type="bool" value="true"/>
93+
</properties>
94+
</tile>
95+
<tile id="69">
96+
<properties>
97+
<property name="obstacle" type="bool" value="true"/>
98+
</properties>
99+
</tile>
100+
<tile id="70">
101+
<properties>
102+
<property name="obstacle" type="bool" value="true"/>
103+
</properties>
104+
</tile>
105+
<tile id="96">
106+
<properties>
107+
<property name="origin" type="bool" value="true"/>
108+
</properties>
109+
</tile>
34110
</tileset>

‎core/assets/template_assets_v2.png‎

-2.01 MB
Binary file not shown.

0 commit comments

Comments
 (0)