Skip to content

Commit dbc38ac

Browse files
mmgaw113avr757flossyfolsomSamCartledge
authored
Merge Main into Release (#195)
* Update readme.md * Update readme.md * Bug Fix: Add Script to enable camera & add to scenes (#191) Add Script to enable camera & add to scenes * Bring consistency to sample titles (#192) * Bring consistency to sample titles * more consistency * Apply suggestions from code review Co-authored-by: Rebekah Folsom <rfolsom@esri.com> * Update sample_project/Assets/SampleViewer/Samples/MaterialByAttribute/readme.md Co-authored-by: Rebekah Folsom <rfolsom@esri.com> --------- Co-authored-by: Rebekah Folsom <rfolsom@esri.com> * Update to 2022.3.62f2 (#194) * Update to .62f2 * remove plugin path * re-add HDRP, whoops * Fix broken meta files, update HDRP * Move ifdefs around * fixes to URP, fix errors * Update README.md * internal: Add Git hooks to protect secrets (#193) * Replace old hooks with internal hooks * Fix line endings * Create README.md --------- Co-authored-by: and12279 <aren@esri.com> Co-authored-by: Rebekah Folsom <rfolsom@esri.com> Co-authored-by: Sam Cartledge <scartledge@esri.com>
1 parent c9f0b97 commit dbc38ac

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

52 files changed

+2422
-2137
lines changed

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@
1111
# use lf for files that are read in by scripts to deal with reading variables in different environments
1212
*.txt text eol=lf
1313
*.sh text eol=lf
14+
git_hooks/** text eol=lf
1415
.editorconfig text

.githooks/pre-commit

Lines changed: 0 additions & 11 deletions
This file was deleted.

.githooks/pre-commit.d/01-API_Key_Check

Lines changed: 0 additions & 44 deletions
This file was deleted.

.githooks/pythonScripts/check_api_key.py

Lines changed: 0 additions & 115 deletions
This file was deleted.

.githooks/readme.md

Lines changed: 0 additions & 7 deletions
This file was deleted.

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ This repository is made up of two separate Unity projects. If you would like to
1111
### Requirements for Sample Project
1212

1313
* Computer running Windows or macOS
14-
* The Unity project requires a minimum of Unity `2022.3.35f1`
14+
* The Unity project requires a minimum of Unity `2022.3.62f2`
1515
* ArcGISMaps SDK for Unity
1616

1717
### Requirements for XR Sample Project
1818

1919
* Computer running Windows (OpenXR is not supported on macOS)
20-
* The Unity project requires a minimum of Unity `2022.3.35f1`
20+
* The Unity project requires a minimum of Unity `2022.3.62f2`
2121
* ArcGISMaps SDK for Unity
2222
* A VR Headset and the necessary software to run through Desktop Mode
2323

@@ -84,7 +84,7 @@ Esri welcomes contributions from anyone and everyone. Please see our [guidelines
8484

8585
## Licensing
8686

87-
Copyright 2022 - 2024 Esri.
87+
Copyright 2022 - 2025 Esri.
8888

8989
Licensed under the Apache License, Version 2.0 (the "License");
9090
you may not use this file except in compliance with the License.

git_hooks/README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
All dependencies for using git hooks are installed in `install_dependencies.sh`. Simply run `./git_hooks/git-hooks --install` to install

0 commit comments

Comments
 (0)