Skip to content

Commit 1325a1e

Browse files
unitycoderunitycoder
committed
Merge branch 'master' into dev
* master: (33 commits) try to handle version splitting better for uninstaller, fix #140 fix browse Script and Theme folder buttons testing focusing modification for #133, add comment about nographics for batch build Tools: add "Hub logs" button Update README.md Update README.md fix release type (fixes #132), update assembly info string fix alpha/beta for download full installer fix vs warning "The property 'IsEmpty' was not found in type 'String'", Add button: Download full editor in browser (instead of installer) #131 fix start minimized (titlebar was not hidden from taskbar), fix check updates: did not filter results, if checked updates twice on same unity version Tools, BuildReport: Get Plugins/ folder size from build (if not found, then count all Plugins/ folder sizes from project) Projects: disable ctrl key from focusing search field (to allow ctrl+home/end) Projects: Add support for multiple search strings (separated with space), Updates: clear filters on refresh list (since they are not applied to new list now) Upgrade project: Fix null ref for selected row, Updates: Download & Run, Set installation path using commandline argument to installer (using editor root path + unity base version) upgrade project: display platform, display unity release type & platforms in available unitys list Build report: filter out timestamps, if they are used (fixes #107) fix commandline start Projects: Fix adding existing project and creating new project (select correct just added row, fix red path color, fix null ref if refresh) fixes #125 Projects: Refresh list if toggle Branch or Launcher Arguments column (fixes #117) Projects: Fix Sorting on Refresh and Load (fixes #123) ...
2 parents 771e8ae + 4a1226e commit 1325a1e

15 files changed

+683
-278
lines changed

Diff for: ‎README.md

+12-8
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ Handle all your Unity versions and Projects easily!
77
## Features
88
- Automagically Open Projects with Correct Unity Version
99
- Display Recent Projects list with last modified date and project version info
10+
- List more than 40 recent projects!
1011
- Quickly Explore Project Folders
1112
- List installed Unity versions, can easily Run, Explore installation folder, View release notes
1213
- Download Missing Unity Versions in Browser
@@ -33,35 +34,38 @@ https://forum.unity.com/threads/unity-launcher-launch-correct-unity-versions-for
3334
https://github.com/unitycoder/UnityLauncherPro/wiki
3435

3536
### Development
36-
See DEV branch for latest commits https://github.com/unitycoder/UnityLauncherPro/tree/dev
37+
See DEV branch for latest commits https://github.com/unitycoder/UnityLauncherPro/tree/dev <br>
38+
Pre-releases are sometimes available from dev branch: https://github.com/unitycoder/UnityLauncherPro/releases
3739

3840
### Screenshots
3941

