James
|
12ae0c2c67
|
NAME IT
|
2024-04-21 18:00:11 +01:00 |
|
James
|
038b07511b
|
win and lose it allll
|
2024-04-21 17:59:57 +01:00 |
|
James
|
810ab1880b
|
Merge branch 'main' of github.com:Wil-Ro/gamejam2024
|
2024-04-21 17:51:17 +01:00 |
|
Rosia E Evans
|
7a2f799677
|
sdfsdfs
|
2024-04-21 17:46:29 +01:00 |
|
James
|
a1b1b5a8b9
|
fixed tall decay targeting too many faces
|
2024-04-21 17:26:06 +01:00 |
|
Rosia E Evans
|
ac960c53cd
|
merge
|
2024-04-21 17:20:25 +01:00 |
|
Rosia E Evans
|
7c4b6ea0af
|
alto
|
2024-04-21 17:20:01 +01:00 |
|
James
|
28b2b68c46
|
make falling pips despawn, remove redundancy
|
2024-04-21 17:13:56 +01:00 |
|
Rosia E Evans
|
9ba5125c15
|
Merge remote-tracking branch 'origin/main'
|
2024-04-21 17:12:27 +01:00 |
|
Rosia E Evans
|
a5d09f79c1
|
adds basis for dieNetUi
|
2024-04-21 17:11:59 +01:00 |
|
James
|
8d664684da
|
add falling pips woo
|
2024-04-21 17:10:58 +01:00 |
|
Rosia E Evans
|
cd72eae378
|
fixes bug
|
2024-04-21 16:49:02 +01:00 |
|
James
|
37ec466241
|
Merge branch 'main' of github.com:Wil-Ro/gamejam2024
|
2024-04-21 16:47:37 +01:00 |
|
James
|
1953e95ba2
|
adding fallingpip
|
2024-04-21 16:47:31 +01:00 |
|
Rosia E Evans
|
247c8aed5c
|
merge
|
2024-04-21 16:47:21 +01:00 |
|
Rosia E Evans
|
e9fc82cd45
|
dice shope
|
2024-04-21 16:44:35 +01:00 |
|
James
|
9b92852b77
|
created shope (invisible :o)
|
2024-04-21 16:36:30 +01:00 |
|
James
|
288a67e69d
|
game no longer crashes whoops
|
2024-04-21 16:16:16 +01:00 |
|
James
|
da27806b79
|
merge has been 'dealt with'
|
2024-04-21 16:14:43 +01:00 |
|
James
|
4e15b893fe
|
new shope each round
|
2024-04-21 16:12:36 +01:00 |
|
James
|
0b2b167d33
|
spelled shope wrong sorry
|
2024-04-21 16:03:43 +01:00 |
|
James
|
2c80b645db
|
Merge branch 'main' of github.com:Wil-Ro/gamejam2024
|
2024-04-21 16:02:43 +01:00 |
|
James
|
4f24c02b06
|
add shop framework
|
2024-04-21 16:02:34 +01:00 |
|
James
|
9404a14ec3
|
add basic shop
|
2024-04-21 16:02:17 +01:00 |
|
Rosia E Evans
|
3b60873125
|
font size tweak
|
2024-04-21 16:01:52 +01:00 |
|
Rosia E Evans
|
acf86e5507
|
Merge remote-tracking branch 'origin/main'
|
2024-04-21 16:00:56 +01:00 |
|
Rosia E Evans
|
ccca2c98fd
|
adds font
|
2024-04-21 16:00:37 +01:00 |
|
James
|
98aaf0605b
|
text move
|
2024-04-21 16:00:06 +01:00 |
|
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 |
|
Rosia E Evans
|
7c5563c496
|
adds textures
|
2024-04-21 14:24:56 +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 |
|