Skip to content

Commit

Permalink
Merge pull request #1188 from ManticoreGamesInc/development
Browse files Browse the repository at this point in the history
  • Loading branch information
StanzillaManticore committed Apr 13, 2023
2 parents 8d7583c + 024ca44 commit 4a92452
Show file tree
Hide file tree
Showing 10 changed files with 111 additions and 125 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/pullrequest.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
max_timeout: 520

- name: Audit URLs using Lighthouse
uses: treosh/lighthouse-ci-action@9.3.1
uses: treosh/lighthouse-ci-action@9.6.8
env:
LHCI_GITHUB_TOKEN: ${{ secrets.LHCI_GITHUB_APP_TOKEN }}
with:
Expand Down
2 changes: 1 addition & 1 deletion mkdocs-material
Submodule mkdocs-material updated 2 files
+989 −772 package-lock.json
+18 −18 package.json
212 changes: 96 additions & 116 deletions package-lock.json

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@
"homepage": "https://docs.coregames.com",
"devDependencies": {
"@attilagyongyosi/path-linter": "^2.1.5",
"eslint": "^8.35.0",
"eslint": "^8.38.0",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-plugin-import": "^2.27.5",
"eslint-plugin-prettier": "^4.2.1",
"lite-youtube-embed": "^0.2.0",
"markdownlint-cli2": "^0.6.0",
"prettier": "^2.8.4"
"prettier": "^2.8.7"
},
"engines": {
"node": ">= 18"
Expand Down
8 changes: 4 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
markdown-full-yaml-metadata
markdown>=3.2.1,<3.4
mkdocs-ezlinks-plugin==0.1.14
mkdocs-git-revision-date-localized-plugin==1.1.0
mkdocs-git-revision-date-localized-plugin==1.2.0
mkdocs-material-extensions==1.1.1
mkdocs-redirects==1.2.0
mkdocs==1.4.2
pygments==2.14.0
pymdown-extensions==9.9.2
mkdocs-static-i18n==0.53
mkdocs-minify-plugin==0.6.2
pymdown-extensions==9.11
mkdocs-static-i18n==0.56
mkdocs-minify-plugin==0.6.4
mkdocs-meta-descriptions-plugin==2.2.0
mkdocs-glightbox
./mkdocs-material
1 change: 1 addition & 0 deletions src/api/damageable.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ Damageable is an interface which defines properties, events, and functions for o
| ----- | ----------- | ----------- | ---- |
| `damagedEvent` | [`Event`](event.md)<`Damageable` damageable, [`Damage`](damage.md) damage> | Fired when the Damageable takes damage. | Server-Only |
| `diedEvent` | [`Event`](event.md)<`Damageable` damageable, [`Damage`](damage.md) damage> | Fired when the Damageable dies. | Server-Only |
| `hitPointsChangedEvent` | [`Event`](event.md)<`Damageable` damageable, `number` previousHitPoints> | Fired when there's a change in hit points on the Damageable. | Server-Only |

## Hooks

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

## Hooks

Expand Down
3 changes: 2 additions & 1 deletion src/api/physicsobject.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,8 @@ A CoreObject with simulated physics that can interact with players and other obj
| ----- | ----------- | ----------- | ---- |
| `damagedEvent` | [`Event`](event.md)<[`PhysicsObject`](physicsobject.md) object, [`Damage`](damage.md) damage> | Fired when the object takes damage. | Server-Only |
| `diedEvent` | [`Event`](event.md)<[`PhysicsObject`](physicsobject.md) object, [`Damage`](damage.md) damage> | Fired when the object dies. | Server-Only |
| `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 |
| `hitPointsChangedEvent` | [`Event`](event.md)<[`PhysicsObject`](physicsobject.md) object, `number` previousHitPoints> | Fired when there's a change in hit points on the object. | Server-Only |
| `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 |

## Hooks

Expand Down
2 changes: 2 additions & 0 deletions src/api/player.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ Player is an object representation of the state of a player connected to the gam
| `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 |
| `jumpVelocity` | `number` | Vertical speed applied to Player when they jump. Default = 900. Speed is expressed in centimeters per second. | Read-Write |
| `gravityScale` | `number` | Multiplier on gravity applied. Default = 1.9. | Read-Write |
| `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 |
| `maxMountSpeed` | `number` | Maximum speed while the player is mounted. Default = 1280. | Read-Write |
| `maxSwimSpeed` | `number` | Maximum speed while the player is swimming. Default = 420. | Read-Write |
| `maxFlySpeed` | `number` | Maximum speed while the player is flying. Default = 600. | Read-Write |
| `touchForceFactor` | `number` | Force applied to physics objects when contacted with a Player. Default = 1. | Read-Write |
Expand Down
1 change: 1 addition & 0 deletions src/api/vehicle.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ Vehicle is a CoreObject representing a vehicle that can be occupied and driven b
| `driverExitedEvent` | [`Event`](event.md)<[`Vehicle`](vehicle.md) vehicle, [`Player`](player.md) player> | Fired when a driver exits the vehicle. | None |
| `damagedEvent` | [`Event`](event.md)<[`Vehicle`](vehicle.md) vehicle, [`Damage`](damage.md) damage> | Fired when the vehicle takes damage. | Server-Only |
| `diedEvent` | [`Event`](event.md)<[`Vehicle`](vehicle.md) vehicle, [`Damage`](damage.md) damage> | Fired when the vehicle dies. | Server-Only |
| `hitPointsChangedEvent` | [`Event`](event.md)<[`Vehicle`](vehicle.md) vehicle, `number` previousHitPoints> | Fired when there's a change in hit points on the vehicle. | Server-Only |

## Hooks

Expand Down

0 comments on commit 4a92452

Please sign in to comment.