Merge branch 'develop' into stable

Juce-Assets · Nov 23, 2020 · 0f474cf · 0f474cf
2 parents 2a45244 + cddf37e
commit 0f474cf
Show file tree

Hide file tree

Showing 10 changed files with 281 additions and 4 deletions.
diff --git a/Examples/Exam.meta → Editor/Documentation/Events.meta b/Examples/Exam.meta → Editor/Documentation/Events.meta
diff --git a/Misc/UserGuide/UserGuide34.png b/Misc/UserGuide/UserGuide34.png
diff --git a/Misc/UserGuide/UserGuide34.png.meta b/Misc/UserGuide/UserGuide34.png.meta
diff --git a/Misc/UserGuide/UserGuide35.png b/Misc/UserGuide/UserGuide35.png
diff --git a/Misc/UserGuide/UserGuide35.png.meta b/Misc/UserGuide/UserGuide35.png.meta
diff --git a/Misc/UserGuide/UserGuide36.png b/Misc/UserGuide/UserGuide36.png
diff --git a/Misc/UserGuide/UserGuide36.png.meta b/Misc/UserGuide/UserGuide36.png.meta
diff --git a/README.md b/README.md
@@ -2,6 +2,7 @@
 [![Twitter Follow](https://img.shields.io/badge/twitter-%406uillem-blue.svg?style=flat&label=Follow)](https://twitter.com/6uillem)
 [![Discord](https://img.shields.io/discord/768962092296044614.svg)](https://discord.gg/dbG7zKA)
 [![release](https://img.shields.io/github/release/Juce-Assets/Juce-Feedbacks.svg)](https://github.com/Juce-Assets/Juce-Feedbacks/releases/latest)
+[![openupm](https://img.shields.io/npm/v/com.juce.feedbacks?label=openupm&registry_uri=https://package.openupm.com)](https://openupm.com/packages/com.juce.feedbacks/)
 
 ## Juce-Feedbacks
 Welcome to **Juce-Feedbacks**, the open-source feedbacks library that's part of the Juce Unity tools framework.
@@ -46,4 +47,4 @@ And that's all, with that you should be ready to go!
 Read the [Usage Guide](https://github.com/Juce-Assets/Juce-Feedbacks/wiki/Usage-Guide) for more information.
 
 ## Upcoming features
-- [On Development (Progress: 0%)] Global acces to FeedbackPlayers through a singleton and an id. (Estimated Release: 27-11-2020)
+- [On Development (Progress: 80%)] Global acces to FeedbackPlayers through a singleton and an id. (Estimated Release: 27-11-2020)
diff --git a/manifest.json b/manifest.json
@@ -1,6 +1,6 @@
 {
   "name": "com.juce.feedbacks",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "displayName": "Juce-Feedbacks",
   "description": "Feedbacks library",
   "dependencies": {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "com.juce.feedbacks",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "displayName": "Juce-Feedbacks",
   "description": "Feedbacks library",
   "dependencies": {