Skip to content
This repository has been archived by the owner on Oct 30, 2023. It is now read-only.

Hello result information! #86

Merged
merged 6 commits into from
Feb 24, 2018
Merged

Conversation

raspbianlike
Copy link
Collaborator

@raspbianlike raspbianlike commented Feb 24, 2018

Description

Describe your pull request here

Type

BREAKING CHANGE MY NIGGER

Checklist

Check the checkbox(es) that apply.

  • I have read the CONTRIBUTING guide.
  • ./build.sh is passing with every build step and every test locally.
  • I have added tests that prove my fix is effective or that my feature works.
  • I tested it on Linux and on Windows and it's working as intended.

Discussion

If this is a relatively large or complex change, kick off the discussion by explaining why you chose the solution you did and what alternatives you considered, etc...

Reviewers

@Marc3842h, ...

@@ -18,6 +18,6 @@
// Titan uses SemVer (Microsoft doesn't prefer that and displays a warning), thats why we disable the compiler warnings.
[assembly: AssemblyVersion("1.6.0")]
[assembly: AssemblyFileVersion("1.6.0")]
[assembly: AssemblyInformationalVersion("1.6.0-<%GitHash%>")] // Will be edited by Cake Build Script
[assembly: AssemblyInformationalVersion("1.6.0-e7b1319")] // Will be edited by Cake Build Script
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please revert this back to <%GitHash%>.

@@ -19,6 +19,6 @@
// TitanTest uses SemVer (Microsoft doesn't prefer that and displays a warning), thats why we disable the compiler warnings.
[assembly: AssemblyVersion("1.6.0")]
[assembly: AssemblyFileVersion("1.6.0")]
[assembly: AssemblyInformationalVersion("1.6.0-<%GitHash%>")] // Will be edited by Cake Build Script
[assembly: AssemblyInformationalVersion("1.6.0-e7b1319")] // Will be edited by Cake Build Script
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please revert this back to <%GitHash%>.

@@ -229,7 +246,8 @@ public void StartCommend(TitanAccount account, CommendInfo info)
var timeSpent = DateTime.Now.Subtract(account.StartEpoch.ToDateTime());

_log.Error("Connection to account {Account} timed out. It was not possible to " +
"commend the target after {Timespan} seconds.", account.JsonAccount.Username, timeSpent.Seconds);
"commend the target after {Timespan} seconds.", account.JsonAccount.Username,
timeSpent.Seconds);
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please fix formatting here.

@@ -302,7 +320,8 @@ public void StartMatchResolving(TitanAccount account, LiveGameInfo info)
var timeSpent = DateTime.Now.Subtract(account.StartEpoch.ToDateTime());

_log.Error("Connection to account {Account} timed out. It was not possible to resolve the Match " +
"ID for the target after {Timespan} seconds.", account.JsonAccount.Username, timeSpent.Seconds);
"ID for the target after {Timespan} seconds.", account.JsonAccount.Username,
timeSpent.Seconds);
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please fix formatting here.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, the value will be edited by the Cake Build Script but is supposted to be reverted back after the build process finished. It seems you cancelled the build process mid-way.

Also, please follow the Contributor Covenant Code of Conduct before discussing and contributing to the Titan repository and the issues section. Inappropriate language may result in you losing your Collaborator permissions.

@mellowagain mellowagain merged commit 5525a72 into mellowagain:master Feb 24, 2018
raspbianlike added a commit to raspbianlike/Titan that referenced this pull request Feb 25, 2018
raspbianlike added a commit to raspbianlike/Titan that referenced this pull request Feb 25, 2018
raspbianlike added a commit to raspbianlike/Titan that referenced this pull request Feb 25, 2018
@raspbianlike raspbianlike mentioned this pull request Feb 25, 2018
4 tasks
mellowagain pushed a commit that referenced this pull request Feb 25, 2018
* Fix printing issues + handle default case in report / commend session for better logging

* Maybe this looks better as an error?

* Fix formatting? :niggerthink:

* GitHash?

* GitHash? v2

* Hotfix for #86

* Hotfix for #86

* Revert "Hotfix for #86"

This reverts commit db6ad80.

* This formatting is getting annoying
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants