Skip to content

Commit 4a92452

Browse files
Merge pull request #1188 from ManticoreGamesInc/development
2 parents 8d7583c + 024ca44 commit 4a92452

10 files changed

+111
-125
lines changed

.github/workflows/pullrequest.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
max_timeout: 520
4646

4747
- name: Audit URLs using Lighthouse
48-
uses: treosh/lighthouse-ci-action@9.3.1
48+
uses: treosh/lighthouse-ci-action@9.6.8
4949
env:
5050
LHCI_GITHUB_TOKEN: ${{ secrets.LHCI_GITHUB_APP_TOKEN }}
5151
with:

package-lock.json

Lines changed: 96 additions & 116 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.35.0",
42+
"eslint": "^8.38.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.4"
48+
"prettier": "^2.8.7"
4949
},
5050
"engines": {
5151
"node": ">= 18"

requirements.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
markdown-full-yaml-metadata
22
markdown>=3.2.1,<3.4
33
mkdocs-ezlinks-plugin==0.1.14
4-
mkdocs-git-revision-date-localized-plugin==1.1.0
4+
mkdocs-git-revision-date-localized-plugin==1.2.0
55
mkdocs-material-extensions==1.1.1
66
mkdocs-redirects==1.2.0
77
mkdocs==1.4.2
88
pygments==2.14.0
9-
pymdown-extensions==9.9.2
10-
mkdocs-static-i18n==0.53
11-
mkdocs-minify-plugin==0.6.2
9+
pymdown-extensions==9.11
10+
mkdocs-static-i18n==0.56
11+
mkdocs-minify-plugin==0.6.4
1212
mkdocs-meta-descriptions-plugin==2.2.0
1313
mkdocs-glightbox
1414
./mkdocs-material

src/api/damageable.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ Damageable is an interface which defines properties, events, and functions for o
3030
| ----- | ----------- | ----------- | ---- |
3131
| `damagedEvent` | [`Event`](event.md)<`Damageable` damageable, [`Damage`](damage.md) damage> | Fired when the Damageable takes damage. | Server-Only |
3232
| `diedEvent` | [`Event`](event.md)<`Damageable` damageable, [`Damage`](damage.md) damage> | Fired when the Damageable dies. | Server-Only |
33+
| `hitPointsChangedEvent` | [`Event`](event.md)<`Damageable` damageable, `number` previousHitPoints> | Fired when there's a change in hit points on the Damageable. | Server-Only |
3334

3435
## Hooks
3536

src/api/damageableobject.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ DamageableObject is a CoreObject which implements the [Damageable](damageable.md
3737
| ----- | ----------- | ----------- | ---- |
3838
| `damagedEvent` | [`Event`](event.md)<[`DamageableObject`](damageableobject.md) object, [`Damage`](damage.md) damage> | Fired when the object takes damage. | Server-Only |
3939
| `diedEvent` | [`Event`](event.md)<[`DamageableObject`](damageableobject.md) object, [`Damage`](damage.md) damage> | Fired when the object dies. | Server-Only |
40+
| `hitPointsChangedEvent` | [`Event`](event.md)<[`DamageableObject`](damageableobject.md) object, `number` previousHitPoints> | Fired when there's a change in hit points on the object. | Server-Only |
4041

4142
## Hooks
4243

src/api/physicsobject.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,8 @@ A CoreObject with simulated physics that can interact with players and other obj
4040
| ----- | ----------- | ----------- | ---- |
4141
| `damagedEvent` | [`Event`](event.md)<[`PhysicsObject`](physicsobject.md) object, [`Damage`](damage.md) damage> | Fired when the object takes damage. | Server-Only |
4242
| `diedEvent` | [`Event`](event.md)<[`PhysicsObject`](physicsobject.md) object, [`Damage`](damage.md) damage> | Fired when the object dies. | Server-Only |
43-
| `collidedEvent` | [`Event`](event.md)<[`PhysicsObject`](physicsobject.md) object , [`HitResult`](hitresult.md) hitResult> | Fired when the object collides with another object. The `HitResult` parameter describes the collision that occurred. | None |
43+
| `hitPointsChangedEvent` | [`Event`](event.md)<[`PhysicsObject`](physicsobject.md) object, `number` previousHitPoints> | Fired when there's a change in hit points on the object. | Server-Only |
44+
| `collidedEvent` | [`Event`](event.md)<[`PhysicsObject`](physicsobject.md) object, [`HitResult`](hitresult.md) hitResult> | Fired when the object collides with another object. The `HitResult` parameter describes the collision that occurred. | None |
4445

4546
## Hooks
4647

src/api/player.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ Player is an object representation of the state of a player connected to the gam
4040
| `shouldFlipOnMultiJump` | `boolean` | Set to `false` to disable flip animation when player performs double-jump, triple-jump, etc. Defaults to `true`, enabling flip animation. | Read-Write |
4141
| `jumpVelocity` | `number` | Vertical speed applied to Player when they jump. Default = 900. Speed is expressed in centimeters per second. | Read-Write |
4242
| `gravityScale` | `number` | Multiplier on gravity applied. Default = 1.9. | Read-Write |
43+
| `airControl` | `number` | When falling, amount of lateral movement control available to the player. 0 is no control. 1 is full control. Default = 0.5. | Read-Write |
44+
| `maxMountSpeed` | `number` | Maximum speed while the player is mounted. Default = 1280. | Read-Write |
4345
| `maxSwimSpeed` | `number` | Maximum speed while the player is swimming. Default = 420. | Read-Write |
4446
| `maxFlySpeed` | `number` | Maximum speed while the player is flying. Default = 600. | Read-Write |
4547
| `touchForceFactor` | `number` | Force applied to physics objects when contacted with a Player. Default = 1. | Read-Write |

src/api/vehicle.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ Vehicle is a CoreObject representing a vehicle that can be occupied and driven b
6666
| `driverExitedEvent` | [`Event`](event.md)<[`Vehicle`](vehicle.md) vehicle, [`Player`](player.md) player> | Fired when a driver exits the vehicle. | None |
6767
| `damagedEvent` | [`Event`](event.md)<[`Vehicle`](vehicle.md) vehicle, [`Damage`](damage.md) damage> | Fired when the vehicle takes damage. | Server-Only |
6868
| `diedEvent` | [`Event`](event.md)<[`Vehicle`](vehicle.md) vehicle, [`Damage`](damage.md) damage> | Fired when the vehicle dies. | Server-Only |
69+
| `hitPointsChangedEvent` | [`Event`](event.md)<[`Vehicle`](vehicle.md) vehicle, `number` previousHitPoints> | Fired when there's a change in hit points on the vehicle. | Server-Only |
6970

7071
## Hooks
7172

0 commit comments

Comments
 (0)