Merge succefully

Browse Source

...

This commit is contained in:

Xeon0X

2024-06-16 02:18:16 +02:00

parent ee1d41d33e

commit 18b6868c99

18 changed files with 76 additions and 39 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

BIN

world_maker/data/building.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 813 B After Width:  |  Height:  |  Size: 647 B

BIN

world_maker/data/city_map.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 6.1 KiB After Width:  |  Height:  |  Size: 3.2 KiB

BIN

world_maker/data/district.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 9.7 KiB After Width:  |  Height:  |  Size: 6.0 KiB

BIN

world_maker/data/heightmap.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 46 KiB After Width:  |  Height:  |  Size: 30 KiB

BIN

world_maker/data/highwaymap.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.0 KiB After Width:  |  Height:  |  Size: 707 B

BIN

world_maker/data/mountain_map.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.5 KiB After Width:  |  Height:  |  Size: 744 B

BIN

world_maker/data/roadmap.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.9 KiB After Width:  |  Height:  |  Size: 1.6 KiB

BIN

world_maker/data/skeleton_highway.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 49 KiB After Width:  |  Height:  |  Size: 30 KiB

BIN

world_maker/data/skeleton_highway_area.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 2.4 KiB After Width:  |  Height:  |  Size: 750 B

BIN

world_maker/data/skeleton_mountain.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 47 KiB After Width:  |  Height:  |  Size: 30 KiB

BIN

world_maker/data/skeleton_mountain_area.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.0 KiB After Width:  |  Height:  |  Size: 704 B

BIN

world_maker/data/smooth_sobel_watermap.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 7.0 KiB After Width:  |  Height:  |  Size: 4.1 KiB

BIN

world_maker/data/sobelmap.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 57 KiB After Width:  |  Height:  |  Size: 35 KiB

BIN

world_maker/data/treemap.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 11 KiB After Width:  |  Height:  |  Size: 10 KiB

BIN

world_maker/data/watermap.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 1.7 KiB After Width:  |  Height:  |  Size: 1.0 KiB