Commit graph

40 commits

Author SHA1 Message Date
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
James
2624277302 add roll and decay 2024-04-20 15:24:09 +01:00
James
318cda7673 resolve merge conflict 2024-04-20 15:09:04 +01:00
James
6e17a0c28c add method skeletons 2024-04-20 15:07:42 +01:00
Rosia E Evans
beb88e80be merging 2024-04-20 15:07:13 +01:00
Rosia E Evans
291d2abf4a adds shapes to die and their faces 2024-04-20 15:02:32 +01:00
James
7307c209d3 add pips to face class 2024-04-20 15:00:41 +01:00
James
2a38a68285 modify game loop 2024-04-20 14:56:13 +01:00
James
8e6527afa0 add die 2024-04-20 14:40:06 +01:00
Rosia E Evans
1dfc2b50b1 ignore this :P 2024-04-20 14:39:08 +01:00
Rosia E Evans
3889eac0b9 adds dice class 2024-04-20 13:10:30 +01:00
Rosia E Evans
58317495a6 initial push 2024-04-20 12:58:06 +01:00
Rosia E Evans
1ba01e529a
Initial commit 2024-04-20 12:54:08 +01:00