Skip to content

Commit 733c6cd

Browse files
committed
Harmony naming
1 parent a4a36a9 commit 733c6cd

6 files changed

Lines changed: 32 additions & 21 deletions

File tree

.gitmodules

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[submodule "libuncso2"]
22
path = libuncso2
3-
url = https://github.com/p0358/libuncso2.git
3+
url = https://github.com/harmonytf/libuncso2.git
44
[submodule "external/gsl-lite"]
55
path = external/gsl-lite
66
url = https://github.com/martinmoene/gsl-lite.git

README.md

Lines changed: 24 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,17 @@
22

33
![Alt text](./resources/uncso2.svg)
44

5-
[![Build status](https://ci.appveyor.com/api/projects/status/voewv05x5ate6yoj/branch/master?svg=true)](https://ci.appveyor.com/project/L-Leite/uncso2/branch/master)
6-
7-
A file data extractor for the videogames Counter Strike: Online 2 and Titanfall Online, for Windows and GNU/Linux.
5+
A file data extractor for the video games Counter Strike: Online 2 and Titanfall Online, for Windows and GNU/Linux.
86

97
It uses ekey's reversing work published at [XeNTaX's forums](https://forum.xentax.com/viewtopic.php?f=21&t=11117).
108

119
This program's layout is based off KDE's Ark.
1210

13-
It uses [libuncso2](https://github.com/L-Leite/libuncso2) as the back-end library.
11+
It uses [libuncso2](https://github.com/harmonytf/libuncso2) as the back-end library.
12+
13+
## Download
1414

15-
## Download
16-
You may download the latest build of UnCSO2 [here](https://github.com/L-Leite/UnCSO2/releases/latest).
15+
You may download the latest build of UnCSO2 [here](https://github.com/harmonytf/UnCSO2/releases/latest).
1716

1817
## Features
1918

@@ -34,21 +33,33 @@ Those regions are: South Korea, China, Taiwan and Japan.
3433
## Building
3534

3635
### Requirements
37-
- [CMake](https://cmake.org/download/) (must be in PATH);
38-
- [Qt 5.13](https://www.qt.io/download);
39-
- A C++17 compiler with `std::filesystem` support.
36+
- [CMake](https://cmake.org/download/) (must be in PATH)
37+
- [Qt 6.8](https://www.qt.io/download)
38+
- A C++20 compile.
39+
40+
#### With Visual Studio (new way)
41+
42+
Visual Studio nowadays has built-in integration for CMake projects.
4043

41-
#### With Visual Studio
44+
1. File -> Open -> CMake...
45+
46+
2. Build -> Build All
47+
48+
You should have the extension Qt Visual Studio Tools installed. It will prompt you to import your Qt install path upon installation, select required Qt version as the default.
4249

4350
You can generate project files for Visual Studio 15 by running the follwing commands:
4451

52+
#### With Visual Studio (old way)
53+
54+
The old way is to generate project files.
55+
4556
```sh
4657
# Create and go to the build directory
4758
mkdir build
4859
cd build
4960

50-
# Generate oroject files
51-
cmake -G "Visual Studio 15 2017" -A "x64" ../
61+
# Generate project files
62+
cmake -G "Visual Studio 17 2022" -A "x64" ../
5263
```
5364

5465
You can then build the solution file `uc2.sln`.
@@ -82,7 +93,7 @@ UnCSO2 uses the following libraries:
8293
- [GSL Lite](https://github.com/martinmoene/gsl-lite), MIT license.
8394
- [Breeze Icon Theme](https://cgit.kde.org/breeze-icons.git/), LGPL.
8495

85-
libuncso2 also depends on libraries, see [libuncso2's used libraries](https://github.com/L-Leite/libuncso2/blob/master/README.md#libraries-used) for more information.
96+
libuncso2 also depends on libraries, see [libuncso2's used libraries](https://github.com/harmonytf/libuncso2/blob/master/README.md#libraries-used) for more information.
8697

8798
## License
8899

resources/layouts/aboutdialog.ui

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@
9797
</font>
9898
</property>
9999
<property name="text">
100-
<string>UnCSO2</string>
100+
<string>Harmony UnCSO2</string>
101101
</property>
102102
<property name="alignment">
103103
<set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
@@ -175,7 +175,7 @@
175175
</font>
176176
</property>
177177
<property name="text">
178-
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A file extractor for Counter-Strike: Online 2's and Titanfall Online's game data.&lt;/p&gt;&lt;p&gt;These games use a proprietary archive format, created by Nexon Co., Ltd.&lt;br/&gt;&lt;br/&gt;It also features automatic decryption of special files and decompression of textures for Counter-Strike: Online 2&lt;span style=&quot; font-style:italic;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;This program's layout is based off KDE's Ark.&lt;/p&gt;&lt;p&gt;You may find its &lt;a href=&quot;https://github.com/Ochii/UnCSO2&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;source code here&lt;/span&gt;&lt;/a&gt;. &lt;a href=&quot;https://github.com/Ochii/libuncso2&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;libuncso2 source code&lt;/span&gt;&lt;/a&gt;.&lt;/p&gt;&lt;p&gt;UnCSO2 is distributed under the GPLv3 license.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
178+
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;A file extractor for Counter-Strike: Online 2's and Titanfall Online's game data.&lt;/p&gt;&lt;p&gt;These games use a proprietary archive format, created by Nexon Co., Ltd.&lt;br/&gt;&lt;br/&gt;It also features automatic decryption of special files and decompression of textures for Counter-Strike: Online 2&lt;span style=&quot; font-style:italic;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;p&gt;This program's layout is based off KDE's Ark.&lt;/p&gt;&lt;p&gt;You may find its &lt;a href=&quot;https://github.com/harmonytf/UnCSO2&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;source code here&lt;/span&gt;&lt;/a&gt;. &lt;a href=&quot;https://github.com/harmonytf/libuncso2&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;libuncso2 source code&lt;/span&gt;&lt;/a&gt;.&lt;/p&gt;&lt;p&gt;UnCSO2 is distributed under the GPLv3 license.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
179179
</property>
180180
<property name="textFormat">
181181
<enum>Qt::TextFormat::RichText</enum>
@@ -230,7 +230,7 @@
230230
</font>
231231
</property>
232232
<property name="text">
233-
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;https://leite.xyz&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;Luís Leite&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;p&gt;Based off ekey's research at at &lt;a href=&quot;https://forum.xentax.com/viewtopic.php?f=21&amp;amp;t=11117&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#2980b9;&quot;&gt;XeNTaX's forums&lt;/span&gt;&lt;/a&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
233+
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;a href=&quot;https://harmony.tf/&quot;&gt;&lt;span style=&quot;text-decoration: underline; color:#2980b9;&quot;&gt;Harmony&lt;/span&gt;&lt;/a&gt;'s community fork.&lt;/p&gt;&lt;p&gt;Originally created by &lt;a href=&quot;https://leite.xyz&quot;&gt;&lt;span style=&quot;text-decoration: underline; color:#2980b9;&quot;&gt;Luís Leite&lt;/span&gt;.&lt;/a&gt;&lt;/p&gt;&lt;p&gt;Updated to Qt6 and fixed Titanfall Online support by &lt;a href=&quot;https://github.com/p0358&quot;&gt;&lt;span style=&quot;text-decoration: underline; color:#2980b9;&quot;&gt;p0358&lt;/span&gt;.&lt;/a&gt;&lt;/p&gt;&lt;p&gt;Based off ekey's research at at &lt;a href=&quot;https://forum.xentax.com/viewtopic.php?f=21&amp;amp;t=11117&quot;&gt;&lt;span style=&quot;text-decoration: underline; color:#2980b9;&quot;&gt;XeNTaX's forums&lt;/span&gt;&lt;/a&gt;.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
234234
</property>
235235
<property name="textFormat">
236236
<enum>Qt::TextFormat::RichText</enum>

sources/layouts/mainwindow.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ void CMainWindow::SetArchiveOptionsEnabled( bool bEnabled )
279279

280280
void CMainWindow::SetLoadedFilename( std::string_view filename /*= {}*/ )
281281
{
282-
QString windowTitle = QStringLiteral( "UnCSO2" );
282+
QString windowTitle = QStringLiteral( "Harmony UnCSO2" );
283283
QString formattedTitle = windowTitle;
284284

285285
if ( filename.empty() == false )

sources/uncso2app.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ CUnCSO2App::CUnCSO2App( int& argc, char** argv ) : QApplication( argc, argv )
2020

2121
void CUnCSO2App::SetupSettingsInfo()
2222
{
23-
this->setOrganizationName( "Luís Leite" );
24-
this->setOrganizationDomain( "leite.xyz" );
23+
this->setOrganizationName( "Harmony" );
24+
this->setOrganizationDomain( "harmony.tf" );
2525
this->setApplicationName( "UnCSO2" );
2626
this->setApplicationVersion( QStringLiteral( UNCSO2_VERSION ) );
2727
}

0 commit comments

Comments
 (0)