Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions .gitattributes
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ web/* linguist-vendored

# Explicitly declare text files you want to always be normalized and converted
# to native line endings on checkout.
*.{txt,md,rs,py,js,jsx,ts,tsx,css,scss,html,xml,json,yaml,yml,toml} text
*.{txt,md,rs,lua,py,js,jsx,ts,tsx,css,scss,html,xml,json,yaml,yml,toml} text

# Declare files that will always have LF line endings on checkout.
*.sh text eol=lf
Expand All @@ -17,11 +17,14 @@ web/* linguist-vendored
# Denote all files that are truly binary and should not be modified.
*.{png,jpg,jpeg,gif,ico,webp,woff,woff2,ttf,otf,eot,mp3,mp4,wav,webm,ogg} binary

# Treat all files in the assets directory as binary
# Treat all files in the assets directory as binary (except text files)
assets/** binary
old_assets/** binary

*.ftl diff
*.txt -binary
*.lua -binary
*.yml -binary
*.yaml -binary
*.ftl -binary

# If you have other directories with mostly binary files, add them like this:
# other_binary_directory/** binary
36 changes: 18 additions & 18 deletions assets/map/levels/level_1.map.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1022,22 +1022,22 @@ layers:
- pos:
- 9
- 9
idx: 23
idx: 24
collision: Empty
- pos:
- 10
- 9
idx: 24
idx: 25
collision: Empty
- pos:
- 16
- 9
idx: 24
idx: 25
collision: Empty
- pos:
- 17
- 9
idx: 25
idx: 26
collision: Empty
elements:
- pos:
Expand Down Expand Up @@ -1125,12 +1125,12 @@ layers:
- pos:
- 9
- 7
idx: 20
idx: 9
collision: Empty
- pos:
- 17
- 7
idx: 20
idx: 9
collision: Empty
elements: []
- id: platforms
Expand All @@ -1139,62 +1139,62 @@ layers:
- pos:
- 11
- 4
idx: 41
idx: 52
collision: JumpThrough
- pos:
- 12
- 4
idx: 42
idx: 53
collision: JumpThrough
- pos:
- 13
- 4
idx: 42
idx: 53
collision: JumpThrough
- pos:
- 14
- 4
idx: 42
idx: 53
collision: JumpThrough
- pos:
- 15
- 4
idx: 43
idx: 54
collision: JumpThrough
- pos:
- 10
- 16
idx: 42
idx: 53
collision: JumpThrough
- pos:
- 11
- 16
idx: 42
idx: 53
collision: JumpThrough
- pos:
- 12
- 16
idx: 42
idx: 53
collision: JumpThrough
- pos:
- 13
- 16
idx: 42
idx: 53
collision: JumpThrough
- pos:
- 14
- 16
idx: 42
idx: 53
collision: JumpThrough
- pos:
- 15
- 16
idx: 42
idx: 53
collision: JumpThrough
- pos:
- 16
- 16
idx: 42
idx: 53
collision: JumpThrough
elements: []
- id: items
Expand Down
Loading