Skip to content

chore: merge/backport fixes from staging to release #654

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 30 commits into from

Conversation

0xFA11
Copy link
Contributor

@0xFA11 0xFA11 commented Mar 23, 2021

we have some changes that went into chore/release-to-master branch which is basically the branch where we merge release/0.1.0 into master branch including merge conflict resolutions — it's currently being PR'd as #652.

  • backport TickSystemTests.VerifyTickSystem() fix (b2a54ec)
  • pull .github/ISSUES_TEMPLATE/* changes merged from master to chore/release-to-master
  • delete .editorconfig & .gitattributes files from the repository root
    • we have plans to replace .editorconfig with Unity C# Standards compliant one
    • we have plans to re-introduce .gitattributes including Unity Smart Merge (YAML Merge)

also, keep in mind that we'll ultimately merge release/0.1.0 branch into develop branch, delete release/0.1.0 branch after we're done with it and move on under develop branch (see Gitflow Workflow for the reference →).

nezix and others added 30 commits August 28, 2020 13:47
Improve the example with an event listener
Added missing `transform`
Synchronize was missing an h! Hope this doesnt break any permalinks to this page?
Fixed typo in networkedvar.md
Documentation type miss MyServerRpc → MyServerRPC
Update object-visibility.md
…y_documentation

docs: Fix typos in readme and contributing
* docs: Remove Mirror from feature comparison

* docs: Remove blog from documentation website

* docs: Update documentation website footer.

* docs: Update git links on documentation website

* docs: Update website index
InvokeServerRpc(MyServerRpc, Random.Range(-50, 50)); "Rpc" should be written in capital letters otherwise an exception will be thrown
Added multiplayer forum button.
Fix github release links in readme.md
* docs: Update issue templates

- Updated labels of Feedback templates
- Added Other Issues, Support, Feedback and RFC Tracking Issue templates

* docs: Add issue template config
* Include instance ID in soft sync failure message

* Use explicit string format

Co-authored-by: Luke Stampfli <43687322+LukeStampfli@users.noreply.github.com>

Co-authored-by: Luke Stampfli <43687322+LukeStampfli@users.noreply.github.com>
Adds a "Hold on, heard the news?" section to the top of the readme which describes upcoming release for those users who discover the github after the keynote but before release.
Removed old mlapi.network links to api/wiki/docs and replaced with nice shiny new Multiplayer docs site links.
@unity-cla-assistant
Copy link

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
7 out of 8 committers have signed the CLA.

✅ JerryLin1
✅ mraue
✅ nezix
✅ AldeRoberge
✅ TJHeuvel
✅ ThoseGrapefruits
✅ ironicnet
❌ TomitaHaruhito
You have signed the CLA already but the status is still pending? Let us recheck it.

@0xFA11 0xFA11 changed the title chore: merge/backport fixes from staging branch to release branch chore: merge/backport fixes from staging to release Mar 23, 2021
@0xFA11
Copy link
Contributor Author

0xFA11 commented Mar 23, 2021

superseded by #656

this branch was based on chore/release-to-master but #656 is based on release/0.1.0 which makes the whole PR much more small and much more managable.

@0xFA11 0xFA11 closed this Mar 23, 2021
@0xFA11 0xFA11 deleted the chore/backport-fixes branch July 5, 2022 16:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.