Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Generowanie mapy+ #274

Draft
wants to merge 15 commits into
base: develop
Choose a base branch
from
Draft

Generowanie mapy+ #274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
326366d
Create draft PR for #273
Mixu285 Dec 20, 2021
fe199f7
updated to current develop version
CyberSer0 Feb 14, 2022
0fd15b2
Wersja poglądowa
Mixu285 Feb 25, 2022
e45cb5a
Ściany (z bugami)
Mixu285 Mar 3, 2022
51920cf
Naprawa korytarzy (prawie)
Mixu285 Mar 6, 2022
6e5c2e9
Funkcja stawiania drzwi
Mixu285 Mar 11, 2022
04ed74b
Globalna funkcja zmieniająca rogi
Mixu285 Mar 11, 2022
232309f
Działająca funkcja zmiany rogów
Mixu285 Mar 11, 2022
17ce08b
Korytarze co najmniej 2 kratki
Mixu285 Mar 13, 2022
93ccad9
końcowe poprawki
marycin Mar 14, 2022
23c5cbf
Naprawa generacji
Mixu285 Mar 17, 2022
581a8e9
Drobne poprawki, zatrzymanie muzyki z menu
Mixu285 Mar 17, 2022
1923fc8
Funkcja wstawiania drzwi
Mixu285 Mar 18, 2022
f32f4d7
Dodatkowe komentarze i poprawa wypełniania tła
Mixu285 Mar 19, 2022
ed1737c
Okluzja, spawn przeciwników
Mixu285 Mar 27, 2022
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
6 changes: 3 additions & 3 deletions Assets/Enemies/BigDevil.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/bigdevil.png-e6fd35bed5757ab99a95b41c6811c7e6.stex"
path="res://.import/BigDevil.png-5c38b6de19d4dbe1a4e70d44f72414a0.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/Enemies/bigdevil.png"
dest_files=[ "res://.import/bigdevil.png-e6fd35bed5757ab99a95b41c6811c7e6.stex" ]
source_file="res://Assets/Enemies/BigDevil.png"
dest_files=[ "res://.import/BigDevil.png-5c38b6de19d4dbe1a4e70d44f72414a0.stex" ]

[params]

Expand Down
6 changes: 3 additions & 3 deletions Assets/Enemies/EarthBall.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/earthball.png-8140742b3cbe6ae477dd1e4fd5a44f11.stex"
path="res://.import/EarthBall.png-4b32539cfbaaa727f975628d48832c0a.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/Enemies/earthball.png"
dest_files=[ "res://.import/earthball.png-8140742b3cbe6ae477dd1e4fd5a44f11.stex" ]
source_file="res://Assets/Enemies/EarthBall.png"
dest_files=[ "res://.import/EarthBall.png-4b32539cfbaaa727f975628d48832c0a.stex" ]

[params]

Expand Down
8 changes: 4 additions & 4 deletions Assets/Enemies/Goblin_Shaman.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/goblin_shaman.png-5c14dce1efa92690a6b1c744759e2023.stex"
path="res://.import/Goblin_Shaman.png-9fe32c38b23309b8b057bf7a2df62066.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/Enemies/goblin_shaman.png"
dest_files=[ "res://.import/goblin_shaman.png-5c14dce1efa92690a6b1c744759e2023.stex" ]
source_file="res://Assets/Enemies/Goblin_Shaman.png"
dest_files=[ "res://.import/Goblin_Shaman.png-9fe32c38b23309b8b057bf7a2df62066.stex" ]

[params]

Expand All @@ -31,5 +31,5 @@ process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
detect_3d=false
svg/scale=1.0
6 changes: 3 additions & 3 deletions Assets/Enemies/Lil_Devil_body.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/lil_devil_body.png-016f94c8a7f9117d63e88df168681efa.stex"
path="res://.import/Lil_Devil_body.png-720186befdd63fd37c3c339b03a5bac4.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/Enemies/lil_devil_body.png"
dest_files=[ "res://.import/lil_devil_body.png-016f94c8a7f9117d63e88df168681efa.stex" ]
source_file="res://Assets/Enemies/Lil_Devil_body.png"
dest_files=[ "res://.import/Lil_Devil_body.png-720186befdd63fd37c3c339b03a5bac4.stex" ]

