Commit graph

62 commits

Author SHA1 Message Date
James
fd59b1a4c5 add round generation 2024-04-21 14:23:47 +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
eb33c3afc5 Merge branch 'main' of github.com:Wil-Ro/gamejam2024 2024-04-20 17:00: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
Rosia E Evans
fe4a77b32a merge 2024-04-20 16:53:44 +01:00
Rosia E Evans
9e6f89c0d0 adds textures 2024-04-20 16:53:01 +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
James
e2b34c8bd3 add reroll key, 'r' 2024-04-20 16:15:42 +01:00
Rosia E Evans
1eba84645e refactors dice face code, adds sprites 2024-04-20 16:14:47 +01:00
James
68c60a2245 fix tick method running at the reciprocal of TPS 2024-04-20 16:01:31 +01:00
James
686f6c26e2 even -> odd 2024-04-20 15:50:42 +01:00
James
c4559837bb Merge branch 'main' of github.com:Wil-Ro/gamejam2024 2024-04-20 15:48:18 +01:00
Rosia E Evans
808b1a8d65 merging 2024-04-20 15:47:21 +01:00
James
cfbe8ad8b4 add numbers for test display 2024-04-20 15:45:42 +01:00
Rosia E Evans
53d2f02bae adds die face logic and face rendering 2024-04-20 15:45:41 +01:00
James
6abb79e3a9 whitespace 2024-04-20 15:30:50 +01:00
James
54c4937b8a add final to variables 2024-04-20 15:30:22 +01:00