Skip to content

Commit

Permalink
Merge branch 'master' into fixloopanimate
Browse files Browse the repository at this point in the history
  • Loading branch information
amylizzle authored May 23, 2024
2 parents 0cc4b0b + d81e7a7 commit 908815b
Show file tree
Hide file tree
Showing 2 changed files with 42 additions and 12 deletions.
26 changes: 26 additions & 0 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
name: Lint

on:
pull_request:
branches: [master]

jobs:
lint:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Setup submodule
run: |
git submodule update --init --recursive
- name: Setup .NET Core
uses: actions/setup-dotnet@v1
with:
dotnet-version: 8.0.100
- name: Setup Resharper
run: dotnet tool install -g JetBrains.ReSharper.GlobalTools
- name: Run Linter
run: jb inspectcode OpenDream.sln -o="output.json" --project="OpenDream*;DM*" --no-swea
- uses: github/codeql-action/upload-sarif@v3
with:
sarif_file: output.json
28 changes: 16 additions & 12 deletions DMCompiler/DMStandard/Defines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,27 @@
#define NEUTER "neuter"
#define PLURAL "plural"

//animate() flags arg
#define ANIMATION_END_NOW 1
#define ANIMATION_LINEAR_TRANSFORM 2
#define ANIMATION_PARALLEL 4
#define ANIMATION_SLICE 8
#define ANIMATION_RELATIVE 256
#define ANIMATION_CONTINUE 512

//animate() easing arg
#define LINEAR_EASING 0
#define SINE_EASING 1
#define CIRCULAR_EASING 2
#define CUBIC_EASING 3
#define BOUNCE_EASING 4
#define ELASTIC_EASING 5
#define BACK_EASING 6
#define QUAD_EASING 7
#define JUMP_EASING 8
//flags applied to the animate() easing arg
#define EASE_IN 64
#define EASE_OUT 128
#define ANIMATION_RELATIVE 256

#define NO_STEPS 0
#define FORWARD_STEPS 1
Expand Down Expand Up @@ -123,17 +138,6 @@
#define PASS_MOUSE (1<<10)
#define TILE_MOVER (1<<11)

//animate() easing arg
#define LINEAR_EASING 0
#define SINE_EASING 1
#define CIRCULAR_EASING 2
#define CUBIC_EASING 3
#define BOUNCE_EASING 4
#define ELASTIC_EASING 5
#define BACK_EASING 6
#define QUAD_EASING 7
#define JUMP_EASING 8

//Undocumented matrix defines (see https://www.byond.com/forum/post/1881375)
#define MATRIX_COPY 0
#define MATRIX_MULTIPLY 1 // idk why this is first, either
Expand Down

0 comments on commit 908815b

Please sign in to comment.