Browse Source

Merge remote-tracking branch 'official/master' into snoz_develop

master
Steve Halliwell 4 years ago
parent
commit
5088b7fa2f
  1. 15
      .github/pull_request_template.md
  2. 13
      Assets/Fungus/Docs/CHANGELOG.txt
  3. 4
      ProjectSettings/ProjectVersion.txt

15
.github/pull_request_template.md

@ -7,6 +7,7 @@
- Check your code additions pass all tests. - Check your code additions pass all tests.
- Check your code additions have not negatively impacted or altered the behaviour of the FungusExamples. - Check your code additions have not negatively impacted or altered the behaviour of the FungusExamples.
- If adding a new feature, ensure you have added a demo to the FungusExamples and if possible added Tests too. - If adding a new feature, ensure you have added a demo to the FungusExamples and if possible added Tests too.
- If adding prefabs or scenes, please make them in the oldest supported version of Unity possible (to ensure they are able to run in the Compatability release)
💔Thank you! With that done and out of the way, you can remove all the above text and get to submitting this PR. 💔Thank you! With that done and out of the way, you can remove all the above text and get to submitting this PR.
@ -25,14 +26,14 @@ Issue Number: N/A
- -
### Important Notes ### Important Notes
<!--- Go over all the following points, and put an `x` in all the boxes that apply. --> <!--- Go over the following points, and delete all lines that do not apply. -->
<!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> <!--- If you're unsure about any of these, don't hesitate to ask. We're here to help! -->
- [ ] My change require changes to documentation - My change require modifcations or additions to documentation
- My changes modify - My change modifies the workflow/editing of flowcharts/blocks/commands etc.
- [ ] the editing of flowcharts/blocks/commands etc. - My change modifies the runtime execution/behaviour of existing Fungus Features. e.g., Say, Menus, Portraits, etc.
- [ ] the runtime execution of existing Fungus Features. e.g., Say, Menus, Portraits, etc. - My change adds tests or test scenes
- [ ] My change adds additional tests - My change adds demos to FungusExamples
- [ ] My change modifies existing FungusExamples - My change modifies existing FungusExamples
<!-- If this introduces a breaking change, please describe the impact and migration path for existing applications below. --> <!-- If this introduces a breaking change, please describe the impact and migration path for existing applications below. -->

13
Assets/Fungus/Docs/CHANGELOG.txt

@ -1,6 +1,19 @@
Changelog {#changelog} Changelog {#changelog}
========= =========
Unreleased
======
v3.13.3
======
## Fixed
- View Gizmo Drawer specifies type of View, no longer tries to run for every object in scene.
- TMProLinkAnim dictionary errors caused by duplicate entries when Domain Reload is disabled, Thanks to yano.
- Divide Equal now uses Unicode characters in place of ASCII slash in menus, so it shows correctly.
v3.13.2 v3.13.2
====== ======

4
ProjectSettings/ProjectVersion.txt

@ -1,2 +1,2 @@
m_EditorVersion: 2019.3.13f1 m_EditorVersion: 2019.4.4f1
m_EditorVersionWithRevision: 2019.3.13f1 (d4ddf0d95db9) m_EditorVersionWithRevision: 2019.4.4f1 (1f1dac67805b)

Loading…
Cancel
Save