From 5703338d67475ec755c88443b3faa6578b6df6d5 Mon Sep 17 00:00:00 2001
From: gir489 <100792176+gir489returns@users.noreply.github.com>
Date: Thu, 4 Apr 2024 03:43:10 -0400
Subject: [PATCH 1/2] Fixed vehicles in preview exploding. (#2908)

* Closes #2905

* Fixed set_mp_bitset being called from vehicle::spawned if the is_networked parameter was false.
---
 src/services/model_preview/model_preview_service.cpp | 2 ++
 src/util/vehicle.cpp                                 | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/services/model_preview/model_preview_service.cpp b/src/services/model_preview/model_preview_service.cpp
index b2b5f306..1092f727 100644
--- a/src/services/model_preview/model_preview_service.cpp
+++ b/src/services/model_preview/model_preview_service.cpp
@@ -159,6 +159,8 @@ namespace big
 						ENTITY::FREEZE_ENTITY_POSITION(m_current_ent, true);
 						ENTITY::SET_ENTITY_ALPHA(m_current_ent, 0, false);
 						ENTITY::SET_ENTITY_COLLISION(m_current_ent, false, false);
+						ENTITY::SET_ENTITY_CAN_BE_DAMAGED(m_current_ent, false);
+						ENTITY::SET_ENTITY_PROOFS(m_current_ent, true, true, true, true, true, true, true, true);
 						ENTITY::SET_CAN_CLIMB_ON_ENTITY(m_current_ent, false);
 						OBJECT::SET_OBJECT_ALLOW_LOW_LOD_BUOYANCY(m_current_ent, false);
 					}
diff --git a/src/util/vehicle.cpp b/src/util/vehicle.cpp
index bf1eae8d..daac2dc0 100644
--- a/src/util/vehicle.cpp
+++ b/src/util/vehicle.cpp
@@ -158,7 +158,7 @@ namespace big::vehicle
 
 			STREAMING::SET_MODEL_AS_NO_LONGER_NEEDED(hash);
 
-			if (*g_pointers->m_gta.m_is_session_started)
+			if (is_networked && *g_pointers->m_gta.m_is_session_started)
 			{
 				set_mp_bitset(veh);
 			}

From 075f30fc7b676e0c5a740da4bc6b844e544ba4e4 Mon Sep 17 00:00:00 2001
From: Andreas Maerten <24669514+Yimura@users.noreply.github.com>
Date: Thu, 4 Apr 2024 20:34:43 +0200
Subject: [PATCH 2/2] feat(FontMgr): expand Turkish glyph range (#2915)

---
 src/renderer/font_mgr.cpp | 36 +++++++++++++++++++++++++++++-------
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/src/renderer/font_mgr.cpp b/src/renderer/font_mgr.cpp
index 23378da4..21bc0098 100644
--- a/src/renderer/font_mgr.cpp
+++ b/src/renderer/font_mgr.cpp
@@ -14,6 +14,7 @@ namespace big
 	        {eAlphabetType::CYRILLIC, {"msyh.ttc", "msyh.ttf", "arial.ttf"}},
 	        {eAlphabetType::JAPANESE, {"msyh.ttc", "msyh.ttf", "arial.ttf"}},
 	        {eAlphabetType::KOREAN, {"malgun.ttf", "arial.ttf"}},
+	        {eAlphabetType::TURKISH, {"msyh.ttc", "msyh.ttf", "arial.ttf"}},
 	    })
 	{
 	}
@@ -99,9 +100,8 @@ namespace big
 	void font_mgr::update_required_alphabet_type(eAlphabetType type)
 	{
 		m_require_extra = type;
-		
-		g_thread_pool->push([this]
-		{
+
+		g_thread_pool->push([this] {
 			rebuild();
 		});
 	}
@@ -160,10 +160,32 @@ namespace big
 	const ImWchar* font_mgr::GetGlyphRangesTurkish()
 	{
 		static const ImWchar icons_ranges_Turkish[] = {
-		    0x0020, 0x00FF, // Basic Latin + Latin Supplement
-		    0x011E, 0x011F, // G with breve
-		    0x0130, 0x0131, // dotted I
-		    0x015E, 0x015F, // S-cedilla
+		    0x0020,
+		    0x00FF, // Basic Latin + Latin Supplement
+		    0x00c7,
+		    0x00c7, // Ç
+		    0x00e7,
+		    0x00e7, // ç
+		    0x011e,
+		    0x011e, // Ğ
+		    0x011f,
+		    0x011f, // ğ
+		    0x0130,
+		    0x0130, // İ
+		    0x0131,
+		    0x0131, // ı
+		    0x00d6,
+		    0x00d6, // Ö
+		    0x00f6,
+		    0x00f6, // ö
+		    0x015e,
+		    0x015e, // Ş
+		    0x015f,
+		    0x015f, // ş
+		    0x00dc,
+		    0x00dc, // Ü
+		    0x00fc,
+		    0x00fc, // ü
 		    0,
 		};
 		return &icons_ranges_Turkish[0];