Rosia E Evans
|
605d81d35e
|
adds font
|
2024-04-21 15:52:11 +01:00 |
|
James
|
97639fca47
|
remove printing
|
2024-04-21 15:15:49 +01:00 |
|
James
|
a165f284de
|
fix merge
|
2024-04-21 15:15:17 +01:00 |
|
Rosia E Evans
|
b212f1884d
|
textures
|
2024-04-21 15:04:04 +01:00 |
|
James
|
46c2098cf9
|
change segment colours
|
2024-04-21 15:03:11 +01:00 |
|
James
|
ac9b9428e1
|
rounds automatically progress
|
2024-04-21 15:01:35 +01:00 |
|
James
|
7632c476fa
|
Merge branch 'main' of github.com:Wil-Ro/gamejam2024
|
2024-04-21 14:35:00 +01:00 |
|
James
|
88e6ffff08
|
auto round movement
|
2024-04-21 14:34:37 +01:00 |
|
Rosia E Evans
|
81a3c8bf31
|
adds textures and code to colour criteria
|
2024-04-21 14:34:23 +01:00 |
|
James
|
2b50774435
|
merge has been 'dealt with'
|
2024-04-21 14:25:54 +01:00 |
|
James
|
fd59b1a4c5
|
add round generation
|
2024-04-21 14:23:47 +01:00 |
|
Rosia E Evans
|
d7bcd3e3b8
|
adds working segment ui
|
2024-04-21 14:10:02 +01:00 |
|
Rosia E Evans
|
5abd65c7b4
|
Merge remote-tracking branch 'origin/main'
|
2024-04-21 13:28:22 +01:00 |
|
Rosia E Evans
|
bdc70403e9
|
adds start of criteria gui
|
2024-04-21 13:27:41 +01:00 |
|
James
|
89b01891b4
|
add tall decay type
|
2024-04-21 12:57:21 +01:00 |
|
James
|
7f9ca47b84
|
add skeleton for getting sprites
|
2024-04-21 12:53:13 +01:00 |
|
James
|
ef4c33ddf0
|
Merge branch 'main' of github.com:Wil-Ro/gamejam2024
|
2024-04-21 12:47:59 +01:00 |
|
Rosia E Evans
|
e2dc9dcc4b
|
removes green square temporarily
|
2024-04-21 12:46:53 +01:00 |
|
James
|
594fd5074a
|
attacks now reroll, cannot destroy segment twice
|
2024-04-21 12:46:16 +01:00 |
|
James
|
cd53c4b08d
|
add limited rerolls back
|
2024-04-21 12:45:17 +01:00 |
|
Rosia E Evans
|
bd02582186
|
merge conflict vanished
|
2024-04-21 12:44:14 +01:00 |
|
Rosia E Evans
|
75f14cb3d4
|
adds green backing ready for criteria
|
2024-04-21 12:42:30 +01:00 |
|
James
|
1779f3d448
|
add decay (THE THEME OF THE JAM)
|
2024-04-21 12:40:56 +01:00 |
|
James
|
8c5a4f0bea
|
fix argument permutation
|
2024-04-21 11:39:10 +01:00 |
|
James
|
f95a1e9260
|
add segments to round class
|
2024-04-21 11:36:53 +01:00 |
|
James
|
06b61bdcbb
|
move main
|
2024-04-21 11:33:36 +01:00 |
|
James
|
94a88c9e1d
|
debug code 'dealt with'
|
2024-04-21 11:31:20 +01:00 |
|
James
|
191077ef19
|
add olympic segment
|
2024-04-21 02:45:54 +01:00 |
|
Rosia E Evans
|
c5e6eb6582
|
merge
|
2024-04-21 02:39:00 +01:00 |
|
Rosia E Evans
|
eb526de0fa
|
rerolls
|
2024-04-21 02:37:52 +01:00 |
|
James
|
4bc740986e
|
fix selected dice
|
2024-04-21 01:51:12 +01:00 |
|
Rosia E Evans
|
aef7e2c955
|
merge
|
2024-04-21 01:31:46 +01:00 |
|
James
|
f947e25af7
|
only selected dice beat segments
|
2024-04-21 01:30:46 +01:00 |
|
Rosia E Evans
|
c099ac0c5f
|
adds textures
|
2024-04-21 01:29:38 +01:00 |
|
James
|
3a6b5379dc
|
remove actors
|
2024-04-21 01:19:50 +01:00 |
|
James
|
98c09014ad
|
Merge branch 'main' of github.com:Wil-Ro/gamejam2024
|
2024-04-21 00:29:23 +01:00 |
|
James
|
01cc43540c
|
add coloured segments
|
2024-04-21 00:29:18 +01:00 |
|
Rosia E Evans
|
dbb7868659
|
how do I sprite cranberry and why to people keep asking if I wanna?
|
2024-04-21 00:27:50 +01:00 |
|
Rosia E Evans
|
bf25eaf84a
|
dice now raise and twist
|
2024-04-21 00:24:27 +01:00 |
|
James
|
64b12d17a6
|
add dual segments
|
2024-04-20 20:22:57 +01:00 |
|
James
|
57e975c7c7
|
added segment and kinsegment
|
2024-04-20 19:18:00 +01:00 |
|
James
|
92bd26341d
|
upgrade to java 1.20
|
2024-04-20 17:31:01 +01:00 |
|
James
|
b34b175acd
|
move check for locked dice when rerolling
|
2024-04-20 16:59:47 +01:00 |
|
James
|
d98d9ece8b
|
remove redundant code
|
2024-04-20 16:58:54 +01:00 |
|
James
|
953736e7bc
|
Merge branch 'main' of github.com:Wil-Ro/gamejam2024
|
2024-04-20 16:52:52 +01:00 |
|
Rosia E Evans
|
a428fc7a87
|
adds variation to die faces
|
2024-04-20 16:49:01 +01:00 |
|
Rosia E Evans
|
65377d8384
|
fixes and finalises die faces
|
2024-04-20 16:38:07 +01:00 |
|
James
|
40bcbee4e9
|
added ability to lock dice
|
2024-04-20 16:34:16 +01:00 |
|
Rosia E Evans
|
2544da0313
|
merge
|
2024-04-20 16:17:34 +01:00 |
|
Rosia E Evans
|
d06da44e56
|
merge
|
2024-04-20 16:16:41 +01:00 |
|