Commit graph

Select branches

Hide pull requests

main

Release

Mono Color

• 12ae0c2c67 NAME IT main Release James 2024-04-21 18:00:11 +01:00
• 038b07511b win and lose it allll James 2024-04-21 17:59:57 +01:00
• 810ab1880b Merge branch 'main' of github.com:Wil-Ro/gamejam2024 James 2024-04-21 17:51:17 +01:00
• 7a2f799677 sdfsdfs Rosia E Evans 2024-04-21 17:46:29 +01:00
• a1b1b5a8b9 fixed tall decay targeting too many faces James 2024-04-21 17:26:00 +01:00
• ac960c53cd merge Rosia E Evans 2024-04-21 17:20:25 +01:00
• 7c4b6ea0af alto Rosia E Evans 2024-04-21 17:20:01 +01:00
• 28b2b68c46 make falling pips despawn, remove redundancy James 2024-04-21 17:13:56 +01:00
• 9ba5125c15 Merge remote-tracking branch 'origin/main' Rosia E Evans 2024-04-21 17:12:27 +01:00
• a5d09f79c1 adds basis for dieNetUi Rosia E Evans 2024-04-21 17:11:59 +01:00
• 8d664684da add falling pips woo James 2024-04-21 17:10:58 +01:00
• cd72eae378 fixes bug Rosia E Evans 2024-04-21 16:49:02 +01:00
• 37ec466241 Merge branch 'main' of github.com:Wil-Ro/gamejam2024 James 2024-04-21 16:47:37 +01:00
• 1953e95ba2 adding fallingpip James 2024-04-21 16:47:31 +01:00
• 247c8aed5c merge Rosia E Evans 2024-04-21 16:47:21 +01:00
• e9fc82cd45 dice shope Rosia E Evans 2024-04-21 16:44:35 +01:00
• 9b92852b77 created shope (invisible :o) James 2024-04-21 16:36:30 +01:00
• 288a67e69d game no longer crashes whoops James 2024-04-21 16:16:16 +01:00
• da27806b79 merge has been 'dealt with' James 2024-04-21 16:14:43 +01:00
• 4e15b893fe new shope each round James 2024-04-21 16:03:26 +01:00
• 0b2b167d33 spelled shope wrong sorry James 2024-04-21 16:03:26 +01:00
• 2c80b645db Merge branch 'main' of github.com:Wil-Ro/gamejam2024 James 2024-04-21 16:02:43 +01:00
• 4f24c02b06 add shop framework James 2024-04-21 16:02:34 +01:00
• 9404a14ec3 add basic shop James 2024-04-21 16:02:17 +01:00
• 3b60873125 font size tweak Rosia E Evans 2024-04-21 16:01:52 +01:00
• acf86e5507 Merge remote-tracking branch 'origin/main' Rosia E Evans 2024-04-21 16:00:56 +01:00
• ccca2c98fd adds font Rosia E Evans 2024-04-21 16:00:37 +01:00
• 98aaf0605b text move James 2024-04-21 16:00:06 +01:00
• 605d81d35e adds font Rosia E Evans 2024-04-21 15:52:11 +01:00
• 97639fca47 remove printing James 2024-04-21 15:15:49 +01:00
• a165f284de fix merge James 2024-04-21 15:15:17 +01:00
• b212f1884d textures Rosia E Evans 2024-04-21 15:04:04 +01:00
• 46c2098cf9 change segment colours James 2024-04-21 15:03:11 +01:00
• ac9b9428e1 rounds automatically progress James 2024-04-21 15:01:35 +01:00
• 7632c476fa Merge branch 'main' of github.com:Wil-Ro/gamejam2024 James 2024-04-21 14:35:00 +01:00
• 88e6ffff08 auto round movement James 2024-04-21 14:34:37 +01:00
• 81a3c8bf31 adds textures and code to colour criteria Rosia E Evans 2024-04-21 14:34:23 +01:00
• 2b50774435 merge has been 'dealt with' James 2024-04-21 14:25:54 +01:00
• 7c5563c496 adds textures Rosia E Evans 2024-04-21 14:24:56 +01:00
• fd59b1a4c5 add round generation James 2024-04-21 14:23:47 +01:00
• d7bcd3e3b8 adds working segment ui Rosia E Evans 2024-04-21 14:10:02 +01:00
• 5abd65c7b4 Merge remote-tracking branch 'origin/main' Rosia E Evans 2024-04-21 13:28:22 +01:00
• bdc70403e9 adds start of criteria gui Rosia E Evans 2024-04-21 13:27:41 +01:00
• 89b01891b4 add tall decay type James 2024-04-21 12:57:21 +01:00
• 7f9ca47b84 add skeleton for getting sprites James 2024-04-21 12:53:13 +01:00
• ef4c33ddf0 Merge branch 'main' of github.com:Wil-Ro/gamejam2024 James 2024-04-21 12:47:59 +01:00
• e2dc9dcc4b removes green square temporarily Rosia E Evans 2024-04-21 12:46:53 +01:00
• 594fd5074a attacks now reroll, cannot destroy segment twice James 2024-04-21 12:46:16 +01:00
• cd53c4b08d add limited rerolls back James 2024-04-21 12:45:17 +01:00
• bd02582186 merge conflict vanished Rosia E Evans 2024-04-21 12:44:14 +01:00
• 75f14cb3d4 adds green backing ready for criteria Rosia E Evans 2024-04-21 12:42:30 +01:00
• 1779f3d448 add decay (THE THEME OF THE JAM) James 2024-04-21 12:40:56 +01:00
• 8c5a4f0bea fix argument permutation James 2024-04-21 11:39:10 +01:00
• f95a1e9260 add segments to round class James 2024-04-21 11:36:53 +01:00
• 06b61bdcbb move main James 2024-04-21 11:33:36 +01:00
• 94a88c9e1d debug code 'dealt with' James 2024-04-21 11:31:20 +01:00
• 191077ef19 add olympic segment James 2024-04-21 02:45:54 +01:00
• c5e6eb6582 merge Rosia E Evans 2024-04-21 02:39:00 +01:00
• eb526de0fa rerolls Rosia E Evans 2024-04-21 02:37:52 +01:00
• 4bc740986e fix selected dice James 2024-04-21 01:51:12 +01:00
• aef7e2c955 merge Rosia E Evans 2024-04-21 01:31:46 +01:00
• f947e25af7 only selected dice beat segments James 2024-04-21 01:30:46 +01:00
• c099ac0c5f adds textures Rosia E Evans 2024-04-21 01:29:38 +01:00
• 3a6b5379dc remove actors James 2024-04-21 01:19:50 +01:00
• 98c09014ad Merge branch 'main' of github.com:Wil-Ro/gamejam2024 James 2024-04-21 00:29:23 +01:00
• 01cc43540c add coloured segments James 2024-04-21 00:29:18 +01:00
• dbb7868659 how do I sprite cranberry and why to people keep asking if I wanna? Rosia E Evans 2024-04-21 00:27:50 +01:00
• bf25eaf84a dice now raise and twist Rosia E Evans 2024-04-21 00:24:27 +01:00
• 64b12d17a6 add dual segments James 2024-04-20 20:22:57 +01:00
• 57e975c7c7 added segment and kinsegment James 2024-04-20 19:18:00 +01:00
• 92bd26341d upgrade to java 1.20 James 2024-04-20 17:30:56 +01:00
• eb33c3afc5 Merge branch 'main' of github.com:Wil-Ro/gamejam2024 James 2024-04-20 17:00:01 +01:00
• b34b175acd move check for locked dice when rerolling James 2024-04-20 16:59:47 +01:00
• d98d9ece8b remove redundant code James 2024-04-20 16:57:59 +01:00
• fe4a77b32a merge Rosia E Evans 2024-04-20 16:53:44 +01:00
• 9e6f89c0d0 adds textures Rosia E Evans 2024-04-20 16:53:01 +01:00
• 953736e7bc Merge branch 'main' of github.com:Wil-Ro/gamejam2024 James 2024-04-20 16:52:52 +01:00
• a428fc7a87 adds variation to die faces Rosia E Evans 2024-04-20 16:49:01 +01:00
• 65377d8384 fixes and finalises die faces Rosia E Evans 2024-04-20 16:38:07 +01:00
• 40bcbee4e9 added ability to lock dice James 2024-04-20 16:34:16 +01:00
• 2544da0313 merge Rosia E Evans 2024-04-20 16:17:34 +01:00
• d06da44e56 merge Rosia E Evans 2024-04-20 16:16:41 +01:00
• e2b34c8bd3 add reroll key, 'r' James 2024-04-20 16:15:42 +01:00
• 1eba84645e refactors dice face code, adds sprites Rosia E Evans 2024-04-20 16:14:47 +01:00
• 68c60a2245 fix tick method running at the reciprocal of TPS James 2024-04-20 16:01:31 +01:00
• 686f6c26e2 even -> odd James 2024-04-20 15:50:42 +01:00
• c4559837bb Merge branch 'main' of github.com:Wil-Ro/gamejam2024 James 2024-04-20 15:48:18 +01:00
• 808b1a8d65 merging Rosia E Evans 2024-04-20 15:47:21 +01:00
• cfbe8ad8b4 add numbers for test display James 2024-04-20 15:45:42 +01:00
• 53d2f02bae adds die face logic and face rendering Rosia E Evans 2024-04-20 15:45:41 +01:00
• 6abb79e3a9 whitespace James 2024-04-20 15:30:50 +01:00
• 54c4937b8a add final to variables James 2024-04-20 15:30:22 +01:00
• 2624277302 add roll and decay James 2024-04-20 15:24:09 +01:00
• 318cda7673 resolve merge conflict James 2024-04-20 15:09:04 +01:00
• 6e17a0c28c add method skeletons James 2024-04-20 15:07:42 +01:00
• beb88e80be merging Rosia E Evans 2024-04-20 15:07:13 +01:00
• 291d2abf4a adds shapes to die and their faces Rosia E Evans 2024-04-20 15:02:32 +01:00
• 7307c209d3 add pips to face class James 2024-04-20 15:00:41 +01:00
• 2a38a68285 modify game loop James 2024-04-20 14:56:13 +01:00
• 8e6527afa0 add die James 2024-04-20 14:40:06 +01:00