Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
sescalada committed Oct 23, 2024
2 parents 5a9bb23 + 1f8e8ae commit 804995d
Show file tree
Hide file tree
Showing 396 changed files with 22,346 additions and 53,164 deletions.
9 changes: 0 additions & 9 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,6 @@ on:
required: false
type: string
default: submodules/MRTK/Source/Evergine.MRTK/Evergine.MRTK.csproj
windowsSdkVersion:
description: "Windows SDK version to be installed. Only required when compiling MRTK."
required: false
type: number
default: 18362
buildConfiguration:
description: "Build configuration, usually 'Release'."
required: false
Expand Down Expand Up @@ -91,10 +86,6 @@ jobs:
with:
distribution: 'microsoft'
java-version: '11'
- name: Install Windows SDK
uses: GuillaumeFalourd/[email protected]
with:
sdk-version: ${{ inputs.windowsSdkVersion }}
- name: Build MRTK
if: ${{ !inputs.isPackagingBuild }}
shell: pwsh
Expand Down
8 changes: 4 additions & 4 deletions Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@
<!-- Nuget metadata -->
<PropertyGroup>
<Version>2023.0.0.0-preview</Version>
<Copyright>Copyright (c) Evergine</Copyright>
<Copyright>Copyright (c) Evergine 2024</Copyright>
<Authors>Evergine Team</Authors>
<Company>Plain Concepts</Company>
<Product>XRV</Product>
<PackageProjectUrl>https://evergine.com/</PackageProjectUrl>
<RepositoryUrl>https://github.com/EvergineTeam/</RepositoryUrl>
<PackageIcon>icon.png</PackageIcon>
<PackageTags>Evergine;C#;3D;AR;VR;MixedReality;HoloLens</PackageTags>
<PackageTags>Evergine;C#;3D;AR;VR</PackageTags>
<PackageLicenseFile>LICENSE.txt</PackageLicenseFile>
<!--
This one indicates that required projects should reference MRTK NuGet package.
Expand All @@ -29,7 +29,7 @@
<ProjectReference Include="$(MSBuildThisFileDirectory)submodules\MRTK\Source\Evergine.MRTK\Evergine.MRTK.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(UseMRTKNuget)'=='true' And '$(ReferenceMRTK)'=='true'">
<PackageReference Include="Evergine.MRTK" Version="2024.6.28.1" />
<PackageReference Include="Evergine.MRTK" Version="2024.10.23.1" />
</ItemGroup>

<!-- Add-ons packaging -->
Expand All @@ -38,7 +38,7 @@
<IsAddOnProject Condition="'$(IsAddOnProject)'==''">false</IsAddOnProject>
</PropertyGroup>
<ItemGroup Condition="'$(IsAddOnProject)'=='true'">
<PackageReference Include="Evergine.Packages.Targets" Version="2024.6.28.10" />
<PackageReference Include="Evergine.Packages.Targets" Version="2024.10.24.7" />
</ItemGroup>

<!-- Stylecop -->
Expand Down
21 changes: 21 additions & 0 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2024 Evergine Team

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,7 @@

## Prerequisites

- Follow the installation instructions at https://learn.microsoft.com/en-us/windows/mixed-reality/develop/install-the-tools
- Install the matching Windows 10 SDK: look for the tag `<TargetPlatformVersion>[...]</TargetPlatformVersion>` at src/core/Evergine.Xrv.Core/Evergine.Xrv.Core.csproj, close to UWP constant definition
- You may not find such in Visual Studio Installer, but Microsoft's website
- .NET 8

## How to update to newer Engine version

Expand Down
9 changes: 0 additions & 9 deletions samples/Content/PrefabScenes.wedir

This file was deleted.

179 changes: 0 additions & 179 deletions samples/Content/PrefabScenes/WindowTitleView.wescene

This file was deleted.

15 changes: 0 additions & 15 deletions samples/Content/PrefabScenes/WindowTitleView.wescene.wesc

This file was deleted.

4 changes: 2 additions & 2 deletions samples/Content/Scenes/Empty.wescene
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ Items:
Id: 07d3e21d-cd4b-412f-88a6-1331d8afa583
IsEnabled: true
MaxPitch: 1.49225616
MouseSensibility: 0.0299999993
MouseSensitivity: 0.0299999993
MoveSpeed: 1.0
RotationSpeed: 5.0
TouchMoveAndOrientationRatio: 0.5
TouchSensibility: 1.0
TouchSensitivity: 1.0
UpdateOrder: 0.5
- !Evergine.Framework.Graphics.Camera3D,Evergine.Framework
Id: 5b10653e-93d2-48e7-884f-a07b2ac173ee
Expand Down
4 changes: 2 additions & 2 deletions samples/Content/Scenes/HandMenu.wescene
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ Items:
Id: bbb4a9ff-1718-41b3-9105-39e72f0ab85d
IsEnabled: true
MaxPitch: 1.49225652
MouseSensibility: 0.0299999993
MouseSensitivity: 0.0299999993
MoveSpeed: 1.0
RotationSpeed: 5.0
TouchMoveAndOrientationRatio: 0.5
TouchSensibility: 1.0
TouchSensitivity: 1.0
UpdateOrder: 0.5
- !Evergine.Framework.Graphics.Camera3D,Evergine.Framework
Id: dcbee718-a1f2-48bb-b25f-4aa1c512209b
Expand Down
4 changes: 2 additions & 2 deletions samples/Content/Scenes/StorageScene.wescene
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ Items:
Id: 6f07447b-50c3-400c-b163-073b334a6efa
IsEnabled: true
MaxPitch: 1.49225652
MouseSensibility: 0.0299999993
MouseSensitivity: 0.0299999993
MoveSpeed: 5.0
RotationSpeed: 5.0
TouchMoveAndOrientationRatio: 0.5
TouchSensibility: 1.0
TouchSensitivity: 1.0
UpdateOrder: 0.5
- !Evergine.Framework.Graphics.Camera3D,Evergine.Framework
Id: 69fa33fa-df8e-4117-b756-276eb1dbac9e
Expand Down
4 changes: 2 additions & 2 deletions samples/Content/Scenes/Tabs.wescene
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ Items:
Id: 9dd3162e-35f6-477a-bcdb-2d59d0e8ca49
IsEnabled: true
MaxPitch: 1.49225652
MouseSensibility: 0.0299999993
MouseSensitivity: 0.0299999993
MoveSpeed: 1.0
RotationSpeed: 5.0
TouchMoveAndOrientationRatio: 0.5
TouchSensibility: 1.0
TouchSensitivity: 1.0
UpdateOrder: 0.5
- !Evergine.Framework.Graphics.Camera3D,Evergine.Framework
Id: f4421b66-dcd9-4635-a5c8-4a36ed2669d9
Expand Down
4 changes: 2 additions & 2 deletions samples/Content/Scenes/Windows.wescene
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,11 @@ Items:
Id: 6a5212d7-c0ab-4a9a-92d8-972add41d43d
IsEnabled: true
MaxPitch: 1.49225652
MouseSensibility: 0.0299999993
MouseSensitivity: 0.0299999993
MoveSpeed: 1.0
RotationSpeed: 5.0
TouchMoveAndOrientationRatio: 0.5
TouchSensibility: 1.0
TouchSensitivity: 1.0
UpdateOrder: 0.5
- !Evergine.Framework.Graphics.Camera3D,Evergine.Framework
Id: 76dc7e7b-b74e-482c-9a76-963c748eeb93
Expand Down
Loading

0 comments on commit 804995d

Please sign in to comment.