Skip to content

Commit d8926d3

Browse files
CrazyMarvinCrazyMarvin
authored
Merge pull request #20 from Crazy-Marvin/development
Halma 5.0
2 parents 9796824 + 3971688 commit d8926d3

File tree

22 files changed

+1831
-60
lines changed

22 files changed

+1831
-60
lines changed

‎android/assets/HALMA.fnt‎

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

‎android/assets/halma.atlas‎

Lines changed: 47 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,47 +1,47 @@
11

22
halma.png
3-
size: 512,512
3+
size: 2048,2048
44
format: RGBA8888
55
filter: Linear,Linear
66
repeat: none
77
baseline_face_white_18dp
88
rotate: false
9-
xy: 474, 475
9+
xy: 1093, 1076
1010
size: 36, 36
1111
orig: 36, 36
1212
offset: 0, 0
1313
index: -1
1414
man
1515
rotate: false
16-
xy: 474, 475
16+
xy: 1093, 1076
1717
size: 36, 36
1818
orig: 36, 36
1919
offset: 0, 0
2020
index: -1
2121
checkbox
2222
rotate: false
23-
xy: 452, 427
23+
xy: 264, 646
2424
size: 18, 18
2525
orig: 18, 18
2626
offset: 0, 0
2727
index: -1
2828
checkbox-on
2929
rotate: false
30-
xy: 92, 23
30+
xy: 308, 690
3131
size: 18, 18
3232
orig: 18, 18
3333
offset: 0, 0
3434
index: -1
3535
com
3636
rotate: false
37-
xy: 54, 5
37+
xy: 1230, 1265
3838
size: 36, 36
3939
orig: 36, 36
4040
offset: 0, 0
4141
index: -1
4242
cursor
4343
rotate: false
44-
xy: 248, 223
44+
xy: 1, 302
4545
size: 4, 7
4646
split: 1, 1, 2, 2
4747
pad: 0, 0, 0, 0
@@ -50,29 +50,29 @@ cursor
5050
index: -1
5151
font-export
5252
rotate: false
53-
xy: 264, 368
53+
xy: 1, 391
5454
size: 142, 143
5555
orig: 142, 143
5656
offset: 0, 0
5757
index: -1
5858
font-title-export
5959
rotate: false
60-
xy: 1, 246
60+
xy: 1, 536
6161
size: 261, 265
6262
orig: 261, 265
6363
offset: 0, 0
6464
index: -1
6565
horizontal-split-pane
6666
rotate: false
67-
xy: 257, 233
67+
xy: 1268, 1290
6868
size: 5, 11
6969
split: 2, 2, 2, 2
7070
orig: 5, 11
7171
offset: 0, 0
7272
index: -1
7373
list
7474
rotate: false
75-
xy: 204, 232
75+
xy: 1230, 1303
7676
size: 51, 12
7777
split: 2, 2, 2, 2
7878
pad: 5, 5, 5, 5
@@ -81,28 +81,28 @@ list
8181
index: -1
8282
minus
8383
rotate: false
84-
xy: 434, 388
84+
xy: 1027, 989
8585
size: 12, 13
8686
orig: 12, 13
8787
offset: 0, 0
8888
index: -1
8989
play
9090
rotate: false
91-
xy: 204, 150
91+
xy: 1, 311
9292
size: 36, 36
9393
orig: 36, 36
9494
offset: 0, 0
9595
index: -1
9696
plus
9797
rotate: false
98-
xy: 385, 341
98+
xy: 1071, 1033
9999
size: 12, 13
100100
orig: 12, 13
101101
offset: 0, 0
102102
index: -1
103103
progress-bar
104104
rotate: false
105-
xy: 337, 320
105+
xy: 145, 488
106106
size: 46, 46
107107
split: 10, 10, 10, 10
108108
pad: 6, 6, 6, 6
@@ -111,35 +111,35 @@ progress-bar
111111
index: -1
112112
progress-bar-fill
113113
rotate: false
114-
xy: 381, 284
114+
xy: 39, 313
115115
size: 1, 34
116116
orig: 1, 34
117117
offset: 0, 0
118118
index: -1
119119
progress-bar-fill-vert
120120
rotate: false
121-
xy: 264, 272
121+
xy: 1283, 1314
122122
size: 34, 1
123123
orig: 34, 1
124124
offset: 0, 0
125125
index: -1
126126
radio
127127
rotate: false
128-
xy: 204, 132
128+
xy: 337, 741
129129
size: 16, 16
130130
orig: 16, 16
131131
offset: 0, 0
132132
index: -1
133133
radio-on
134134
rotate: false
135-
xy: 264, 254
135+
xy: 381, 785
136136
size: 16, 16
137137
orig: 16, 16
138138
offset: 0, 0
139139
index: -1
140140
round-gray
141141
rotate: false
142-
xy: 408, 403
142+
xy: 264, 666
143143
size: 42, 42
144144
split: 13, 13, 13, 13
145145
pad: 9, 9, 5, 5
@@ -148,7 +148,7 @@ round-gray
148148
index: -1
149149
round-white
150150
rotate: false
151-
xy: 204, 188
151+
xy: 337, 759
152152
size: 42, 42
153153
split: 13, 13, 13, 13
154154
pad: 9, 9, 5, 5
@@ -157,7 +157,7 @@ round-white
157157
index: -1
158158
round-white-small
159159
rotate: false
160-
xy: 474, 449
160+
xy: 54, 365
161161
size: 24, 24
162162
split: 10, 10, 10, 10
163163
pad: 10, 10, 2, 2
@@ -166,7 +166,7 @@ round-white-small
166166
index: -1
167167
selectbox
168168
rotate: false
169-
xy: 1, 1
169+
xy: 1, 349
170170
size: 51, 40
171171
split: 2, 31, 2, 27
172172
pad: 2, 35, 2, 2
@@ -175,7 +175,7 @@ selectbox
175175
index: -1
176176
selection
177177
rotate: false
178-
xy: 452, 416
178+
xy: 1131, 1103
179179
size: 9, 9
180180
split: 2, 1, 2, 1
181181
pad: 4, 3, 4, 3
@@ -184,7 +184,7 @@ selection
184184
index: -1
185185
slider-horizontal
186186
rotate: false
187-
xy: 385, 356
187+
xy: 193, 524
188188
size: 20, 10
189189
split: 4, 4, 4, 4
190190
pad: 1, 2, 2, 2
@@ -193,14 +193,14 @@ slider-horizontal
193193
index: -1
194194
slider-knob
195195
rotate: false
196-
xy: 408, 377
196+
xy: 145, 462
197197
size: 24, 24
198198
orig: 24, 24
199199
offset: 0, 0
200200
index: -1
201201
slider-vertical
202202
rotate: false
203-
xy: 92, 1
203+
xy: 1230, 1243
204204
size: 9, 20
205205
split: 4, 3, 3, 3
206206
pad: 3, 3, 2, 2
@@ -209,48 +209,62 @@ slider-vertical
209209
index: -1
210210
textfield
211211
rotate: false
212-
xy: 337, 276
212+
xy: 1027, 1004
213213
size: 42, 42
214214
split: 8, 8, 8, 8
215215
orig: 42, 42
216216
offset: 0, 0
217217
index: -1
218218
touchpad
219219
rotate: false
220-
xy: 1, 43
220+
xy: 1027, 1114
221221
size: 201, 201
222222
orig: 201, 201
223223
offset: 0, 0
224224
index: -1
225225
touchpad-knob
226226
rotate: false
227-
xy: 408, 447
227+
xy: 1027, 1048
228228
size: 64, 64
229229
orig: 64, 64
230230
offset: 0, 0
231231
index: -1
232232
vertical-split-pane
233233
rotate: false
234-
xy: 500, 468
234+
xy: 1093, 1069
235235
size: 11, 5
236236
split: 2, 2, 1, 1
237237
pad: 1, 1, 1, 1
238238
orig: 11, 5
239239
offset: 0, 0
240240
index: -1
241+
white-pixel
242+
rotate: false
243+
xy: 1283, 1311
244+
size: 1, 1
245+
orig: 1, 1
246+
offset: 0, 0
247+
index: -1
241248
white
242249
rotate: false
243-
xy: 242, 185
250+
xy: 1283, 1311
244251
size: 1, 1
245252
orig: 1, 1
246253
offset: 0, 0
247254
index: -1
248255
window
249256
rotate: false
250-
xy: 264, 275
257+
xy: 264, 710
251258
size: 71, 91
252259
split: 15, 15, 35, 15
253260
pad: 9, 10, 37, 5
254261
orig: 71, 91
255262
offset: 0, 0
256263
index: -1
264+
HALMA
265+
rotate: false
266+
xy: 1, 803
267+
size: 1024, 512
268+
orig: 1024, 512
269+
offset: 0, 0
270+
index: -1

