Skip to content

Commit

Permalink
Dev (#30)
Browse files Browse the repository at this point in the history
* Enabled GUI
Added HES Command Line arg -autostart to start the server on load.
Console Commands /start /stop
Can edit GameServer.ini from HES Gui
Other changes

* More work on Backup/Saving/Loading of Config file.
Added Chat & Player control tab (No hooks yet)

* Plugins And More! Time to start a neater Log!

* Localization implentation

In implented the localization system in the full software. It create the
default Localization folder with a En.rex file during the first
launching.

* Moved NLog and it's config files to Common
Moved LogManager to HES.Common ( reference HellionExtendedServer.Common to use the log )
Moved GameServerIni to HES.Common.
Moved Config and Localization to the the main Namespace.
GUI class is now named HESGui rather than Form1
Current work commit on the UpdaterManager, not ready yet.
Merged changes into my commit.

REMEMBER TO SYNC YOUR DEV BRANCH!

* Revert "Plugins Work and Load Properly #20"

* Moved files to the new Modules folder to contain classes not directly related to HES

Current folder structure required for hes to operate, will throw exceptions if its wrong (Folders.cs will be used to make sure the folders are structured this way soon.

    /// ServerFolder/
    ///     ...HellionExtendedServer.exe
    ///     ...HellionExtendedServer.exe.config
    ///     ...Hes/ (Using this folder helps keep server hosters server directory cleaned up (2 files, 1 folder))
    ///         ...Config.cfg (HES config file)
    ///         ...localization (Contains resources for languages)
    ///         ...logs (contains HES's logs)
    ///         ...updates (will be used as a temp directory for updates)
    ///         ...bin/ (any files that HES or HES.Common references to keep the server dir clean)
    ///             ...HellionExtendedServer.Common.dll
    ///             ...NLog.dll
    ///             ...NLog.dll.config

* Should be my final Pull Request for Plugins #20 (#28)

* Almost Done!

* Should be done!

* DONE!

* Quick Fix for Merge!

Now Everything works!

* Nothin Really

* Build event added to project to create the proper folder/file structure for github releases
HES.Common.dll cleaned up.
Added test plugin project, and plugin ( plugin folder is Hes/plugins in the server directory now )

* Changed the threading
Added OnServerRunning and OnServerStopped events to ServerInstance
Added /status chat command
Other things

* reverted some changes to the server wrapper and server instance that broke it ;)

* Reverted to far! forgot a variable required for the gui controls to unlock!
  • Loading branch information
generalwrex committed Mar 10, 2017
1 parent 0c20d6b commit 46e05c3
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion HellionExtendedServer/ServerWrappers/Hellion.cs
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ public void StopServer()
Dbg.Destroy();
Server.MainLoopEnded.WaitOne(5000);

ServerInstance.Instance.IsRunning = false;

Log.Instance.Info(HES.Localization.Sentences["SuccessShutdown"]);
}
catch (Exception ex)
Expand Down Expand Up @@ -144,7 +146,9 @@ public Thread StartServer(Object args)

// The server is now running, set the running field to true
m_isRunning = m_instance.Server.WorldInitialized;


ServerInstance.Instance.IsRunning = true;

return serverThread;
}

Expand Down

0 comments on commit 46e05c3

Please sign in to comment.