73 Commits

Author SHA1 Message Date
rsninja722
b72051ebbe Merge remote-tracking branch 'origin/master' into rsninja/fixes 2022-04-04 00:47:25 -04:00
rsninja722
14d8a73c02 fixes 2022-04-04 00:47:18 -04:00
e1b6311025 Give the game a name 2022-04-04 00:13:55 -04:00
ab82ec626d Arty art 2022-04-04 00:07:07 -04:00
5a4729c78d
Merge pull request #46 from Ewpratten/demilurii/art2
intro cutscene comic
2022-04-03 23:49:48 -04:00
3b1b9c79ce intro cutscene comic 2022-04-03 23:47:40 -04:00
cd5bb81f23
Merge branch 'master' into melting 2022-04-03 23:02:58 -04:00
bd713c3e75
Merge Stash 2022-04-03 22:59:51 -04:00
a79f0e7c90 move market 2022-04-03 22:55:33 -04:00
f1886ef07f Mm 2022-04-03 22:52:39 -04:00
rsninja722
7ff54e78af Merge remote-tracking branch 'origin/master' into rsninja722/nice_map 2022-04-03 22:43:57 -04:00
rsninja722
2e50aafde3 temapuratures 2022-04-03 22:43:50 -04:00
548d09a2bf
Merge pull request #43 from Ewpratten/rsninja722/nice_map
The world map
2022-04-03 22:16:16 -04:00
rsninja722
522bf8c759 Merge remote-tracking branch 'origin/demilurii/art2' into rsninja722/nice_map 2022-04-03 21:56:42 -04:00
rsninja722
9d88a6bf65 object definitions 2022-04-03 21:56:23 -04:00
db4d2e3c62 you melted ending screen edit 2022-04-03 21:18:51 -04:00
1f2f11fc57 you melted ending screen added 2022-04-03 21:16:22 -04:00
805ae65b8c Cup pointer 2022-04-03 20:46:06 -04:00
0a42b0d9a2 car and truck varient objects 2022-04-03 19:50:56 -04:00
13fbc9f8db Winning the game is a thing 2022-04-03 19:35:24 -04:00
rsninja722
39721968f3 Merge remote-tracking branch 'origin/demilurii/art2' into rsninja722/nice_map 2022-04-03 19:20:30 -04:00
rsninja722
35342997cd map with new tiles 2022-04-03 19:20:21 -04:00
3d7285e51f market roof and interior with different colour varients 2022-04-03 18:32:48 -04:00
rsninja722
abc65254eb Merge remote-tracking branch 'origin/demilurii/art2' into rsninja722/nice_map 2022-04-03 18:19:30 -04:00
ad7fa3914c inner corner tile pieces completed 2022-04-03 15:17:49 -04:00
d0a704d05e Add chairs 2022-04-03 15:11:24 -04:00
c06059949f
Merge pull request #33 from Ewpratten/demilurii/art2
beach chair object sprites
2022-04-03 15:05:58 -04:00
1f2e32a607 Towel defs 2022-04-03 15:03:43 -04:00
2b4a5ce087 Umbrella defs 2022-04-03 14:54:08 -04:00
cf645c1d1b Added red umbrella 2022-04-03 14:38:51 -04:00
3dc8b66498 beach chair object sprites 2022-04-03 14:37:04 -04:00
0145c42a51 idk anymore. I think I fixed something? 2022-04-03 14:31:03 -04:00
8bbb0619a9 Merge branch 'master' into ewpratten/better_footprints 2022-04-03 14:01:59 -04:00
b483f91913 Merge branch 'demilurii/art2' 2022-04-03 14:01:53 -04:00
76bf5396c9 Bring in towels 2022-04-03 13:59:37 -04:00
32190cb4c5 Revert "seperated beach towels"
This reverts commit fbd1835921c8528d35c3420efff897581d0e26d9.
2022-04-03 13:59:17 -04:00
4e511ed395 Working on umbrella rendering 2022-04-03 13:55:50 -04:00
fbd1835921 seperated beach towels 2022-04-03 13:50:31 -04:00
614822d464
Merge pull request #29 from Ewpratten/ewpratten/colliders_api
Bring in a colissions API
2022-04-03 13:22:27 -04:00
731a1acf2f World colission querying 2022-04-03 13:22:03 -04:00
abe1c06f73
Merge pull request #28 from Ewpratten/demilurii/art2
Pull in some miwu art
2022-04-03 13:18:47 -04:00
3a37d7b715 Merge branch 'master' into ewpratten/colliders_api 2022-04-03 11:52:44 -04:00
0cc0401b66 Let buttons play a clicking noise when pressed 2022-04-03 11:27:58 -04:00
260aa83984 added the umbrella pole and towel varients 2022-04-02 22:51:52 -04:00
72065011ff umbrella tiles and colour varients 2022-04-02 22:36:10 -04:00
e6157067ed Can no longer run off the map 2022-04-02 21:39:44 -04:00
85b2393ff9 melting animations for cubee 2022-04-02 21:13:01 -04:00
f0c625bf02
Merge branch 'master' into ewpratten/audio 2022-04-02 19:40:33 -04:00
ae4085c6ca We have music! 2022-04-02 19:37:07 -04:00
6bfeb8ea60 Merge branch 'master' into ewpratten/object_defs 2022-04-02 18:48:20 -04:00