Compare commits

..

No commits in common. "7131026b2f4c3ddd9b87518eb568ece820e3c790" and "e19098a13e19d6665df6a5cfc1ef5923ddc9bb8a" have entirely different histories.

8 changed files with 20 additions and 45 deletions

View File

@ -1,12 +1,11 @@
# OpenFusionClient # OpenFusionClient
[![Current Release](https://img.shields.io/github/v/release/OpenFusionProject/OpenFusionClient)](https://github.com/OpenFusionProject/OpenFusionClient/releases/latest) [![Discord](https://img.shields.io/badge/chat-on%20discord-7289da.svg?logo=discord)](https://discord.gg/DYavckB)[![License](https://img.shields.io/github/license/OpenFusionProject/OpenFusionClient)](https://github.com/OpenFusionProject/OpenFusionClient/blob/master/LICENSE.md) [![Current Release](https://img.shields.io/github/v/release/OpenFusionProject/OpenFusionClient)](https://github.com/OpenFusionProject/OpenFusionClient/releases/latest) [![Discord](https://img.shields.io/badge/chat-on%20discord-7289da.svg?logo=discord)](https://discord.gg/DYavckB)[![License](https://img.shields.io/github/license/OpenFusionProject/OpenFusionClient)](https://github.com/OpenFusionProject/OpenFusionClient/blob/master/LICENSE.md)
An Electron app that allows you to easily join FusionFall servers. An Electron app that allows you to easily join FusionFall servers.
It automatically installs FF's custom build of Unity Web Player, manages text files such as `assetInfo.php`/`loginInfo.php`, and embeds the game, all in a few clicks! It automatically installs FF's custom build of Unity Web Player, manages text files such as `assetInfo.php`/`loginInfo.php`, and embeds the game, all in a few clicks!
For an overview of how the game client worked originally, please see [this section in the OpenFusion README](https://github.com/OpenFusionProject/OpenFusion#architecture). For an overview of how the game client worked originally, please see [this section in the OpenFusion README](https://github.com/OpenFusionProject/OpenFusion#architecture ).
## Disclaimer ## Disclaimer
@ -17,36 +16,30 @@ In addition, if you are interested in contributing: do note that **this project
## Usage ## Usage
Provided that you have npm installed, clone the repository, then run install like so: Provided that you have npm installed, clone the repository, then run install like so:
``` ```
git clone https://github.com/OpenFusionProject/OpenFusionClient.git git clone https://github.com/OpenFusionProject/OpenFusionClient.git
npm install npm install
``` ```
After that has completed you can then test OpenFusionClient: After that has completed you can then test OpenFusionClient:
``` ```
npm run start npm run start
``` ```
If you would like to package it as a standalone win32 application: If you would like to package it as a standalone win32 application:
``` ```
npm run pack npm run pack
``` ```
You can then compress the application directory into a zip file and installer for distribution: You can then compress the application directory into a zip file and installer for distribution:
``` ```
npm run dist npm run dist
``` ```
Before opening a PR or running pack/dist, please do a code formatting pass: Before opening a PR or running pack/dist, please do a code formatting pass:
``` ```
npm run prettier npm run prettier
``` ```
## License ## License
MIT unless specified otherwise MIT unless specified otherwise

12
assets/bootstrap/css/bootstrap.min.css vendored Normal file

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

Binary file not shown.

View File

@ -7,7 +7,7 @@
content="width=device-width, initial-scale=1.0, shrink-to-fit=no" content="width=device-width, initial-scale=1.0, shrink-to-fit=no"
/> />
<title>OpenFusion: Server Selector</title> <title>OpenFusion: Server Selector</title>
<link rel="stylesheet" href="assets/css/bootstrap.min.css" /> <link rel="stylesheet" href="assets/bootstrap/css/bootstrap.min.css" />
<link rel="stylesheet" href="assets/fonts/fontawesome-all.min.css" /> <link rel="stylesheet" href="assets/fonts/fontawesome-all.min.css" />
<link rel="stylesheet" href="assets/css/openfusion.css" /> <link rel="stylesheet" href="assets/css/openfusion.css" />
<link rel="stylesheet" href="assets/css/styles.css" /> <link rel="stylesheet" href="assets/css/styles.css" />
@ -480,7 +480,7 @@
src="assets/js/jquery.min.js" src="assets/js/jquery.min.js"
onload="window.$ = window.jQuery = module.exports;" onload="window.$ = window.jQuery = module.exports;"
></script> ></script>
<script src="assets/js/bootstrap.min.js"></script> <script src="assets/bootstrap/js/bootstrap.min.js"></script>
<script src="assets/js/bs-init.js"></script> <script src="assets/js/bs-init.js"></script>
<script src="assets/js/uuidv4.min.js"></script> <script src="assets/js/uuidv4.min.js"></script>
<script src="assets/js/serverselector.js"></script> <script src="assets/js/serverselector.js"></script>

View File

@ -205,7 +205,7 @@ function showMainWindow() {
require("shell").openExternal("https://discord.gg/DYavckB"); require("shell").openExternal("https://discord.gg/DYavckB");
break; break;
default: default:
mainWindow.loadUrl(url); mainWindow.loadURL(url);
} }
}); });
} }