Skip to content
This repository has been archived by the owner on Nov 9, 2023. It is now read-only.

Commit

Permalink
Merge branch 'main' into MoreSlotCollections
Browse files Browse the repository at this point in the history
  • Loading branch information
Nytra authored Sep 15, 2023
2 parents 672d868 + 329945f commit 67fe639
Show file tree
Hide file tree
Showing 161 changed files with 2,349 additions and 153 deletions.
34 changes: 34 additions & 0 deletions .github/ISSUE_TEMPLATE/ComponentRequest.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
---
name: Component Request
about: Request a new component for NeosPlus
title: ''
labels: ['New Component', 'Enhancement']
assignees: ''

---

🔌 **Component Request**

**Describe the new component you'd like to request:**

[Please provide a clear and detailed description of the component you would like to see added to NeosPlus.]

**Use Case**

[Explain how this component would benefit users, what functionality it would add, or how it enhances the NeosVR experience.]

🚀 **Proposed Implementation**

[If you have any ideas on how this component could be implemented, please share them here. This could include technical details or design suggestions.]

💬 **Additional Context**

[Is there any additional context or information you'd like to add regarding this component request?]

📋 **Related Issues/PRs**

[Are there any existing issues or pull requests related to this component request?]

📎 **Attachments (if any)**

[Attach any relevant files, images, diagrams, or additional information here.]
38 changes: 38 additions & 0 deletions .github/ISSUE_TEMPLATE/Feature-Request.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
---
name: Feature Request
about: Suggest a new idea or feature
title: ''
labels: Enhancement
assignees: ''

---

💡 **Feature Request**

**Describe the new feature or idea:**

[Please provide a clear and detailed description of the feature you are suggesting.]

**Use Case**

[Explain how this feature would benefit users or improve the project. Provide specific scenarios or examples if possible.]

🚀 **Proposed Implementation**

[If you have any ideas on how this feature could be implemented, please share them here. This could include technical details or design suggestions.]

💬 **Additional Context**

[Is there any additional context or information you'd like to add regarding this feature request?]

📅 **Target Release (if applicable)**

[Specify if there's a specific release or timeframe you have in mind for this feature.]

📋 **Related Issues/PRs**

[Are there any existing issues or pull requests related to this feature request?]

📎 **Attachments (if any)**

[Attach any relevant files or additional information here.]
34 changes: 34 additions & 0 deletions .github/ISSUE_TEMPLATE/LogixNodeRequest.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
---
name: Logix Node Request
about: Request a new Logix Node for NeosPlus
title: ''
labels: ['Logix', 'New Node']
assignees: ''

---

📊 **Logix Node Request**

**Describe the new Logix Node you'd like to request:**

[Please provide a clear and detailed description of the Logix Node you would like to see added to NeosPlus.]

**Use Case**

[Explain how this Logix Node would benefit users, what problems it would solve, or what creative possibilities it would open up within NeosVR.]

🚀 **Proposed Implementation**

[If you have any ideas on how this Logix Node could be implemented, please share them here. This could include technical details or design suggestions.]

💬 **Additional Context**

[Is there any additional context or information you'd like to add regarding this Logix Node request?]

📋 **Related Issues/PRs**

[Are there any existing issues or pull requests related to this Logix Node request?]

📎 **Attachments (if any)**

[Attach any relevant files, diagrams, or additional information here.]
34 changes: 34 additions & 0 deletions .github/ISSUE_TEMPLATE/ShaderRequest.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
---
name: Shader Request
about: Request a new shader for NeosPlus
title: ''
labels: ['shader', 'Enhancement']
assignees: ''

---

🎨 **Shader Request**

**Describe the new shader you'd like to request:**

[Please provide a clear and detailed description of the shader you would like to see added to NeosPlus.]

**Use Case**

[Explain how this shader would enhance the visual experience, solve specific problems, or open up creative possibilities within NeosVR.]

🚀 **Proposed Implementation**

[If you have shader code or implementation ideas, please share them here. If you're supplying shader code, make sure it's available under the MIT license or an equivalent open-source license.]

```glsl
// Paste your shader code here (if available and MIT licensed).
```

💬 **Additional Context**

[Is there any additional context or information you'd like to add regarding this Logix Node request?]

📋 **Related Issues/PRs**

[Are there any existing issues or pull requests related to this Logix Node request?]
50 changes: 50 additions & 0 deletions .github/ISSUE_TEMPLATE/issue-ticket.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
---
name: Bug Report
about: Create a report to help us improve
title: ''
labels: Bug
assignees: ''

---

🔍 **Issue Description**

**Describe the bug in detail:**

[Please provide a clear and concise description of the bug you've encountered.]

**Expected Behavior**

[Describe what you expected to happen.]

**Actual Behavior**

[Describe what actually happened.]

**Steps to Reproduce**

[Provide step-by-step instructions to reproduce the bug. Be as detailed as possible.]

**Screenshots/Logs**

[If applicable, include screenshots or logs that can help us understand the bug better.]

🔗 **Related Issues/PRs**

[Are there any existing issues or pull requests related to this bug?]

💡 **Additional Context**

[Add any additional context about the bug here. Are there any workarounds or other details that might be helpful?]

🧐 **Extra Hardware (if applicable)**

[Specify any extra hardware or configuration details that are relevant to the bug.]

📎 **Attachments (if any)**

[Attach any relevant files or additional information here.]

🚀 **NeosPlus Version**

[Specify the version of NeosPlus where you encountered this bug.]
36 changes: 36 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
## Pull Request

### Description

[Provide a brief description of the purpose and goals of this pull request.]

### Related Issues

[Reference any related issues or feature requests that this PR addresses. Use the format `Fixes #123` or `Closes #456`.]

### Changes Made

[List the changes made in this pull request. Include specific details about code modifications, new features, bug fixes, or any other relevant changes.]

### Screenshots (if applicable)

[Include any relevant screenshots or images that help reviewers understand the changes visually.]

### Testing (if applicable)

[Describe the testing process you have followed. Include information about the test environment, steps to reproduce, and any test results or outcomes.]

### Checklist

Please review and check off the following items as applicable:

- [ ] The code follows the project's coding conventions and style guidelines.
- [ ] All existing tests pass successfully.
- [ ] I have added new tests to cover the changes (if applicable).
- [ ] Documentation has been updated or added to reflect the changes (if applicable).
- [ ] The code has been reviewed and approved by at least one other contributor.
- [ ] The branch is up-to-date with the latest changes from the main branch.

### Additional Information

[Include any additional context, notes, or information that may be relevant to the review and merging of this PR.]
13 changes: 6 additions & 7 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ on:
env:
SOLUTION_FILE_PATH: NEOSPlus.sln
BUILD_CONFIGURATION: Release

jobs:
build:

runs-on: windows-latest

steps:
Expand All @@ -21,11 +21,12 @@ jobs:
- name: Restore Nuget
working-directory: ${{env.GITHUB_WORKSPACE}}
run: nuget restore ${{env.SOLUTION_FILE_PATH}}
- name: Download Neos
- name: Download and Extract Neos
shell: pwsh
run: |
New-Item -Type Directory NeosVR
cd NeosVR
$neosInstallPath = "C:\Neos\app"
New-Item -Type Directory -Path $neosInstallPath -Force
cd $neosInstallPath
$web = [System.Net.WebClient]::new()
$web.DownloadFile("https://www.7-zip.org/a/7zr.exe","$PWD\7zr.exe")
$cvstring = $web.DownloadString('https://cloudxstorage.blob.core.windows.net/install/Pro/Public')
Expand All @@ -34,6 +35,4 @@ jobs:
Remove-Item "$env:TEMP\neosupdate.7z"
- name: Build
working-directory: ${{env.GITHUB_WORKSPACE}}
# Add additional options to the MSBuild command line here (like platform or verbosity level).
# See https://docs.microsoft.com/visualstudio/msbuild/msbuild-command-line-reference
run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} ${{env.SOLUTION_FILE_PATH}}
run: msbuild /m /p:Configuration=${{env.BUILD_CONFIGURATION}} ${{env.SOLUTION_FILE_PATH}}
5 changes: 0 additions & 5 deletions NEOSPlus.sln
Original file line number Diff line number Diff line change
Expand Up @@ -10,23 +10,18 @@ EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
AutoPostX|Any CPU = AutoPostX|Any CPU
CopyToPlugin|Any CPU = CopyToPlugin|Any CPU
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{08A94620-ECB7-41FD-8C9C-C11F2EBFC776}.AutoPostX|Any CPU.ActiveCfg = AutoPostX|Any CPU
{08A94620-ECB7-41FD-8C9C-C11F2EBFC776}.AutoPostX|Any CPU.Build.0 = AutoPostX|Any CPU
{08A94620-ECB7-41FD-8C9C-C11F2EBFC776}.CopyToPlugin|Any CPU.ActiveCfg = Debug|Any CPU
{08A94620-ECB7-41FD-8C9C-C11F2EBFC776}.CopyToPlugin|Any CPU.Build.0 = Debug|Any CPU
{08A94620-ECB7-41FD-8C9C-C11F2EBFC776}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{08A94620-ECB7-41FD-8C9C-C11F2EBFC776}.Debug|Any CPU.Build.0 = Debug|Any CPU
{08A94620-ECB7-41FD-8C9C-C11F2EBFC776}.Release|Any CPU.ActiveCfg = Release|Any CPU
{08A94620-ECB7-41FD-8C9C-C11F2EBFC776}.Release|Any CPU.Build.0 = Release|Any CPU
{88053493-5CC5-41EA-B598-816373CF48FE}.AutoPostX|Any CPU.ActiveCfg = AutoPostX|Any CPU
{88053493-5CC5-41EA-B598-816373CF48FE}.AutoPostX|Any CPU.Build.0 = AutoPostX|Any CPU
{88053493-5CC5-41EA-B598-816373CF48FE}.CopyToPlugin|Any CPU.ActiveCfg = CopyToPlugin|Any CPU
{88053493-5CC5-41EA-B598-816373CF48FE}.CopyToPlugin|Any CPU.Build.0 = CopyToPlugin|Any CPU
{88053493-5CC5-41EA-B598-816373CF48FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{88053493-5CC5-41EA-B598-816373CF48FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{88053493-5CC5-41EA-B598-816373CF48FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down
2 changes: 1 addition & 1 deletion NEOSPlus/Components/Assets/DynamicMesh.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

namespace FrooxEngine
{
[Category("Assets/Procedural Meshes")]
[Category("NeosPlus/Assets/Procedural Meshes")]
public class DynamicMesh : ProceduralMesh, ICustomInspector
{
public readonly Sync<bool> Normals;
Expand Down
2 changes: 1 addition & 1 deletion NEOSPlus/Components/Assets/MengerSponge.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace FrooxEngine
{
[Category(new string[] { "Assets/Procedural Meshes" })]
[Category(new string[] { "NeosPlus/Assets/Procedural Meshes" })]
public class MengerSpongeMesh : ProceduralMesh
{
[Range(1, 4)] public readonly Sync<int> Subdivisions;
Expand Down
2 changes: 1 addition & 1 deletion NEOSPlus/Components/Assets/MobiusStripMesh.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace FrooxEngine
{
[Category(new string[] { "Assets/Procedural Meshes" })]
[Category(new string[] { "NeosPlus/Assets/Procedural Meshes" })]
public class MobiusStripMesh : ProceduralMesh
{
[Range(3, 50)] public readonly Sync<int> Sides;
Expand Down
2 changes: 1 addition & 1 deletion NEOSPlus/Components/Assets/SierpinskiPyramidMesh.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace FrooxEngine
{
[Category(new string[] {"Assets/Procedural Meshes"})]
[Category(new string[] {"NeosPlus/Assets/Procedural Meshes"})]
public class SierpinskiPyramidMesh : ProceduralMesh
{
[Range(1, 9)] public readonly Sync<int> Subdivisions;
Expand Down
2 changes: 1 addition & 1 deletion NEOSPlus/Components/Collections/ReferenceFieldList.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace FrooxEngine;

[Category("Data")]
[Category("NeosPlus/Data")]
public class ReferenceFieldList<T> : Component where T : class, IWorldElement
{
public readonly SyncRefList<T> Value;
Expand Down
2 changes: 1 addition & 1 deletion NEOSPlus/Components/Collections/ValueFieldList.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace FrooxEngine;

[Category("Data")]
[Category("NeosPlus/Data")]
[GenericTypes(GenericTypes.Group.NeosPrimitives)]
public class ValueFieldList<T> : Component
{
Expand Down
2 changes: 1 addition & 1 deletion NEOSPlus/Components/Network/ArtNetReceiver.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using BaseX;
using FrooxEngine;

[Category("Network")]
[Category("NeosPlus/Network")]
public class ArtNetReceiver : Component
{
public readonly Sync<Uri> URL;
Expand Down
2 changes: 1 addition & 1 deletion NEOSPlus/Components/Physics/Cloth/ClothCapsuleCollider.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace FrooxEngine
{
[Category(new string[] {"Physics/Cloth"})]
[Category(new string[] {"NeosPlus/Physics/Cloth"})]
public class ClothCapsuleCollider : ClothCollider
{
public readonly Sync<float> Height;
Expand Down
2 changes: 1 addition & 1 deletion NEOSPlus/Components/Physics/Cloth/ClothSimulation.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace FrooxEngine
{
[Category(new string[] {"Physics/Cloth"})]
[Category(new string[] {"NeosPlus/Physics/Cloth"})]
public class Cloth : MeshRenderer // Need to extend MeshRenderer to avoid Unity attaching its own
{
[HideInInspector] // Needed to sync the reset across all users
Expand Down
2 changes: 1 addition & 1 deletion NEOSPlus/Components/Physics/Cloth/ClothSphereCollider.cs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace FrooxEngine
{
[Category(new string[] {"Physics/Cloth"})]
[Category(new string[] {"NeosPlus/Physics/Cloth"})]
public class ClothSphereCollider : ClothCollider
{
protected override void OnAttach()
Expand Down
Loading

0 comments on commit 67fe639

Please sign in to comment.