diff --git a/.github/workflows/luacheck.yml b/.github/workflows/luacheck.yml new file mode 100644 index 00000000..e03821c5 --- /dev/null +++ b/.github/workflows/luacheck.yml @@ -0,0 +1,26 @@ +name: Luacheck + +on: [push] + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + with: + submodules: 'true' + + + - name: Install luacheck + run: | + pip install hererocks + hererocks env --lua 5.1 -rlatest + source env/bin/activate + luarocks install luacheck + + - name: Run luacheck + run: | + source env/bin/activate + luacheck scen_edit triggers libs_sb/utils libs_sb/savetable.lua --enable 1 + diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index d9c229a7..00000000 --- a/.travis.yml +++ /dev/null @@ -1,22 +0,0 @@ -language: python # Can use any language here, but if it's not 'python' - # it becomes necessary to pass '--user' to pip when installing hererocks. -sudo: false # Use container-based infrastructure. - -env: - - LUA="lua 5.1" - -before_install: - - pip install hererocks - - hererocks env --$LUA -rlatest # Use latest LuaRocks, install into 'env' directory. - - source env/bin/activate # Add directory with all installed binaries to PATH. - - luarocks install luacheck - -#install: -# - luarocks make # Install the rock, assuming there is a rockspec -# # in the root of the repository. - -script: - # '--enable 1' means 'global = true' - # IDEs tend to have issues with 'global = true', as they work on a per-file basis - # this allows us to use the same .luacheckrc for both travis and IDEs - - luacheck scen_edit triggers libs_sb/utils libs_sb/savetable.lua --enable 1 \ No newline at end of file diff --git a/dist_cfg/config.json b/dist_cfg/config.json index cf6f5334..32f7e2ab 100644 --- a/dist_cfg/config.json +++ b/dist_cfg/config.json @@ -181,4 +181,5 @@ } ] + } diff --git a/scen_edit/view/map/water_editor.lua b/scen_edit/view/map/water_editor.lua index a392457e..b68129d8 100644 --- a/scen_edit/view/map/water_editor.lua +++ b/scen_edit/view/map/water_editor.lua @@ -78,7 +78,7 @@ function WaterEditor:init() }), ColorField({ name = "diffuseColor", - title = "Diffuse Color:", + title = "Diffuse Color:", tooltip = "The color of the diffuse lighting of the water", width = 140, format = 'rgb',