[params]

Expand Down
6 changes: 3 additions & 3 deletions Assets/Enemies/Lil_Devil_head.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/lil_devil_head.png-f76cf4eaa6c79def20bc6ba83b4a06e1.stex"
path="res://.import/Lil_Devil_head.png-a7d2d563b0f39127dff0d1b6f1c010bd.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/Enemies/lil_devil_head.png"
dest_files=[ "res://.import/lil_devil_head.png-f76cf4eaa6c79def20bc6ba83b4a06e1.stex" ]
source_file="res://Assets/Enemies/Lil_Devil_head.png"
dest_files=[ "res://.import/Lil_Devil_head.png-a7d2d563b0f39127dff0d1b6f1c010bd.stex" ]

[params]

Expand Down
6 changes: 3 additions & 3 deletions Assets/Enemies/Little_Goblin.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/little_goblin.png-8f807615484797a5c88eef8651e8d963.stex"
path="res://.import/Little_Goblin.png-674693612eee1fd8474128384d0cebc5.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/Enemies/little_goblin.png"
dest_files=[ "res://.import/little_goblin.png-8f807615484797a5c88eef8651e8d963.stex" ]
source_file="res://Assets/Enemies/Little_Goblin.png"
dest_files=[ "res://.import/Little_Goblin.png-674693612eee1fd8474128384d0cebc5.stex" ]

[params]

Expand Down
6 changes: 3 additions & 3 deletions Assets/Enemies/Orc.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/orc.png-95a2ae7892aeabd1d371ed08d9cd4366.stex"
path="res://.import/Orc.png-d250c1361fae935d6bf2699681eb00cd.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/Enemies/orc.png"
dest_files=[ "res://.import/orc.png-95a2ae7892aeabd1d371ed08d9cd4366.stex" ]
source_file="res://Assets/Enemies/Orc.png"
dest_files=[ "res://.import/Orc.png-d250c1361fae935d6bf2699681eb00cd.stex" ]

[params]

Expand Down
6 changes: 3 additions & 3 deletions Assets/Enemies/Potato.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/potato.png-076ea84eac4856a22ffdbcbe5c5dc2c2.stex"
path="res://.import/Potato.png-ac6fb7ba58446d8278b51dc6725f6757.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/Enemies/potato.png"
dest_files=[ "res://.import/potato.png-076ea84eac4856a22ffdbcbe5c5dc2c2.stex" ]
source_file="res://Assets/Enemies/Potato.png"
dest_files=[ "res://.import/Potato.png-ac6fb7ba58446d8278b51dc6725f6757.stex" ]

[params]

Expand Down
6 changes: 3 additions & 3 deletions Assets/Enemies/Shadow.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/shadow.png-3cd7b019e0c319825532cb5ee1e4e9fe.stex"
path="res://.import/Shadow.png-d56849c6e07c92cbdf7b1f3e259df7e4.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/Enemies/shadow.png"
dest_files=[ "res://.import/shadow.png-3cd7b019e0c319825532cb5ee1e4e9fe.stex" ]
source_file="res://Assets/Enemies/Shadow.png"
dest_files=[ "res://.import/Shadow.png-d56849c6e07c92cbdf7b1f3e259df7e4.stex" ]

[params]

Expand Down
6 changes: 3 additions & 3 deletions Assets/Enemies/Slime.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/slime.png-3b311431684beafde68d2de815132ef4.stex"
path="res://.import/Slime.png-b000dd7a00740bc68a34a6d318d8cc82.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/Enemies/slime.png"
dest_files=[ "res://.import/slime.png-3b311431684beafde68d2de815132ef4.stex" ]
source_file="res://Assets/Enemies/Slime.png"
dest_files=[ "res://.import/Slime.png-b000dd7a00740bc68a34a6d318d8cc82.stex" ]

[params]