‎android/assets/halma.json‎

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
"font": {
44
"file": "font-export.fnt"
55
},
6+
"HALMA": {
7+
"file": "HALMA.fnt"
8+
},
69
"title": {
710
"file": "font-title-export.fnt"
811
}
@@ -72,13 +75,17 @@
7275
"b": 0.59,
7376
"a": 1
7477
}
78+
},
79+
"WHITE": {
80+
"name": "white-pixel",
81+
"color": "white"
7582
}
7683
},
7784
"com.badlogic.gdx.scenes.scene2d.ui.Button$ButtonStyle": {
7885
"default": {
79-
"up": "round-gray",
80-
"down": "round-dark-gray",
81-
"over": "round-light-gray",
86+
"up": "WHITE",
87+
"down": "WHITE",
88+
"over": "WHITE",
8289
"checked": "round-dark-gray"
8390
},
8491
"toggle": {
@@ -136,7 +143,7 @@
136143
},
137144
"com.badlogic.gdx.scenes.scene2d.ui.Label$LabelStyle": {
138145
"default": {
139-
"font": "font",
146+
"font": "HALMA",
140147
"fontColor": "white"
141148
},
142149
"title": {
@@ -202,9 +209,9 @@
202209
"parent": "default",
203210
"font": "font",
204211
"fontColor": "white",
205-
"up": "round-gray",
206-
"down": "round-dark-gray",
207-
"over": "round-light-gray"
212+
"up": "WHITE",
213+
"down": "WHITE",
214+
"over": "WHITE"
208215
},
209216
"toggle": {
210217
"font": "font",
@@ -218,9 +225,9 @@
218225
"special": {
219226
"font": "title",
220227
"fontColor": "black",
221-
"up": "round-gray",
222-
"down": "round-dark-gray",
223-
"over": "round-light-gray"
228+
"up": "WHITE",
229+
"down": "WHITE",
230+
"over": "WHITE"
224231
}
225232
},
226233
"com.badlogic.gdx.scenes.scene2d.ui.TextField$TextFieldStyle": {

‎android/assets/halma.png‎

188 KB
Loading

‎android/assets/redesign/ic_foreground.png‎

6.91 KB
Loading

‎android/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ android {
2020
applicationId "rocks.poopjournal.halma"
2121
minSdkVersion 14
2222
targetSdkVersion 29
23-
versionCode 4
24-
versionName "4.0"
23+
versionCode 5
24+
versionName "5.0"
2525
}
2626
buildTypes {
2727
release {

‎android/release/android-release.apk‎

335 KB
Binary file not shown.

‎android/release/output - Kopie.json‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎android/release/output.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":3,"versionName":"3.0","enabled":true,"outputFile":"android-release.apk","fullName":"release","baseName":"release"},"path":"android-release.apk","properties":{}}]
1+
[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":5,"versionName":"5.0","enabled":true,"outputFile":"android-release.apk","fullName":"release","baseName":"release"},"path":"android-release.apk","properties":{}}]

‎core/src/rocks/poopjournal/halma/BaseScreen.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public BaseScreen(Halma halma) {
3636
private void create(){
3737
System.out.println("test1");
3838
bgColor = Color.OLIVE;
39-
skin = new Skin(Gdx.files.internal("skin/halma.json"));
39+
skin = new Skin(Gdx.files.internal("halma.json"));
4040
System.out.println("test2");
4141
stage = new Stage(new ScreenViewport()){
4242
@Override

0 commit comments

Comments
 (0)