From 30615c0044fe681c5026b31ac89c8bcf1466a7b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ritzl?= Date: Thu, 28 Dec 2017 19:59:20 +0100 Subject: [PATCH 1/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 16f54de..4decbf6 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ Or point to the ZIP file of a [specific release](https://github.com/britzl/monar Using Monarch requires that screens are created in a certain way. Once you have one or more screens created you can start navigating between the screens. ## Creating screens -Monarch screens are created in individual collections and loaded through collection proxies. The recommended setup is to create one game object per screen and per game object attach a collection proxy component and an instance of the ```screen.script``` provided by Monarch. The screen.script will take care of the setup of the screen. All you need to do is to make sure that the script properties on the ```screen.script``` are correct: +Monarch screens are created in individual collections and loaded through collection proxies. The recommended setup is to create one game object per screen and per game object attach a collection proxy component and an instance of the ```screen.script``` provided by Monarch. The ```screen.script``` will take care of the setup of the screen. All you need to do is to make sure that the script properties on the ```screen.script``` are correct: * **Screen Proxy (url)** - The URL to the collection proxy component containing the actual screen. Defaults to ```#collectionproxy```. * **Screen Id (hash)** - A unique id that can be used to reference the screen when navigating your app. From 9d9d93cd4cf702bbb5ca47ecbbabd8b00fffb8e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ritzl?= Date: Thu, 28 Dec 2017 21:20:09 +0100 Subject: [PATCH 2/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4decbf6..e724677 100644 --- a/README.md +++ b/README.md @@ -87,7 +87,7 @@ If a popup is shown on top of a non-popup the current top screen will not be unl * Stack is ```[A, B, C]``` and B will still be visible ### Popup on popup -If a popup is at the top of the stack and another popup is show the behavior will depend on if the new popup has the Popup on Popup flag set or not. If the Popup on Popup flag is set the underlying popup will remain visible. +If a popup is at the top of the stack and another popup is shown the behavior will depend on if the new popup has the Popup on Popup flag set or not. If the Popup on Popup flag is set the underlying popup will remain visible. * Stack is ```[A, B, C]``` and C is a popup * A call to ```monarch.show(D)``` is made and D is a popup with the popup on popup flag set From 973ab5b01c90cb97633a31535bbc9b288dcc9d6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ritzl?= Date: Fri, 9 Feb 2018 22:00:13 +0100 Subject: [PATCH 3/7] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index e724677..8ab6dbe 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ [![Build Status](https://travis-ci.org/britzl/monarch.svg?branch=master)](https://travis-ci.org/britzl/monarch) +[![Github All Releases](https://img.shields.io/github/downloads/atom/atom/total.svg)](https://github.com/britzl/monarch) # Monarch Monarch is a screen manager for the [Defold](https://www.defold.com) game engine. From 0c0a206ba048eee503f10552b30f5cbc13c3a813 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ritzl?= Date: Fri, 9 Feb 2018 22:11:20 +0100 Subject: [PATCH 4/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8ab6dbe..3c201d8 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ [![Build Status](https://travis-ci.org/britzl/monarch.svg?branch=master)](https://travis-ci.org/britzl/monarch) -[![Github All Releases](https://img.shields.io/github/downloads/atom/atom/total.svg)](https://github.com/britzl/monarch) +[![Github All Releases](https://img.shields.io/github/downloads/britzl/monarch/total.svg)](https://github.com/britzl/monarch) # Monarch Monarch is a screen manager for the [Defold](https://www.defold.com) game engine. From 7cd313f1e6f66f00fe8414aa5228c598c4fa6c45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ritzl?= Date: Fri, 9 Feb 2018 22:14:03 +0100 Subject: [PATCH 5/7] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 3c201d8..62e863f 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ [![Build Status](https://travis-ci.org/britzl/monarch.svg?branch=master)](https://travis-ci.org/britzl/monarch) +[![Latest Release](https://img.shields.io/github/release/britzl/monarch.svg)](https://github.com/britzl/monarch/releases) [![Github All Releases](https://img.shields.io/github/downloads/britzl/monarch/total.svg)](https://github.com/britzl/monarch) # Monarch From 28e54beefba2e9cbbf42ff4aa9ce42f23ff2493b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ritzl?= Date: Fri, 9 Feb 2018 22:18:56 +0100 Subject: [PATCH 6/7] Update README.md --- README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/README.md b/README.md index 62e863f..a764325 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,5 @@ [![Build Status](https://travis-ci.org/britzl/monarch.svg?branch=master)](https://travis-ci.org/britzl/monarch) [![Latest Release](https://img.shields.io/github/release/britzl/monarch.svg)](https://github.com/britzl/monarch/releases) -[![Github All Releases](https://img.shields.io/github/downloads/britzl/monarch/total.svg)](https://github.com/britzl/monarch) # Monarch Monarch is a screen manager for the [Defold](https://www.defold.com) game engine. From 2bac31b15509e2020d257d0fd21f8a8165aecf65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Ritzl?= Date: Sun, 18 Feb 2018 22:21:51 +0100 Subject: [PATCH 7/7] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a764325..ffc2aac 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ NOTE: You must ensure that the ```init()``` function of the ```screen.script``` end function on_message(self, message_id, message, sender) - monarch.show("first_screen") + monarch.show(hash("first_screen")) end #### Preventing duplicates in the stack