Skip to content

Commit e71e562

Browse files
Merge pull request #1252 from EOS-Contrib/release-6.0.2
Release 6.0.2
2 parents e1c8537 + 383cbf9 commit e71e562

426 files changed

Lines changed: 455 additions & 400 deletions

File tree

Some content is hidden

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

.gitattributes

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,25 +2,51 @@
22
# C# diff driver for *.cs files, to consider them text files, and to enforce
33
# a line feed as the end of line character.
44
*.cs diff=csharp text eol=lf
5+
56
# Files to consider text, and enforce the eol being LF
7+
*.c text eol=lf
8+
*.cpp text eol=lf
9+
*.h text eol=lf
610
*.md text eol=lf
711
*.json text eol=lf
812
*.meta text eol=lf
913
*.yaml text eol=lf
14+
1015
# Other files that should be considered text files
1116
*.cginc text
1217
*.shader text
18+
*.plist text
19+
etc\PlatformSpecificAssets\EOS\Mac\eac_launcher.app\Contents\_CodeSignature\CodeResources text
20+
1321
# Filetypes that should be considered binary files (regardless of if they are
1422
# stored using git-lfs):
15-
*.dll binary
1623
*.aar binary
17-
*.so binary
24+
*.dll binary
1825
*.dylib binary
1926
*.exe binary
20-
*.png binary
21-
*.jpg binary
2227
*.gif binary
28+
*.jpg binary
29+
*.png binary
30+
*.so binary
2331
*.ttf binary
32+
33+
# File types to store via git-lfs
34+
*.aar filter=lfs diff=lfs merge=lfs -text
35+
*.dll filter=lfs diff=lfs merge=lfs -text
36+
*.dylib filter=lfs diff=lfs merge=lfs -text
37+
*.exe filter=lfs diff=lfs merge=lfs -text
38+
*.gif filter=lfs diff=lfs merge=lfs -text
39+
*.jpg filter=lfs diff=lfs merge=lfs -text
40+
*.png filter=lfs diff=lfs merge=lfs -text
41+
*.so filter=lfs diff=lfs merge=lfs -text
42+
*.ttf filter=lfs diff=lfs merge=lfs -text
43+
44+
# Files without extensions to add to git-lfs
45+
Assets/Plugins/iOS/EOSSDK.framework/EOSSDK filter=lfs diff=lfs merge=lfs -text
46+
etc/PlatformSpecificAssets/EOS/Mac/eac_launcher.app/Contents/MacOS/start_protected_game filter=lfs diff=lfs merge=lfs -text
47+
tools/bin/EAC/Linux/anticheat_integritytool filter=lfs diff=lfs merge=lfs -text
48+
tools/bin/EAC/Mac/anticheat_integritytool filter=lfs diff=lfs merge=lfs -text
49+
2450
# These files should be merged using the UnityYamlMerge diff driver:
2551
*.mat merge=unityyamlmerge eol=lf
2652
*.anim merge=unityyamlmerge eol=lf

.github/LICENSE.md

Lines changed: 1 addition & 1 deletion

.github/README.md

Lines changed: 1 addition & 1 deletion

Assets/EOS/ControllerB.png

-8.62 KB

Assets/EOS/ControllerRB.png

-4.26 KB

Assets/EOS/DarkGreyBG.png

6 Bytes

Assets/EOS/DeleteIcon.png

-5.08 KB

Assets/EOS/LightGreyBG.png

-1.25 KB

Assets/EOS/TitleText.png

-21.7 KB

Assets/EOS/expand-icon.png

-4.78 KB

0 commit comments

Comments
 (0)