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.

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

Assets, scene management improvements, console improvements #5

Merged
merged 4 commits into from
Sep 23, 2023
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
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -123,8 +123,8 @@ PenaltyBreakComment: 50
PenaltyBreakFirstLessLess: 120
PenaltyBreakOpenParenthesis: 10
PenaltyBreakString: 1000
PenaltyBreakTemplateDeclaration: 10
PenaltyExcessCharacter: 1000000
PenaltyBreakTemplateDeclaration: 1000
PenaltyExcessCharacter: 10
PenaltyReturnTypeOnItsOwnLine: 100
PenaltyIndentedWhitespace: 0
PointerAlignment: Left
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/cmake-multi-platform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
-G Ninja

- name: rebuild - clean (linux)
run: cmake --build ${{ github.workspace }}/.out --config Debug --target clean --parallel $(nproc)
run: cmake --build ${{ github.workspace }}/.out --config Debug --target clean --parallel 48

- name: rebuild - build (linux)
run: cmake --build ${{ github.workspace }}/.out --config Debug --target roguelite --parallel $(nproc)
run: cmake --build ${{ github.workspace }}/.out --config Debug --target roguelite --parallel 48
11 changes: 10 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,14 @@ The overall node hierarchy:
└── <a href="./project/assets/scenes/ui/dialogs/main_dialog.tscn" title="title">RichTextLabel (Reference from MainDialog)</a>
</pre> </div>

