Merge branch 'develop'

casual-simulation · Jan 10, 2022 · 0cd21d7 · 0cd21d7
2 parents e1f6acc + 26a38dc
commit 0cd21d7
Show file tree

Hide file tree

Showing 26 changed files with 1,036 additions and 102 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,20 @@
 # CasualOS Changelog
 
+## V2.0.29
+
+#### Date: 1/10/2022
+
+### :rocket: Improvements
+
+-   Added the ability to use videos for `formAddress` and `portalBackgroundAddress` URLs.
+-   Improved CasualOS to support logging into ab1.link directly from CasualOS.
+    -   Previously you would have to login to ab1.link via a new tab.
+    -   The new experience is seamless and much less confusing.
+
+### :bug: Bug Fixes
+
+-   Fixed an issue where DRACO compressed GLTF models could not be loaded if the decoder program had already been cached by the web browser.
+
 ## V2.0.28
 
 #### Date: 1/5/2022

diff --git a/docs/docs/tags.mdx b/docs/docs/tags.mdx
@@ -758,7 +758,7 @@ When <TagLink tag='form'/> is set to `iframe` and <TagLink tag='formSubtype'/> i
 
 When <TagLink tag='form'/> is set to `iframe` and <TagLink tag='formSubtype'/> is set to `src`, the address should be the URL of the webpage that should be displayed.
 
-When the bot is in the menu portal, this is the URL of the image that should be shown on the menu item.
+When the bot is in the menu portal, this is the URL of the image or video that should be shown on the menu item.
 It can also be `cube` to show an icon of a cube, `egg` to show an egg icon, and `helix` to show an icon of a DNA helix.
 If the given value is not a URL or one of the predefined icons, then the specified [Material Icon](https://material.io/resources/icons/?style=baseline) will be shown.
 
@@ -1281,7 +1281,7 @@ The top left of the image is (0, 0).
     <MiniGridPortalBadge/>
 </Badges>
 
-The URL of the image that should be displayed as the background of the portal.
+The URL of the image or video that should be displayed as the background of the portal.
 
 When specified, this tag overrides <TagLink tag='#portalColor'/>.
 Additionally, this tag does nothing when in VR. 
@@ -1292,7 +1292,7 @@ Additionally, this tag does nothing when in VR.
     (default)
   </PossibleValueCode>
   <PossibleValue value='Any URL'>
-    Specifies that the portal background should use the given image.
+    Specifies that the portal background should use the given image or video.
   </PossibleValue>
 </PossibleValuesTable>
 
@@ -2120,16 +2120,20 @@ You can find the physical pixel width of the device by calculating `pixelHeight
 
 ### `pixelRatio`
 
+<Badges>
+    <ConfigBotBadge/>
+</Badges>
+
 The [pixel ratio](https://developer.mozilla.org/en-US/docs/Web/API/Window/devicePixelRatio) that should be used to determine how many physical pixels should be used to draw each pixel in the 3D portals. 
 Higher values will make the 3D portals appear smoother but will also cause CausalOS to run slower.
 
 #### Possible values are:
 <PossibleValuesTable>
   <PossibleValueCode value='null'>
-    Use the default pixel ratio.
+    Use the default pixel ratio. (Default)
   </PossibleValueCode>
   <PossibleValue value='Any Number > 0'>
-    The text that should be displayed as a hint when the user hovers their mouse over the button.
+    The pixel ratio that should be used.
   </PossibleValue>
 </PossibleValuesTable>
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/src/aux-auth/scripts/bootstrap.js b/src/aux-auth/scripts/bootstrap.js
@@ -143,9 +143,9 @@ async function start() {
             .putItem({
                 TableName: EMAIL_TABLE,
                 Item: {
-                    id: { S: uuid() },
-                    type: { S: 'allow' },
-                    pattern: { S: '@casualsimulation\\.org$' },
+                    id: { S: 'deny_test' },
+                    type: { S: 'deny' },
+                    pattern: { S: '^test@casualsimulation\\.org$' },
                 },
             })
             .promise();
@@ -154,9 +154,9 @@ async function start() {
             .putItem({
                 TableName: EMAIL_TABLE,
                 Item: {
-                    id: { S: uuid() },
-                    type: { S: 'deny' },
-                    pattern: { S: '^test@casualsimulation\\.org$' },
+                    id: { S: 'allow_casualsim' },
+                    type: { S: 'allow' },
+                    pattern: { S: '@casualsimulation\\.org$' },
                 },
             })
             .promise();

diff --git a/src/aux-auth/server/index.ts b/src/aux-auth/server/index.ts
@@ -285,8 +285,8 @@ async function start() {
     app.get('/api/emailRules', async (req, res) => {
         try {
             res.send([
-                { type: 'allow', pattern: '@casualsimulation\\.org$' },
                 { type: 'deny', pattern: '^test@casualsimulation\\.org$' },
+                { type: 'allow', pattern: '@casualsimulation\\.org$' },
             ] as EmailRule[]);
         } catch (err) {
             console.error(err);