4042
![image](https://user-images.githubusercontent.com/5438317/71485879-184b3a00-281c-11ea-97db-73c5dfa9bb4e.png)
4143

42-
![image](https://user-images.githubusercontent.com/5438317/120828332-146d2c80-c565-11eb-8a84-c3737c17025f.png)
44+
![image](https://github.com/unitycoder/UnityLauncherPro/assets/5438317/21eb1fcd-3cb1-4dea-8133-9ce440de77d8)
4345

44-
![image](https://user-images.githubusercontent.com/5438317/120828338-17681d00-c565-11eb-972a-49055070427a.png)
46+
![image](https://github.com/unitycoder/UnityLauncherPro/assets/5438317/2942c1d7-2006-4dee-8b68-e1f6f2e0fbf4)
4547

46-
![image](https://user-images.githubusercontent.com/5438317/154346224-8aa8d547-8495-47cf-baca-4cb31639344b.png)
48+
![image](https://github.com/unitycoder/UnityLauncherPro/assets/5438317/6f8dce07-c640-42db-a1ef-d8bcc7a80cc2)
4749

48-
![image](https://user-images.githubusercontent.com/5438317/154346049-4426f504-a437-4119-8d1c-f3d4d3fa434c.png)
50+
![image](https://user-images.githubusercontent.com/5438317/206923022-4b4bb8ed-0351-408f-b1d3-82bd6eefbc45.png)
4951

5052
### Perform tasks on selected project
51-
![image](https://user-images.githubusercontent.com/5438317/120828528-4da59c80-c565-11eb-8b11-9cf739cde306.png)
53+
![image](https://github.com/unitycoder/UnityLauncherPro/assets/5438317/a0b468ba-e3a6-420b-8155-78bc32814752)
5254

5355
### Quick New Project Creation (with Unity version and Templates selection)
54-
![image](https://user-images.githubusercontent.com/5438317/120828565-58603180-c565-11eb-9cf3-0e3738a7dc95.png)
56+
![image](https://github.com/unitycoder/UnityLauncherPro/assets/5438317/9b34f9ba-2c91-462c-be85-9c8aeefa63a0)
5557

5658
### Upgrade Project Version (automatically suggests next higher version)
57-
![image](https://user-images.githubusercontent.com/5438317/120828587-5e561280-c565-11eb-876d-54b72aed88c9.png)
59+
![image](https://github.com/unitycoder/UnityLauncherPro/assets/5438317/3cc8f8d0-861b-406a-be10-716d92b7f379)
5860

5961
### Explorer integration (1-click opening projects with correct unity version)
6062
![image](https://user-images.githubusercontent.com/5438317/120883135-34900080-c5e4-11eb-80a5-ae78fe89260a.png)
6163

6264
### View and Select current platform
6365
![unitylauncherpro_platform](https://user-images.githubusercontent.com/5438317/132997691-5ed50f1d-e285-4c83-b356-46c1e3f431e4.gif)
6466

67+
### Rename Project title
68+
![pro-rename](https://user-images.githubusercontent.com/5438317/193453048-aa5527c6-a345-4f93-b934-f68ac2524cac.gif)
6569

6670
<br>
6771
Old (winforms) version is here: https://github.com/unitycoder/UnityLauncher

Diff for: ‎UnityLauncherPro/App.xaml

+8-8
Original file line numberDiff line numberDiff line change
@@ -47,10 +47,10 @@
4747
<Setter Property="MinHeight" Value="20" />
4848

4949
<!--test fix for System.Windows.Data Error: 4-->
50-
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
51-
<Setter Property="VerticalContentAlignment" Value="Center" />
52-
<Setter Property="HorizontalAlignment" Value="Stretch" />
53-
<Setter Property="VerticalAlignment" Value="Center" />
50+
<!--<Setter Property="HorizontalContentAlignment" Value="Stretch" />
51+
<Setter Property="VerticalContentAlignment" Value="Center" />-->
52+
<!--<Setter Property="HorizontalAlignment" Value="Stretch" />
53+
<Setter Property="VerticalAlignment" Value="Center" />-->
5454

5555
<Setter Property="Template">
5656
<Setter.Value>
@@ -121,10 +121,10 @@
121121
<Setter Property="SnapsToDevicePixels" Value="true" />
122122
<!--<Setter Property="OverridesDefaultStyle" Value="true" />-->
123123
<!-- test fix for error 4 https://gist.github.com/TobiasSekan/73a93c2dfea4a051ff72abb5218d6f8f-->
124-
<!--<Setter Property="HorizontalContentAlignment" Value="Stretch" />
125-
<Setter Property="VerticalContentAlignment" Value="Center" />
126-
<Setter Property="HorizontalAlignment" Value="Stretch" />
127-
<Setter Property="VerticalAlignment" Value="Center" />-->
124+
<Setter Property="HorizontalContentAlignment" Value="Stretch" />
125+
<Setter Property="VerticalContentAlignment" Value="Center" />
126+
<Setter Property="HorizontalAlignment" Value="Stretch" />
127+
<Setter Property="VerticalAlignment" Value="Center" />
128128

129129
<Setter Property="Template">
130130
<Setter.Value>

Diff for: ‎UnityLauncherPro/GetProjects.cs

+7-4
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,6 @@ public static List<Project> Scan(bool getGitBranch = false, bool getPlasticBranc
101101
}
102102

103103
// sometimes projects are in wrong order, seems to be related to messing up your unity registry, the keys are received in created order (so if you had removed/modified them manually, it might return wrong order instead of 0 - 40)
104-
// thats why need to sort projects list by modified date
105104
// sort by modified date, projects without modified date are put to last, NOTE: this would remove projects without modified date (if they become last items, before trimming list on next step)
106105
projectsFound.Sort((x, y) =>
107106
{
@@ -112,7 +111,7 @@ public static List<Project> Scan(bool getGitBranch = false, bool getPlasticBranc
112111
//return x.Modified.Value.CompareTo(y.Modified.Value); // BUG this breaks something, so that last item platform is wrong (for project that is missing from disk) ?
113112
});
114113

115-
// trim list to max amount
114+
// trim list to max amount (older ones are dropped)
116115
if (projectsFound.Count > MainWindow.maxProjectCount)
117116
{
118117
//Console.WriteLine("Trimming projects list to " + MainWindow.maxProjectCount + " projects");
@@ -146,8 +145,12 @@ static Project GetProjectInfo(string projectPath, bool getGitBranch = false, boo
146145

147146
//Console.WriteLine("valueName="+ valueName+" , projectName =" + projectName);
148147

149-
// get last modified date from folder
150-
DateTime? lastUpdated = folderExists ? Tools.GetLastModifiedTime(projectPath) : null;
148+
// get last modified date from most recent date of solution or folder
149+
string solutionPath = Path.Combine(projectPath, $"{projectName}.sln");
150+
bool solutionExists = File.Exists(solutionPath);
151+
DateTime? solutionLastUpdated = solutionExists ? Tools.GetLastModifiedTime(solutionPath) : null;
152+
DateTime? folderLastUpdated = folderExists ? Tools.GetLastModifiedTime(projectPath) : null;
153+
DateTime? lastUpdated = solutionLastUpdated > folderLastUpdated ? solutionLastUpdated : folderLastUpdated;
151154

152155
// get project version
153156
string projectVersion = folderExists ? Tools.GetProjectVersion(projectPath) : null;

Diff for: ‎UnityLauncherPro/GetUnityInstallations.cs

+19
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,25 @@ public static List<UnityInstallation> Scan()
6565
unity.IsPreferred = (version == MainWindow.preferredVersion);
6666
unity.ProjectCount = GetProjectCountForUnityVersion(version);
6767

68+
if (Tools.IsAlpha(version))
69+
{
70+
unity.ReleaseType = "Alpha";
71+
}
72+
else if (Tools.IsBeta(version))
73+
{
74+
unity.ReleaseType = "Beta";
75+
}
76+
else
77+
if (Tools.IsLTS(version))
78+
79+
{
80+
unity.ReleaseType = "LTS";
81+
}
82+
else
83+
{
84+
unity.ReleaseType = ""; // cannot be null for UnitysFilter to work properly
85+
}
86+
6887
// get platforms, NOTE if this is slow, do it later, or skip for commandline
6988
var platforms = GetPlatforms(dataFolder);
7089
// this is for editor tab, show list of all platforms in cell

0 commit comments

Comments
 (0)