1
Fork 0
mirror of https://github.com/Steffo99/swear-jar.git synced 2024-11-25 17:14:20 +00:00
Commit graph

193 commits

Author SHA1 Message Date
eaf4f6d15e
fix stuff 2023-10-02 21:25:11 +02:00
89340ee8d2
Merge branch 'main' of github.com:Steffo99/ld54 2023-10-02 20:56:19 +02:00
c938bb20ec
Make delete button clearer 2023-10-02 20:56:16 +02:00
Matteo Balugani
91cd49e103 coal_diamond_converter_manca switch 2023-10-02 20:44:53 +02:00
Matteo Balugani
c105e25728 Merge branch 'main' of https://github.com/Steffo99/ld54 2023-10-02 20:36:03 +02:00
Matteo Balugani
c7777580a4 coal_and_diamond 2023-10-02 20:36:00 +02:00
2aabadc815
Shop improv 2023-10-02 20:31:50 +02:00
48dd08642e
Merge branch 'main' of github.com:Steffo99/ld54 2023-10-02 20:28:10 +02:00
850612104b
Only materialize if there's room 2023-10-02 20:28:08 +02:00
Matteo Balugani
3c5c3ec510 Merge branch 'main' of https://github.com/Steffo99/ld54 2023-10-02 20:16:40 +02:00
Matteo Balugani
cc0f88b030 coal_diamond_converter 2023-10-02 20:16:37 +02:00
13d4813526
Merge branch 'main' of github.com:Steffo99/ld54 2023-10-02 20:06:31 +02:00
b71faaabba
Add deletion and debug spam 2023-10-02 20:06:28 +02:00
Matteo Balugani
e74fdba486 Merge branch 'main' of https://github.com/Steffo99/ld54 2023-10-02 19:58:35 +02:00
Matteo Balugani
a15129ba4c coal_diamond_converter 2023-10-02 19:57:54 +02:00
cd0ddc0f5a
Make converter pickable and scale 2023-10-02 19:52:20 +02:00
3743a71586
caffeinate entities 2023-10-02 19:50:56 +02:00
65c3ec32bc
Tweaks 2023-10-02 19:49:55 +02:00
Maxim Lobovsky
47149e7145 add gem stack sprite 2023-10-02 19:47:51 +02:00
3618576d9e
Move converter files 2023-10-02 19:29:42 +02:00
552817bab4
Import diamond converter 2023-10-02 19:26:50 +02:00
0ddfd01223
Fix collector mask 2023-10-02 19:26:45 +02:00
8dd73c8196
Merge branch 'main' of github.com:Steffo99/ld54 2023-10-02 19:26:07 +02:00
58afa4abc3
Delete corrupt gemstone spawner 2023-10-02 19:26:03 +02:00
Maxim Lobovsky
05a914ff8c Merge branch 'main' of https://github.com/Steffo99/ld54 2023-10-02 19:25:23 +02:00
Maxim Lobovsky
9779fc1e80 add diamond converter 2023-10-02 19:25:21 +02:00
fd580fa2d6
Connect shop ui to ghost 2023-10-02 19:21:50 +02:00
279480b863
Update game name 2023-10-02 19:21:43 +02:00
b1b3c38ae3
Configure shop 2023-10-02 19:19:13 +02:00
732afe9143
UI fixes 2023-10-02 18:50:06 +02:00
0e2552c9b9
Add missing uid 2023-10-02 18:48:04 +02:00
5188d66289
Delete corrupt root.tscn 2023-10-02 18:47:23 +02:00
d725b79f4e
Prevent spawning during a purchase 2023-10-02 18:46:09 +02:00
233627ad71
Lock positions of everything 2023-10-02 18:43:49 +02:00
293425a9ad
Delete empty script 2023-10-02 18:42:58 +02:00
823d237034
Disable autospawner 2023-10-02 18:42:40 +02:00
bc43de64d9
Fix gem value 2023-10-02 18:42:10 +02:00
63de9308a5
Fix more collision layer stuff 2023-10-02 18:36:55 +02:00
4e5ade9ddf
Merge branch 'main' of github.com:Steffo99/ld54 2023-10-02 18:29:10 +02:00
17e939e4a4
Fix collisions 2023-10-02 18:29:05 +02:00
Matteo Balugani
e426e25d11 items 2023-10-02 18:17:55 +02:00
91a5182912
Merge branch 'main' of github.com:Steffo99/ld54 2023-10-02 17:55:49 +02:00
6a48e49515
Add balumissing stuff 2023-10-02 17:53:13 +02:00
Matteo Balugani
30c29a7ade fixed coin copper error (script eliminato) 2023-10-02 17:41:07 +02:00
Matteo Balugani
8b969aafb0 ? 2023-10-02 17:32:18 +02:00
Matteo Balugani
e492e9ff43 converters fix 2023-10-02 17:10:23 +02:00
Matteo Balugani
b15931b7d8 bugfix fornace 2023-10-02 16:50:01 +02:00
Matteo Balugani
f25524b2b1 Merge branch 'main' of https://github.com/Steffo99/ld54 2023-10-02 16:33:00 +02:00
Matteo Balugani
1cbbf6b605 Merge branch 'main' of https://github.com/Steffo99/ld54 2023-10-02 16:32:57 +02:00
c861b85232
i think godot fixed this 2023-10-02 16:32:27 +02:00