Skip to content

Commit

Permalink
Merge pull request #34 from dbierek/tony-navtool-updates
Browse files Browse the repository at this point in the history
NavMesh tools/libraries enhancements
  • Loading branch information
OrfeasZ authored May 28, 2024
2 parents 220c10b + 9ca33bb commit 7b91b02
Show file tree
Hide file tree
Showing 15 changed files with 51,358 additions and 682 deletions.
25 changes: 25 additions & 0 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,17 @@ jobs:
Copy-Item ../Libraries/ResourceLib/ResourceLib.cs -Destination _resourcelib/
Copy-Item ../LICENSE -Destination _resourcelib/
- name: Copy NavTool artifacts
run: |
cd _build
mkdir _navtool
Copy-Item NavTool.exe -Destination _navtool/
Copy-Item NavTool.pdb -Destination _navtool/
Copy-Item NavWeakness.dll -Destination _navtool/
Copy-Item NavWeakness.lib -Destination _navtool/
Copy-Item NavWeakness.pdb -Destination _navtool/
Copy-Item ../LICENSE -Destination _navtool/
- name: Archive ResourceTool
uses: actions/upload-artifact@v4
with:
Expand All @@ -93,6 +104,20 @@ jobs:
path: |
_build/_resourcelib/*
- name: Archive NavWeakness
uses: actions/upload-artifact@v2
with:
name: NavWeakness-win-x64
path: |
_build/_navweakness/*
- name: Archive NavTool
uses: actions/upload-artifact@v2
with:
name: NavTool-win-x64
path: |
_build/_navtool/*
build_linux:
name: Build (Linux)
runs-on: [ ubuntu-22.04 ]
Expand Down
7 changes: 5 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -31,9 +31,11 @@ bld/
[Oo]bj/
[Ll]og/
[Ll]ogs/
_build/

# Visual Studio 2015/2017 cache/options directory
.vs/
.vscode/
# Uncomment if you have tasks that create the project's static files in wwwroot
#wwwroot/

Expand Down Expand Up @@ -359,8 +361,9 @@ MigrationBackup/
.ionide/

# Fody - auto-generated XML schema
FodyWeavers.xsd
/out
FodyWeavers.xsd
/out
/Tools/NavViewer/NavMeshes.js
/Tools/NavViewer/Faces.js
/Tools/NavViewer/Surfaces.js
_build/
6 changes: 6 additions & 0 deletions Libraries/NavWeakness/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,15 @@

set(NAVWEAKNESS_HEADERS
Include/NavWeakness.h
Include/Vec3.h
Include/NavPower.h
)

set(NAVWEAKNESS_SOURCES
Src/External/simdjson.cpp
Src/External/simdjson.h
Src/External/simdjson_helpers.h
Src/NavPower.cpp
Src/NavWeakness.cpp
)

Expand Down
Loading

0 comments on commit 7b91b02

Please sign in to comment.