Skip to content

Commit 8d7583c

Browse files
Merge pull request #1174 from ManticoreGamesInc/development
2 parents bf16fd0 + 5bc84a4 commit 8d7583c

11 files changed

+86
-55
lines changed

netlify.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# Production context: all deploys from the Production branch set in your site's
1010
# deploy contexts will inherit these settings.
1111
[context.production]
12-
environment = { DEFAULT_LANGUAGE = "en", DEFAULT_LANGUAGE_ONLY = "false", MKDOCS_SITE_URL = "https://docs.coregames.com", GOOGLE_ANALYTICS_KEY = "UA-142884846-4", MKDOCS_MINIFY = "true", ROBOTS = "all" }
12+
environment = { DEFAULT_LANGUAGE = "en", DEFAULT_LANGUAGE_ONLY = "false", MKDOCS_SITE_URL = "https://docs.coregames.com", GOOGLE_ANALYTICS_KEY = "G-1E4Z9TKLEW", MKDOCS_MINIFY = "true", ROBOTS = "all" }
1313

1414
# Deploy Preview context: all deploys generated from a pull/merge request will
1515
# inherit these settings.

package-lock.json

Lines changed: 65 additions & 48 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,13 +39,13 @@
3939
"homepage": "https://docs.coregames.com",
4040
"devDependencies": {
4141
"@attilagyongyosi/path-linter": "^2.1.5",
42-
"eslint": "^8.33.0",
42+
"eslint": "^8.35.0",
4343
"eslint-config-airbnb-base": "^15.0.0",
4444
"eslint-plugin-import": "^2.27.5",
4545
"eslint-plugin-prettier": "^4.2.1",
4646
"lite-youtube-embed": "^0.2.0",
4747
"markdownlint-cli2": "^0.6.0",
48-
"prettier": "^2.8.3"
48+
"prettier": "^2.8.4"
4949
},
5050
"engines": {
5151
"node": ">= 18"

requirements.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
markdown-full-yaml-metadata==2.2.1
2-
markdown==3.3.7
1+
markdown-full-yaml-metadata
2+
markdown>=3.2.1,<3.4
33
mkdocs-ezlinks-plugin==0.1.14
44
mkdocs-git-revision-date-localized-plugin==1.1.0
55
mkdocs-material-extensions==1.1.1

src/api/coreobject.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -916,7 +916,7 @@ Example using:
916916

917917
### `ForceReplication`
918918

919-
In this example, an object is replicated to clients every 10 settings by spawning a task which will toggle the replication state of the object. When replication is enabled, the object will be moved up for a certain time, and then replication will be turned off, which will send no more updates to clients.
919+
In this example, an object is replicated to clients every 10 seconds by spawning a task which will toggle the replication state of the object. When replication is enabled, the object will be moved up for a certain time, and then replication will be turned off, which will send no more updates to clients.
920920

921921
The server script will listen for the event `ForceUpdate`, and force a replication if the object is not already replicating.
922922

src/api/enums.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -364,6 +364,15 @@ tags:
364364
| `TextJustify.CENTER` | `1` | Centered. |
365365
| `TextJustify.RIGHT` | `2` | Right-aligned. |
366366

367+
## TextVerticalJustify
368+
369+
| Enum Name | Value | Description |
370+
| --------- | ----------- | ----------- |
371+
| `TextVerticalJustify.TOP` | `0` | Top-aligned. |
372+
| `TextVerticalJustify.BOTTOM` | `1` | Bottom-aligned. |
373+
| `TextVerticalJustify.CENTER` | `2` | Centered. |
374+
| `TextVerticalJustify.BASELINE` | `3` | Baseline-aligned. |
375+
367376
## UIPivot
368377

369378
| Enum Name | Value | Description |

src/api/game.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ Game is a collection of functions and events related to players in the game, rou
4949
| `Game.roundStartEvent` | [`Event`](event.md) | Fired when StartRound is called on game. | None |
5050
| `Game.roundEndEvent` | [`Event`](event.md) | Fired when EndRound is called on game. | None |
5151
| `Game.teamScoreChangedEvent` | [`Event`](event.md)<`integer` team> | Fired whenever any team's score changes. This is fired once per team who's score changes. | None |
52+
| `Game.postCameraUpdateEvent` | [`Event`](event.md) | Fired after the camera is updated. It allows Lua code to run after the camera is updated, so a scenario like UI elements positioning themselves to a world location works without a 1 frame lag. | None |
5253

5354
## Examples
5455

src/api/staticmesh.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ See AnimatedMesh for meshes with animations.
2222

2323
| Function Name | Return Type | Description | Tags |
2424
| -------- | ----------- | ----------- | ---- |
25+
| `CanSimulateDebrisPhysics()` | `boolean` | Returns whether or not the Static Mesh can simulate Debris Physics. | None |
2526
| `SetMaterialForSlot(string assetId, string slotName)` | `None` | Set the material in the given slot to the material specified by assetId. | None |
2627
| `GetMaterialSlot(string slotName)` | [`MaterialSlot`](materialslot.md) | Get the MaterialSlot object for the given slot. If called on the client on a networked object, the resulting object cannot be modified. | None |
2728
| `GetMaterialSlots()` | `Array`<[`MaterialSlot`](materialslot.md)> | Get an array of all MaterialSlots on this mesh. If called on the client on a networked object, the resulting object cannot be modified. | None |

src/api/uitext.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ A UIControl which displays a basic text label. Inherits from [UIControl](uicontr
1919
| `fontSize` | `integer` | The font size of the UIText control. | Read-Write |
2020
| `outlineSize` | `integer` | The thickness of the outline around text in this control. A value of 0 means no outline. | Read-Write |
2121
| `justification` | [`TextJustify`](enums.md#textjustify) | Determines the alignment of `text`. Possible values are: TextJustify.LEFT, TextJustify.RIGHT, and TextJustify.CENTER. | Read-Write |
22+
| `verticalJustification` | [`TextVerticalJustify`](enums.md#textverticaljustify) | Determines the vertical alignment of `text`. Possible values are: TextVerticalJustify.TOP, TextVerticalJustify.BOTTOM, TextVerticalJustify.CENTER and TextVerticalJustify.BASELINE. | Read-Write |
2223
| `shouldWrapText` | `boolean` | Whether or not text should be wrapped within the bounds of this control. | Read-Write |
2324
| `shouldClipText` | `boolean` | Whether or not text should be clipped when exceeding the bounds of this control. | Read-Write |
2425
| `shouldScaleToFit` | `boolean` | Whether or not text should scale down to fit within the bounds of this control. | Read-Write |

src/api/uitextentry.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ A UIControl which provides an editable text input field. Inherits from [UIContro
1919
| `promptText` | `string` | Text to be displayed in the input box when `text` is empty. | Read-Write |
2020
| `isInteractable` | `boolean` | Returns whether the control can interact with the cursor (click, hover, etc). | Read-Write |
2121
| `fontSize` | `integer` | The font size of the control. | Read-Write |
22+
| `justification` | [`TextJustify`](enums.md#textjustify) | Determines the horizontal alignment of `text`. Possible values are: TextJustify.LEFT, TextJustify.RIGHT, and TextJustify.CENTER. | Read-Write |
23+
| `verticalJustification` | [`TextVerticalJustify`](enums.md#textverticaljustify) | Determines the vertical alignment of `text`. Possible values are: TextVerticalJustify.TOP, TextVerticalJustify.BOTTOM, TextVerticalJustify.CENTER and TextVerticalJustify.BASELINE. | Read-Write |
2224
| `isHittable` | `boolean` | When set to `true`, this control can receive input from the cursor and blocks input to controls behind it. When set to `false`, the cursor ignores this control and can interact with controls behind it. | Read-Write |
2325

2426
## Functions

0 commit comments

Comments
 (0)