147 Commits

Author SHA1 Message Date
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
aa47d0b548
Merge pull request #30 from Ewpratten/ewpratten/better_footprints
Fix some footprinting bugs
2022-04-03 14:35:18 -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
2b2c276dc8
Merge pull request #27 from Ewpratten/main_main_menu_menu
Volume Button implementation
2022-04-03 11:35:26 -04:00
49c8222e26 Persistent game volume settings 2022-04-03 11:35:11 -04:00
0cc0401b66 Let buttons play a clicking noise when pressed 2022-04-03 11:27:58 -04:00
2cf2631a6a
Merge branch 'master' into main_main_menu_menu 2022-04-03 11:06:42 -04:00
Marcelo Geldres
287f66361d Volume Button implementation
Color usage optimized and Volume Button implemented.
2022-04-02 23:00:41 -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
56ed7622ac kinda works? 2022-04-02 21:59:18 -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
64a59daf8b
Merge pull request #25 from Ewpratten/camera-movement
Camera Follow Deadzone
2022-04-02 20:22:07 -04:00
c80e0a7311
Merge pull request #26 from Ewpratten/ewpratten/tile_metadata
Allow sampling of tile metadata
2022-04-02 20:21:38 -04:00
801dde4c8e Allow people to use my magic code 2022-04-02 20:21:04 -04:00
6429b68654 Allow friction and temperature sampling 2022-04-02 20:13:31 -04:00
1891bd51aa
Camera Follow Deadzone 2022-04-02 20:08:38 -04:00
76c34ad8db
Merge pull request #24 from Ewpratten/ewpratten/audio
Basic music playing
2022-04-02 19:41:41 -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
fb23e37739
Merge pull request #23 from Ewpratten/ewpratten/object_defs
Allow basic object definition in the map
2022-04-02 18:55:49 -04:00
93c869c53d Correctly merge together object code 2022-04-02 18:50:39 -04:00
6bfeb8ea60 Merge branch 'master' into ewpratten/object_defs 2022-04-02 18:48:20 -04:00
928dea652e
Merge pull request #22 from Ewpratten/camera-movement
Camera movement
2022-04-02 18:46:12 -04:00
6ac265a466
Merge pull request #21 from Ewpratten/main_main_menu_menu
Main main menu menu
2022-04-02 18:40:01 -04:00
6f61eaf10c Fix mouse call 2022-04-02 18:35:48 -04:00
Marcelo Geldres
2770fe4572 Forgot the exit button mb 2022-04-02 18:33:06 -04:00
38f26d7330
Center Plater 2022-04-02 16:47:31 -04:00
d65dc12299 Object rotation! 2022-04-02 16:41:11 -04:00
8299169648
Unregistered Hypercam 2 2022-04-02 16:40:50 -04:00
10fbc84252 Allow players to take shade 2022-04-02 16:33:40 -04:00
57c5aaa714
Poo Text 2022-04-02 16:05:14 -04:00
133e71a78f Time to begin rendering 2022-04-02 15:51:45 -04:00
2d944dc2f3 World object loading 2022-04-02 15:43:42 -04:00
1bff7f2bc4
Merge pull request #20 from Ewpratten/map_assets
Map assets merged with player movement and map rendering
2022-04-02 15:28:11 -04:00
74066c0189 wip objects 2022-04-02 15:27:26 -04:00
rsninja722
a49bd7c952 add map rendering to player scene 2022-04-02 15:25:59 -04:00