# Project Configuration
# Development Setup
See the [wiki](https://github.com/vorlac/godot-roguelite/wiki) for development/tooling setup instructions

# Licensing
#### Code
* All code in this project is licensed as [MIT](./LICENSE)
#### Assets
* All art assets (`project/assets/art/*`) are licensed as [Creative Commons Zero, CC0](./project/assets/art/LICENSE)
* All audio assets (`project/assets/audio/*`) are licensed as [Creative Commons Zero, CC0](./project/assets/audio/LICENSE)
* Art & audio assets credit: [Kenney](www.kenney.nl)
* Asset pack purchase link: [All-in-1 Asset Pack](https://kenney.itch.io/kenney-game-assets)
12 changes: 12 additions & 0 deletions project/assets/art/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
All art assets conained in this directory and all subdirectories is Creative Commons Zero (CC0) licensed (see below)

License (Creative Commons Zero, CC0)
http://creativecommons.org/publicdomain/zero/1.0/

These assets can all be purchased here: https://kenney.itch.io/kenney-game-assets

Credit for all art assets: Kenney
• Donate https://kenney.nl/donate
• Twitter https://social.kenney.nl/twitter
• Discord https://social.kenney.nl/discord
• Website www.kenney.nl
Empty file.
22 changes: 22 additions & 0 deletions project/assets/art/backgrounds/License.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@


Background Elements Redux (1.0)

Created/distributed by Kenney (www.kenney.nl)
Creation date: 26-02-2019

------------------------------

License: (Creative Commons Zero, CC0)
http://creativecommons.org/publicdomain/zero/1.0/

This content is free to use in personal, educational and commercial projects.
Support us by crediting Kenney or www.kenney.nl (this is not mandatory)

------------------------------

Donate: http://support.kenney.nl
Patreon: http://patreon.com/kenney/

Follow on Twitter for updates:
http://twitter.com/KenneyNL
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
71 changes: 71 additions & 0 deletions project/assets/art/backgrounds/spritesheet_default.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
<TextureAtlas imagePath="spritesheet_default.png">
<SubTexture name="bush1.png" x="419" y="950" width="120" height="60"/>
<SubTexture name="bush2.png" x="0" y="1051" width="53" height="44"/>
<SubTexture name="bush3.png" x="725" y="511" width="59" height="52"/>
<SubTexture name="bush4.png" x="871" y="1034" width="50" height="46"/>
<SubTexture name="bushAlt1.png" x="0" y="1004" width="141" height="47"/>
<SubTexture name="bushAlt2.png" x="405" y="156" width="45" height="55"/>
<SubTexture name="bushAlt3.png" x="961" y="978" width="43" height="53"/>
<SubTexture name="bushAlt4.png" x="921" y="1034" width="50" height="48"/>
<SubTexture name="bushOrange1.png" x="281" y="156" width="124" height="59"/>
<SubTexture name="bushOrange2.png" x="641" y="595" width="56" height="46"/>
<SubTexture name="bushOrange3.png" x="725" y="563" width="56" height="52"/>
<SubTexture name="bushOrange4.png" x="53" y="1051" width="50" height="35"/>
<SubTexture name="cactus1.png" x="624" y="866" width="96" height="139"/>
<SubTexture name="cactus2.png" x="720" y="866" width="71" height="135"/>
<SubTexture name="cactus3.png" x="893" y="901" width="68" height="133"/>
<SubTexture name="castleSmall.png" x="527" y="1010" width="108" height="85"/>
<SubTexture name="castleSmallAlt.png" x="419" y="1010" width="108" height="85"/>
<SubTexture name="castleWall.png" x="539" y="947" width="60" height="60"/>
<SubTexture name="castleWallAlt.png" x="141" y="1004" width="60" height="60"/>
<SubTexture name="cloud1.png" x="250" y="365" width="203" height="121"/>
<SubTexture name="cloud2.png" x="281" y="0" width="196" height="156"/>
<SubTexture name="cloud3.png" x="0" y="865" width="216" height="139"/>
<SubTexture name="cloud4.png" x="0" y="363" width="250" height="146"/>
<SubTexture name="cloud5.png" x="216" y="950" width="203" height="121"/>
<SubTexture name="cloud6.png" x="445" y="486" width="196" height="156"/>
<SubTexture name="cloud7.png" x="0" y="726" width="216" height="139"/>
<SubTexture name="cloud8.png" x="0" y="217" width="250" height="146"/>
<SubTexture name="fence.png" x="453" y="403" width="104" height="77"/>
<SubTexture name="fenceIron.png" x="477" y="0" width="120" height="121"/>
<SubTexture name="house1.png" x="216" y="726" width="208" height="224"/>
<SubTexture name="house2.png" x="0" y="0" width="281" height="217"/>
<SubTexture name="houseAlt1.png" x="624" y="642" width="168" height="224"/>
<SubTexture name="houseAlt2.png" x="0" y="509" width="241" height="217"/>
<SubTexture name="houseSmall1.png" x="521" y="642" width="76" height="50"/>
<SubTexture name="houseSmall2.png" x="719" y="1005" width="76" height="70"/>
<SubTexture name="houseSmallAlt1.png" x="445" y="642" width="76" height="50"/>
<SubTexture name="houseSmallAlt2.png" x="795" y="991" width="76" height="70"/>
<SubTexture name="moon.png" x="557" y="403" width="78" height="80"/>
<SubTexture name="moonFull.png" x="641" y="511" width="84" height="84"/>
<SubTexture name="pyramid.png" x="241" y="509" width="204" height="200"/>
<SubTexture name="pyramidMayan.png" x="250" y="217" width="204" height="148"/>
<SubTexture name="sun.png" x="635" y="1005" width="84" height="84"/>
<SubTexture name="tower.png" x="975" y="488" width="73" height="245"/>
<SubTexture name="towerAlt.png" x="975" y="733" width="73" height="245"/>
<SubTexture name="towerSmall.png" x="1004" y="978" width="38" height="90"/>
<SubTexture name="towerSmallAlt.png" x="1029" y="0" width="38" height="90"/>
<SubTexture name="tree.png" x="853" y="233" width="94" height="204"/>
<SubTexture name="treeDead.png" x="454" y="156" width="172" height="247"/>
<SubTexture name="treeFrozen.png" x="838" y="0" width="94" height="233"/>
<SubTexture name="treeLong.png" x="947" y="0" width="82" height="249"/>
<SubTexture name="treeLongFrozen.png" x="893" y="686" width="82" height="215"/>
<SubTexture name="treeLongOrange.png" x="893" y="437" width="82" height="249"/>
<SubTexture name="treeLongSnow.png" x="975" y="249" width="82" height="239"/>
<SubTexture name="treeOrange.png" x="792" y="732" width="101" height="259"/>
<SubTexture name="treePalm.png" x="424" y="709" width="200" height="238"/>
<SubTexture name="treePine.png" x="732" y="0" width="106" height="254"/>
<SubTexture name="treePineFrozen.png" x="626" y="0" width="106" height="257"/>
<SubTexture name="treePineOrange.png" x="641" y="257" width="106" height="254"/>
<SubTexture name="treePineSnow.png" x="747" y="254" width="106" height="247"/>
<SubTexture name="treeSmall_green1.png" x="103" y="1051" width="20" height="43"/>
<SubTexture name="treeSmall_green2.png" x="597" y="65" width="23" height="68"/>
<SubTexture name="treeSmall_green3.png" x="971" y="1031" width="30" height="49"/>
<SubTexture name="treeSmall_greenAlt1.png" x="599" y="947" width="20" height="43"/>
<SubTexture name="treeSmall_greenAlt2.png" x="597" y="0" width="23" height="65"/>
<SubTexture name="treeSmall_greenAlt3.png" x="1029" y="90" width="30" height="49"/>
<SubTexture name="treeSmall_orange1.png" x="697" y="595" width="20" height="43"/>
<SubTexture name="treeSmall_orange2.png" x="597" y="642" width="23" height="61"/>
<SubTexture name="treeSmall_orange3.png" x="853" y="437" width="30" height="49"/>
<SubTexture name="treeSnow.png" x="792" y="501" width="101" height="231"/>
</TextureAtlas>
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
71 changes: 71 additions & 0 deletions project/assets/art/backgrounds/spritesheet_retina.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
<TextureAtlas imagePath="spritesheet_retina.png">
<SubTexture name="bush1.png" x="500" y="834" width="240" height="120"/>
<SubTexture name="bush2.png" x="778" y="346" width="105" height="88"/>
<SubTexture name="bush3.png" x="730" y="1315" width="117" height="104"/>
<SubTexture name="bush4.png" x="1119" y="735" width="100" height="92"/>
<SubTexture name="bushAlt1.png" x="0" y="2008" width="282" height="95"/>
<SubTexture name="bushAlt2.png" x="1484" y="1026" width="90" height="110"/>
<SubTexture name="bushAlt3.png" x="1582" y="1304" width="87" height="105"/>
<SubTexture name="bushAlt4.png" x="1019" y="735" width="100" height="96"/>
<SubTexture name="bushOrange1.png" x="482" y="1315" width="248" height="118"/>
<SubTexture name="bushOrange2.png" x="908" y="735" width="111" height="92"/>
<SubTexture name="bushOrange3.png" x="778" y="242" width="113" height="104"/>
<SubTexture name="bushOrange4.png" x="740" y="934" width="99" height="70"/>
<SubTexture name="cactus1.png" x="1582" y="1026" width="192" height="278"/>
<SubTexture name="cactus2.png" x="1995" y="1814" width="141" height="270"/>
<SubTexture name="cactus3.png" x="1863" y="140" width="136" height="266"/>
<SubTexture name="castleSmall.png" x="1208" y="0" width="216" height="170"/>
<SubTexture name="castleSmallAlt.png" x="562" y="242" width="216" height="170"/>
<SubTexture name="castleWall.png" x="282" y="2008" width="120" height="120"/>
<SubTexture name="castleWallAlt.png" x="1686" y="906" width="120" height="120"/>
<SubTexture name="cloud1.png" x="562" y="0" width="406" height="242"/>
<SubTexture name="cloud2.png" x="847" y="1791" width="392" height="312"/>
<SubTexture name="cloud3.png" x="0" y="1730" width="432" height="278"/>
<SubTexture name="cloud4.png" x="0" y="434" width="500" height="292"/>
<SubTexture name="cloud5.png" x="432" y="1900" width="406" height="242"/>
<SubTexture name="cloud6.png" x="890" y="834" width="392" height="312"/>
<SubTexture name="cloud7.png" x="0" y="1452" width="432" height="278"/>
<SubTexture name="cloud8.png" x="0" y="726" width="500" height="292"/>
<SubTexture name="fence.png" x="890" y="1146" width="207" height="155"/>
<SubTexture name="fenceIron.png" x="968" y="0" width="240" height="242"/>
<SubTexture name="house1.png" x="432" y="1452" width="415" height="448"/>
<SubTexture name="house2.png" x="0" y="0" width="562" height="434"/>
<SubTexture name="houseAlt1.png" x="1247" y="1146" width="335" height="448"/>
<SubTexture name="houseAlt2.png" x="0" y="1018" width="482" height="434"/>
<SubTexture name="houseSmall1.png" x="1097" y="1146" width="150" height="100"/>
<SubTexture name="houseSmall2.png" x="1863" y="0" width="153" height="140"/>
<SubTexture name="houseSmallAlt1.png" x="740" y="834" width="150" height="100"/>
<SubTexture name="houseSmallAlt2.png" x="1839" y="1974" width="153" height="140"/>
<SubTexture name="moon.png" x="1839" y="1814" width="156" height="160"/>
<SubTexture name="moonFull.png" x="1671" y="1770" width="168" height="168"/>
<SubTexture name="pyramid.png" x="500" y="434" width="408" height="400"/>
<SubTexture name="pyramidMayan.png" x="482" y="1018" width="408" height="297"/>
<SubTexture name="sun.png" x="1671" y="1938" width="168" height="168"/>
<SubTexture name="tower.png" x="2022" y="630" width="146" height="490"/>
<SubTexture name="towerAlt.png" x="2012" y="140" width="146" height="490"/>
<SubTexture name="towerSmall.png" x="1582" y="1409" width="76" height="180"/>
<SubTexture name="towerSmallAlt.png" x="1774" y="1026" width="76" height="180"/>
<SubTexture name="tree.png" x="1675" y="0" width="188" height="408"/>
<SubTexture name="treeDead.png" x="908" y="242" width="343" height="493"/>
<SubTexture name="treeFrozen.png" x="1671" y="1304" width="188" height="466"/>
<SubTexture name="treeLong.png" x="1686" y="408" width="163" height="498"/>
<SubTexture name="treeLongFrozen.png" x="1849" y="408" width="163" height="430"/>
<SubTexture name="treeLongOrange.png" x="1859" y="1316" width="163" height="498"/>
<SubTexture name="treeLongSnow.png" x="1859" y="838" width="163" height="478"/>
<SubTexture name="treeOrange.png" x="1484" y="508" width="202" height="518"/>
<SubTexture name="treePalm.png" x="847" y="1315" width="400" height="476"/>
<SubTexture name="treePine.png" x="1247" y="1594" width="212" height="508"/>
<SubTexture name="treePineFrozen.png" x="1251" y="170" width="212" height="514"/>
<SubTexture name="treePineOrange.png" x="1463" y="0" width="212" height="508"/>
<SubTexture name="treePineSnow.png" x="1459" y="1594" width="212" height="494"/>
<SubTexture name="treeSmall_green1.png" x="2022" y="1508" width="40" height="86"/>
<SubTexture name="treeSmall_green2.png" x="2022" y="1250" width="46" height="136"/>
<SubTexture name="treeSmall_green3.png" x="2016" y="0" width="60" height="98"/>
<SubTexture name="treeSmall_greenAlt1.png" x="1806" y="906" width="40" height="86"/>
<SubTexture name="treeSmall_greenAlt2.png" x="2022" y="1120" width="46" height="130"/>
<SubTexture name="treeSmall_greenAlt3.png" x="1774" y="1206" width="60" height="98"/>
<SubTexture name="treeSmall_orange1.png" x="2022" y="1594" width="40" height="86"/>
<SubTexture name="treeSmall_orange2.png" x="2022" y="1386" width="46" height="122"/>
<SubTexture name="treeSmall_orange3.png" x="1219" y="735" width="60" height="98"/>
<SubTexture name="treeSnow.png" x="1282" y="684" width="202" height="462"/>
</TextureAtlas>
21 changes: 21 additions & 0 deletions project/assets/art/explosions/License.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@


Explosion Pack (1.0)

Created/distributed by Kenney (www.kenney.nl)

------------------------------

License: (Creative Commons Zero, CC0)
http://creativecommons.org/publicdomain/zero/1.0/

This content is free to use in personal, educational and commercial projects.
Support us by crediting Kenney or www.kenney.nl (this is not mandatory)

------------------------------

Donate: http://support.kenney.nl
Patreon: http://patreon.com/kenney/

Follow on Twitter for updates:
http://twitter.com/KenneyNL
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
34 changes: 34 additions & 0 deletions project/assets/art/explosions/ground/groundexplosion00.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://ba4gxliebx2ks"
path="res://.godot/imported/groundexplosion00.png-30fde53ffb4482c87edc0ff325f45fa3.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/art/explosions/ground/groundexplosion00.png"
dest_files=["res://.godot/imported/groundexplosion00.png-30fde53ffb4482c87edc0ff325f45fa3.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
34 changes: 34 additions & 0 deletions project/assets/art/explosions/ground/groundexplosion01.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://77yydpbr4oqs"
path="res://.godot/imported/groundexplosion01.png-967451ea1307096319e8ae7040819f64.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/art/explosions/ground/groundexplosion01.png"
dest_files=["res://.godot/imported/groundexplosion01.png-967451ea1307096319e8ae7040819f64.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
34 changes: 34 additions & 0 deletions project/assets/art/explosions/ground/groundexplosion02.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://c6xttpcrmspqk"
path="res://.godot/imported/groundexplosion02.png-4284907422f5f24daf160137659309fd.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/art/explosions/ground/groundexplosion02.png"
dest_files=["res://.godot/imported/groundexplosion02.png-4284907422f5f24daf160137659309fd.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
34 changes: 34 additions & 0 deletions project/assets/art/explosions/ground/groundexplosion03.png.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://b3jvjqomltuhe"
path="res://.godot/imported/groundexplosion03.png-d6c4ab1cd45c6ff6f09e0bc1d459b588.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/art/explosions/ground/groundexplosion03.png"
dest_files=["res://.godot/imported/groundexplosion03.png-d6c4ab1cd45c6ff6f09e0bc1d459b588.ctex"]

[params]

compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1
Loading