Merge branch 'master' of https://cgvrgit.ulno.net/Kaspar/GameJam202309

gjyj
2023-10-01 01:40:40 +02:00 · 2023-10-01 01:39:42 +02:00
13 changed files with 37 additions and 4 deletions
--- a/Content/Options.uasset
+++ b/Content/Options.uasset
--- a/Content/credits.uasset
+++ b/Content/credits.uasset
--- a/Content/endscreen.uasset
+++ b/Content/endscreen.uasset
--- a/Content/main_menu.uasset
+++ b/Content/main_menu.uasset
--- a/Content/props/oda/matti1.uasset
+++ b/Content/props/oda/matti1.uasset
--- a/Content/props/oda/matti2.uasset
+++ b/Content/props/oda/matti2.uasset
--- a/Content/props/oda/matti3.uasset
+++ b/Content/props/oda/matti3.uasset
--- a/Content/props/oda/matti4.uasset
+++ b/Content/props/oda/matti4.uasset
--- a/Content/props/oda/matti5.uasset
+++ b/Content/props/oda/matti5.uasset
--- a/Content/props/oda/odamidaaa.uasset
+++ b/Content/props/oda/odamidaaa.uasset
--- a/Content/props/torvik/tiki_torch.uasset
+++ b/Content/props/torvik/tiki_torch.uasset
--- a/Content/props/torvik/tiki_torch_texture.uasset
+++ b/Content/props/torvik/tiki_torch_texture.uasset
--- a/Content/props/torvik/tokitokilol.uasset
+++ b/Content/props/torvik/tokitokilol.uasset
Author	SHA1	Message	Date
FatCat2627	fab0ac9be4	Merge branch 'master' of https://cgvrgit.ulno.net/Kaspar/GameJam202309	2023-10-01 01:40:40 +02:00
FatCat2627	d9f0096c31	gjyj	2023-10-01 01:39:42 +02:00