Merge branch 'main' into develop
This commit is contained in:
@@ -64,7 +64,7 @@ jobs:
|
||||
- run: markdown-to-html --title 'Spearhead' --dark-mode auto --keywords "dcs,spearhead,tdcs,mission,campaign,tactical dcs,tactical" --no-dark-mode --markdown-style-theme dark --source ./spearhead/_docs/$sourcefileB.md --output ./$repo/Spearhead/$sourcefileB.html
|
||||
|
||||
- run: python3 ./spearhead/SpearheadCompile.py "./spearhead" "./$repo/Spearhead/spearhead.lua"
|
||||
if: github.ref == 'refs/heads/master'
|
||||
if: github.ref == 'refs/heads/main'
|
||||
|
||||
- run: mkdir -p ./$repo/Spearhead/beta
|
||||
if: github.ref == 'refs/heads/develop'
|
||||
|
||||
@@ -1 +1,12 @@
|
||||
# Spearhead
|
||||
# Spearhead
|
||||
|
||||
|
||||
## Contributing.
|
||||
|
||||
- Make a fitting branch.
|
||||
- Change reference in the file ./dev_classes.lua
|
||||
- Add a "do script" trigger in the mission.
|
||||
The script should be `assert(loadfile('<path to ./dev folder>' .. "dev_classes.lua"))()`
|
||||
This will load all the class files and run the config and main.lua.
|
||||
|
||||
This way you can just hit "fly again" after making mission changes which speeds up development quite a lot.
|
||||
|
||||
@@ -355,7 +355,7 @@ do -- DB
|
||||
functionString = functionString .. " { x=" .. vecpoint.x .. ", y=0,z=" .. vecpoint.z ..
|
||||
"},"
|
||||
end
|
||||
functionString = functionString .. "{0,1,0,1}, {0,1,0,1}, 1)"
|
||||
functionString = functionString .. "{0,1,0,1}, {0,0,0,1}, 1)"
|
||||
|
||||
env.info(functionString)
|
||||
---@diagnostic disable-next-line: deprecated
|
||||
@@ -367,7 +367,7 @@ do -- DB
|
||||
end
|
||||
else
|
||||
trigger.action.circleToAll(-1, baseId, { x = point.x, y = 0, z = point.z }, 2048,
|
||||
{ 1, 0, 0, 1 }, { 1, 0, 0, 0 }, 1, true)
|
||||
{ 1, 0, 0, 1 }, { 0, 0, 0, 0 }, 1, true)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user