25 Commits

Author SHA1 Message Date
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
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
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
6bfeb8ea60 Merge branch 'master' into ewpratten/object_defs 2022-04-02 18:48:20 -04:00
10fbc84252 Allow players to take shade 2022-04-02 16:33:40 -04:00
f5c63a5c55 Defining a test object 2022-04-02 15:07:22 -04:00
rsninja722
e1297618d3 temporary assets and map 2022-04-02 14:30:18 -04:00
27fc010ac6 Tilemap loading 2022-04-02 13:01:49 -04:00
7065c24637 Working on getting tiles to load 2022-04-02 12:52:02 -04:00