loot/libloot
0
0
Fork 0
mirror of https://github.com/loot/libloot.git synced 2026-07-27 14:16:01 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bump default masterlist version branches to v0.8.

Browse Source
This commit is contained in:
Oliver Hamlet
2015-07-15 17:34:53 +01:00
parent 05010e990c
commit 9d057e3c75
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/backend/game/game_settings.cpp
+5 -5
View File
@@ -52,7 +52,7 @@ namespace loot {
_lootFolderName = "Oblivion";
_masterFile = "Oblivion.esm";
_repositoryURL = "https://github.com/loot/oblivion.git";
_repositoryBranch = "v0.7";
_repositoryBranch = "v0.8";
}
else if (Id() == GameSettings::tes5) {
_name = "TES V: Skyrim";
@@ -60,7 +60,7 @@ namespace loot {
_lootFolderName = "Skyrim";
_masterFile = "Skyrim.esm";
_repositoryURL = "https://github.com/loot/skyrim.git";
_repositoryBranch = "v0.7";
_repositoryBranch = "v0.8";
}
else if (Id() == GameSettings::fo3) {
_name = "Fallout 3";
@@ -68,7 +68,7 @@ namespace loot {
_lootFolderName = "Fallout3";
_masterFile = "Fallout3.esm";
_repositoryURL = "https://github.com/loot/fallout3.git";
_repositoryBranch = "v0.7";
_repositoryBranch = "v0.8";
}
else if (Id() == GameSettings::fonv) {
_name = "Fallout: New Vegas";
@@ -76,7 +76,7 @@ namespace loot {
_lootFolderName = "FalloutNV";
_masterFile = "FalloutNV.esm";
_repositoryURL = "https://github.com/loot/falloutnv.git";
_repositoryBranch = "v0.7";
_repositoryBranch = "v0.8";
}
if (!folder.empty())
@@ -245,4 +245,4 @@ namespace YAML {
return out;
}
}
}
src/gui/loot_state.cpp
+8 -3
View File
@@ -372,7 +372,7 @@ namespace loot {
for (auto &node : _settings["games"]) {
if (node["url"]) {
node["repo"] = node["url"];
node["branch"] = "v0.7";
node["branch"] = "v0.8";
node.remove("url");
}
}
@@ -388,9 +388,14 @@ namespace loot {
for (auto &node : _settings["games"]) {
GameSettings settings(node.as<GameSettings>());
set<string> oldDefaultBranches({
"master",
"v0.7",
});
if (settings.RepoURL() == GameSettings(settings.Id()).RepoURL()
&& settings.RepoBranch() == "master") {
node["branch"] = "v0.7";
&& oldDefaultBranches.count(settings.RepoBranch()) == 1) {
node["branch"] = "v0.8";
}
}
}