diff --git a/Content/Biere/Biere.uasset b/Content/Biere/Biere.uasset new file mode 100644 index 0000000..f794427 Binary files /dev/null and b/Content/Biere/Biere.uasset differ diff --git a/Content/Biere/Biere_Biere_MAT_BaseColor.uasset b/Content/Biere/Biere_Biere_MAT_BaseColor.uasset new file mode 100644 index 0000000..50b4acb Binary files /dev/null and b/Content/Biere/Biere_Biere_MAT_BaseColor.uasset differ diff --git a/Content/Biere/Biere_Biere_MAT_Normal.uasset b/Content/Biere/Biere_Biere_MAT_Normal.uasset new file mode 100644 index 0000000..5dff92e Binary files /dev/null and b/Content/Biere/Biere_Biere_MAT_Normal.uasset differ diff --git a/Content/Biere/Biere_Biere_MAT_OcclusionRoughnessMetallic.uasset b/Content/Biere/Biere_Biere_MAT_OcclusionRoughnessMetallic.uasset new file mode 100644 index 0000000..1b7a893 Binary files /dev/null and b/Content/Biere/Biere_Biere_MAT_OcclusionRoughnessMetallic.uasset differ diff --git a/Content/Biere/Biere_MAT.uasset b/Content/Biere/Biere_MAT.uasset new file mode 100644 index 0000000..bf79d7e Binary files /dev/null and b/Content/Biere/Biere_MAT.uasset differ diff --git a/Content/Champignon/Champignon.uasset b/Content/Champignon/Champignon.uasset new file mode 100644 index 0000000..0d605a0 Binary files /dev/null and b/Content/Champignon/Champignon.uasset differ diff --git a/Content/Champignon/Champignon_Champignon_MAT_BaseColor.uasset b/Content/Champignon/Champignon_Champignon_MAT_BaseColor.uasset new file mode 100644 index 0000000..7f12669 Binary files /dev/null and b/Content/Champignon/Champignon_Champignon_MAT_BaseColor.uasset differ diff --git a/Content/Champignon/Champignon_Champignon_MAT_Normal.uasset b/Content/Champignon/Champignon_Champignon_MAT_Normal.uasset new file mode 100644 index 0000000..0c20ac0 Binary files /dev/null and b/Content/Champignon/Champignon_Champignon_MAT_Normal.uasset differ diff --git a/Content/Champignon/Champignon_Champignon_MAT_OcclusionRoughnessMetallic.uasset b/Content/Champignon/Champignon_Champignon_MAT_OcclusionRoughnessMetallic.uasset new file mode 100644 index 0000000..ef12b68 Binary files /dev/null and b/Content/Champignon/Champignon_Champignon_MAT_OcclusionRoughnessMetallic.uasset differ diff --git a/Content/Champignon/Champignon_MAT.uasset b/Content/Champignon/Champignon_MAT.uasset new file mode 100644 index 0000000..45e4f6c Binary files /dev/null and b/Content/Champignon/Champignon_MAT.uasset differ diff --git a/Content/Cinematic/IntroductionCinematic.uasset b/Content/Cinematic/IntroductionCinematic.uasset index d511e64..c4e2777 100644 Binary files a/Content/Cinematic/IntroductionCinematic.uasset and b/Content/Cinematic/IntroductionCinematic.uasset differ diff --git a/Content/Font/CaviarDreams.uasset b/Content/Font/CaviarDreams.uasset new file mode 100644 index 0000000..05c2cc6 Binary files /dev/null and b/Content/Font/CaviarDreams.uasset differ diff --git a/Content/Font/CaviarDreams_Bold.uasset b/Content/Font/CaviarDreams_Bold.uasset new file mode 100644 index 0000000..8166870 Binary files /dev/null and b/Content/Font/CaviarDreams_Bold.uasset differ diff --git a/Content/Font/CaviarDreams_Bold_Font.uasset b/Content/Font/CaviarDreams_Bold_Font.uasset new file mode 100644 index 0000000..829007d Binary files /dev/null and b/Content/Font/CaviarDreams_Bold_Font.uasset differ diff --git a/Content/Font/CaviarDreams_Font.uasset b/Content/Font/CaviarDreams_Font.uasset new file mode 100644 index 0000000..bd9ea55 Binary files /dev/null and b/Content/Font/CaviarDreams_Font.uasset differ diff --git a/Content/Font/frozencrystal_Font.uasset b/Content/Font/frozencrystal_Font.uasset index b9bff56..9ce9ee3 100644 Binary files a/Content/Font/frozencrystal_Font.uasset and b/Content/Font/frozencrystal_Font.uasset differ diff --git a/Content/Level.umap b/Content/Level.umap index 97a0742..9bb43ad 100644 Binary files a/Content/Level.umap and b/Content/Level.umap differ diff --git a/Content/Level_BuiltData.uasset b/Content/Level_BuiltData.uasset deleted file mode 100644 index 51f01be..0000000 Binary files a/Content/Level_BuiltData.uasset and /dev/null differ diff --git a/Content/Music/MusicHandler.uasset b/Content/Music/MusicHandler.uasset new file mode 100644 index 0000000..bceecc7 Binary files /dev/null and b/Content/Music/MusicHandler.uasset differ diff --git a/Content/Music/animation.uasset b/Content/Music/animation.uasset new file mode 100644 index 0000000..7806d12 Binary files /dev/null and b/Content/Music/animation.uasset differ diff --git a/Content/Music/end_of_girolification.uasset b/Content/Music/end_of_girolification.uasset new file mode 100644 index 0000000..75d8663 Binary files /dev/null and b/Content/Music/end_of_girolification.uasset differ diff --git a/Content/Music/girolification_intro.uasset b/Content/Music/girolification_intro.uasset new file mode 100644 index 0000000..4740ade Binary files /dev/null and b/Content/Music/girolification_intro.uasset differ diff --git a/Content/Music/girolification_loop.uasset b/Content/Music/girolification_loop.uasset new file mode 100644 index 0000000..8a08d31 Binary files /dev/null and b/Content/Music/girolification_loop.uasset differ diff --git a/Content/Pickup.uasset b/Content/Pickup.uasset new file mode 100644 index 0000000..2effc9a Binary files /dev/null and b/Content/Pickup.uasset differ diff --git a/Source/Carwatch/CarwatchHUD.cpp b/Source/Carwatch/CarwatchHUD.cpp index c9ca7ae..6c36f3a 100644 Binary files a/Source/Carwatch/CarwatchHUD.cpp and b/Source/Carwatch/CarwatchHUD.cpp differ diff --git a/Source/Carwatch/CarwatchHUD.h b/Source/Carwatch/CarwatchHUD.h index 9a4f083..6448ca9 100644 --- a/Source/Carwatch/CarwatchHUD.h +++ b/Source/Carwatch/CarwatchHUD.h @@ -14,12 +14,24 @@ class ACarwatchHUD : public AHUD public: ACarwatchHUD(); - /** Primary draw call for the HUD */ virtual void DrawHUD() override; -private: - /** Crosshair asset pointer */ class UTexture2D* CrosshairTex; + float timeCredits = 0; + float offsetCredits = 0; + + + UFont* font0; + UFont* font4; + UFont* font9; + + void Tick(float DeltaTime) override; + + void Credits(); + void DrawTextCredits(int type, FText text, float offset); + + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "yo") + bool _credits = false; };