Skip to content

Stack/01 fixes standalone #368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JucanAndreiDaniel merged 5 commits into from
Jun 14, 2026
Merged

Stack/01 fixes standalone #368

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2765f4d
fix: resolve Windows path separators in ChangeWorld on Linux
JucanAndreiDaniel Jun 13, 2026
f0d21a0
fix: enable IsTrigger on the ChangeLevel collider
JucanAndreiDaniel Jun 13, 2026
76c6c02
fix: stop lockpick handler early on already-unlocked containers
JucanAndreiDaniel Jun 13, 2026
d5162a4
fix: correct Gothic 2 cutscene file suffix to LSC
JucanAndreiDaniel Jun 13, 2026
c535b10
Merge branch 'main' into stack/01-fixes-standalone
JaXt0r Jun 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Assets/Gothic-Core/Resources/Prefabs/Vobs/oCTriggerChangeLevel.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ BoxCollider:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
Expand Down
3 changes: 2 additions & 1 deletion Assets/Gothic-Core/Scripts/Services/World/SaveGameService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,8 @@ public void LoadSavedGame(SlotId saveGameId, SaveGame save)
public void ChangeWorld(string worldName)
{
// G2 has for example: AddonWorld\NewWorld.zen --> NewWorld.zen
CurrentWorldName = Path.GetFileName(worldName);
// Linux doesn't see \ as a directory separator, Windows sees both \ and /
CurrentWorldName = Path.GetFileName(worldName.Replace("\\","/"));

// 1. World was already loaded.
if (_worlds.ContainsKey(CurrentWorldName))
Expand Down
2 changes: 1 addition & 1 deletion Assets/Gothic2/Scripts/Services/Context/G2ContextService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public class G2ContextService : IContextGameVersionService

public GameVersion Version => GameVersion.Gothic2;
string IContextGameVersionService.RootPath => _configService.Root.Gothic2Path;
public string CutsceneFileSuffix => "CSL";
public string CutsceneFileSuffix => "LSC";

// FIXME - Load from GothicGame.ini
public string InitialWorld => "newworld.zen";
Expand Down