Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/developing'
Browse files Browse the repository at this point in the history
  • Loading branch information
will258012 committed Aug 31, 2024
2 parents 18b94cc + aa8d031 commit 7fc0f2f
Show file tree
Hide file tree
Showing 71 changed files with 4,249 additions and 3,399 deletions.
4 changes: 2 additions & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
* text=auto eof=lf
* text=auto eof=crlf

*.cs text eol=lf diff=csharp
*.cs text eol=crlf diff=csharp
*.cshtml text diff=html
*.csx text diff=csharp
*.sln text eol=crlf merge=union
Expand Down
6 changes: 3 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "CSkyL"]
path = CSkyL
url = https://github.com/will258012/CSkyL
[submodule "AlgernonCommons"]
path = AlgernonCommons
url = https://github.com/algernon-A/AlgernonCommons
Binary file added .gitmodules.swp
Binary file not shown.
1 change: 1 addition & 0 deletions AlgernonCommons
Submodule AlgernonCommons added at ed63ee
1 change: 0 additions & 1 deletion CSkyL
Submodule CSkyL deleted from 9ebca4
365 changes: 146 additions & 219 deletions FPSCamera/.editorconfig

Large diffs are not rendered by default.

81 changes: 0 additions & 81 deletions FPSCamera/Cam/Base.cs

This file was deleted.

239 changes: 0 additions & 239 deletions FPSCamera/Cam/FollowCam.cs

This file was deleted.

57 changes: 0 additions & 57 deletions FPSCamera/Cam/FreeCam.cs

This file was deleted.

Loading

0 comments on commit 7fc0f2f

Please sign in to comment.