Expand Down
6 changes: 3 additions & 3 deletions Assets/Enemies/WindBall.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/windball.png-0ab715aeeb7343cca4d74cb1985748be.stex"
path="res://.import/WindBall.png-d2161abc63b97219ce1cdc903c27e310.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/Enemies/windball.png"
dest_files=[ "res://.import/windball.png-0ab715aeeb7343cca4d74cb1985748be.stex" ]
source_file="res://Assets/Enemies/WindBall.png"
dest_files=[ "res://.import/WindBall.png-d2161abc63b97219ce1cdc903c27e310.stex" ]

[params]

Expand Down
1 change: 1 addition & 0 deletions Assets/Enemies/cuck.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=false
Expand Down
1 change: 1 addition & 0 deletions Assets/Enemies/cuckbullet.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=false
Expand Down
1 change: 1 addition & 0 deletions Assets/Enemies/cuckbulletupdated.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=false
Expand Down
1 change: 1 addition & 0 deletions Assets/Enemies/cuckshooter.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=false
Expand Down
1 change: 1 addition & 0 deletions Assets/Enemies/cuckshooterupdated.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=false
Expand Down
1 change: 1 addition & 0 deletions Assets/Enemies/fireball_new.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
Expand Down
1 change: 1 addition & 0 deletions Assets/Enemies/fireball_old.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
Expand Down
1 change: 1 addition & 0 deletions Assets/Enemies/goblin_ball.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=true
Expand Down
1 change: 1 addition & 0 deletions Assets/Enemies/snot.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=false
Expand Down
6 changes: 3 additions & 3 deletions Assets/Loot/Weapons/BloodSword.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/bloodsword.png-adf6ee7c9bb1819b87b218cd6fb62f3a.stex"
path="res://.import/BloodSword.png-19f9794306d6fcc6be16b61cce3c671e.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/Loot/Weapons/bloodsword.png"
dest_files=[ "res://.import/bloodsword.png-adf6ee7c9bb1819b87b218cd6fb62f3a.stex" ]
source_file="res://Assets/Loot/Weapons/BloodSword.png"
dest_files=[ "res://.import/BloodSword.png-19f9794306d6fcc6be16b61cce3c671e.stex" ]

[params]

Expand Down
7 changes: 4 additions & 3 deletions Assets/Loot/Weapons/FMS.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/fms.png-382ec645bddfdf0bdf6880bae99f5f17.stex"
path="res://.import/FMS.png-483a82f7dc857b27c9dcb33f213b6e99.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/Loot/Weapons/fms.png"
dest_files=[ "res://.import/fms.png-382ec645bddfdf0bdf6880bae99f5f17.stex" ]
source_file="res://Assets/Loot/Weapons/FMS.png"
dest_files=[ "res://.import/FMS.png-483a82f7dc857b27c9dcb33f213b6e99.stex" ]

[params]

Expand All @@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=false
Expand Down
7 changes: 4 additions & 3 deletions Assets/Loot/Weapons/FMS0.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/fms0.png-c7152999e2ef906f219a6ae8750a22ed.stex"
path="res://.import/FMS0.png-fe0aa179072db4ebdcc0ac989f483d2c.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/Loot/Weapons/fms0.png"
dest_files=[ "res://.import/fms0.png-c7152999e2ef906f219a6ae8750a22ed.stex" ]
source_file="res://Assets/Loot/Weapons/FMS0.png"
dest_files=[ "res://.import/FMS0.png-fe0aa179072db4ebdcc0ac989f483d2c.stex" ]

[params]

Expand All @@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=false
Expand Down
7 changes: 4 additions & 3 deletions Assets/Loot/Weapons/FMS1.png.import
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

importer="texture"
type="StreamTexture"
path="res://.import/fms1.png-fc13cc537dc6fb475f1717dac1c7b281.stex"
path="res://.import/FMS1.png-a84a18730add9db172d599a062e88e21.stex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://Assets/Loot/Weapons/fms1.png"
dest_files=[ "res://.import/fms1.png-fc13cc537dc6fb475f1717dac1c7b281.stex" ]
source_file="res://Assets/Loot/Weapons/FMS1.png"
dest_files=[ "res://.import/FMS1.png-a84a18730add9db172d599a062e88e21.stex" ]

[params]

Expand All @@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=false
Expand Down
Loading