Merge branch 'master' into deferred_loading

This commit is contained in:
George FunBook 2021-02-11 13:18:50 -06:00
commit 755e338c88
6 changed files with 27 additions and 43 deletions

View file

@ -4,29 +4,18 @@ about: Report a bug or critical performance issue
title: 'Bug Report: '
labels: bug
---
#### Please check for duplicates or similar issues, as well performing simple troubleshooting steps (such as clearing cookies, clearing AppData, trying another browser) before submitting an issue.
### If you are playing the game in a browser, what site are you playing it from?
[Newgrounds](https://www.newgrounds.com/portal/view/770371) or [Itch.io](https://ninja-muffin24.itch.io/funkin)? Specify below.
# Please check for duplicates or similar issues, as well performing simple troubleshooting steps (such as clearing cookies, clearing AppData, trying another browser) before submitting an issue.
### If you are playing the game in a browser, what browser are you using?
Chrome (or a Chromium based browser, i.e. Edge, Opera, etc.), Firefox, or Safari? Specify blow.
## Where are you playing the game?
### Web
- [ ] [Newgrounds](https://www.newgrounds.com/portal/view/770371)
- [ ] [Itch.io](https://ninja-muffin24.itch.io/funkin)
#### If you are using a web build, what browser are you using?
- [ ] Chrome, or a Chromium based broswer (Edge, Opera, etc.)
- [ ] Firefox, or a Gecko based broswer
- [ ] Safari
- [ ] Other, please specify:
### Local
- [ ] Windows x86
- [ ] Windows x86_64
- [ ] Linux
- [ ] macOS
### If you are playing a downloaded version of the game, what operating system are you using?
Windows (`x86`), Windows (`x86_64`), Linux, or macOS? Specify below.
## What version of the game are you using? Look in the bottom left corner of the main menu.
## Have you identified any steps to reproduce the bug? If so, please describe them below. Use images if possible.
## Please describe your issue. Provide extensive detail and images if possibe.
## Please describe your issue. Provide extensive detail and images if possible.

View file

@ -4,7 +4,5 @@ about: Suggest a new feature
title: 'Enhancement: '
labels: enhancement
---
# Please check for duplicates or similar issues before creating this issue.
#### Please check for duplicates or similar issues before creating this issue.
## What is your suggestion, and why should it be implemented?

View file

@ -4,7 +4,5 @@ about: Ask a general question
title: 'Question: '
labels: question
---
# Please check for duplicates or similar issues before asking your question.
#### Please check for duplicates or similar issues before asking your question.
## What is your question?

View file

@ -4,9 +4,7 @@ about: Fix a bug or critical performance issue
title: 'Bug Fix: '
labels: bug
---
# Please check for duplicates or similar PRs before creating this issue.
#### Please check for duplicates or similar PRs before creating this issue.
## Does this PR close any issue(s)? If so, link them below.
## Breifly describe the issue(s) fixed.
## Briefly describe the issue(s) fixed.

View file

@ -4,9 +4,7 @@ about: Add a new feature
title: 'Enhancement: '
labels: enhancement
---
# Please check for duplicates or similar PRs before creating this issue.
#### Please check for duplicates or similar PRs before creating this issue.
## Does this PR close any issue(s)? If so, link them below.
## What do your change(s) add, and why should they be implemented?

View file

@ -35,13 +35,15 @@ class NGio
trace('INIT NOLOGIN');
GAME_VER = "v" + Application.current.meta.get('version');
if (api.length != 0)
{
NG.create(api);
new FlxTimer().start(2, function(tmr:FlxTimer)
{
var call = NG.core.calls.app.getCurrentVersion(GAME_VER).addDataHandler(function(response:Response<GetCurrentVersionResult>)
{
GAME_VER = response.result.data.currentVersion;
GAME_VER = response.result.data.current_version;
trace('CURRENT NG VERSION: ' + GAME_VER);
gotOnlineVer = true;
});
@ -49,6 +51,7 @@ class NGio
call.send();
});
}
}
public function new(api:String, encKey:String, ?sessionId:String)
{