Skip to content

Commit adcdbaa

Browse files
authored
Merge pull request #431 from db0/flux
feat: Improved a lot of the art using Flux
2 parents 7f76e05 + 23cfb40 commit adcdbaa

File tree

746 files changed

+7538
-3946
lines changed

Some content is hidden

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

746 files changed

+7538
-3946
lines changed

.github/workflows/gut.yml

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,22 +19,25 @@ jobs:
1919
# Steps represent a sequence of tasks that will be executed as part of the job
2020
steps:
2121
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
22-
- uses: actions/checkout@v3
22+
- uses: actions/checkout@v5.2
2323
- name: Check out personal godot-tester repository
2424
uses: actions/checkout@v3
25-
with:
26-
repository: db0/godot-tester
27-
path: ./.github/actions/godot-tester
25+
# with:
26+
# repository: db0/godot-tester
27+
# path: ./.github/actions/godot-tester
2828
# Runs a single command using the runners shell
2929
- name: Godot Tester
30-
uses: ./.github/actions/godot-tester
30+
uses: croconut/godot-tester@v5
3131
with:
32-
version: 3.5
32+
version: 3.6
3333
# should be long enough for asset import files to get generated
34-
import-time: 300
34+
import-time: 5000
3535
assert-check: true
3636
max-fails: 0
3737
# How long the test should be run before it's timed out and fails
3838
test-timeout: 3600
3939
# Directory containing Gut tests
40-
direct-scene: tests/cli/tests.tscn
40+
direct-scene: tests/cli/tests.tscn
41+
# custom-godot-dl-url: "https://github.com/godotengine/godot/releases/download/3.6-stable/Godot_v3.6-stable_linux_headless.64.zip"
42+
# custom-godot-binary-path: "Godot_v3.6-stable_linux_headless.64"
43+
107 KB
Loading
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
[remap]
2+
3+
importer="texture"
4+
type="StreamTexture"
5+
path="res://.import/Abusive Relationship.webp-c2a8c10586defd652159749c7373c616.stex"
6+
metadata={
7+
"vram_texture": false
8+
}
9+
10+
[deps]
11+
12+
source_file="res://assets/archetypes/Abusive Relationship.webp"
13+
dest_files=[ "res://.import/Abusive Relationship.webp-c2a8c10586defd652159749c7373c616.stex" ]
14+
15+
[params]
16+
17+
compress/mode=1
18+
compress/lossy_quality=0.7
19+
compress/hdr_mode=0
20+
compress/bptc_ldr=0
21+
compress/normal_map=0
22+
flags/repeat=0
23+
flags/filter=true
24+
flags/mipmaps=false
25+
flags/anisotropic=false
26+
flags/srgb=2
27+
process/fix_alpha_border=true
28+
process/premult_alpha=false
29+
process/HDR_as_SRGB=false
30+
process/invert_color=false
31+
process/normal_map_invert_y=false
32+
stream=false
33+
size_limit=0
34+
detect_3d=true
35+
svg/scale=1.0

assets/archetypes/Exploited.webp

148 KB
Loading

assets/card_backs/random/CardBack_Db04.png.import renamed to assets/archetypes/Exploited.webp.import

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
importer="texture"
44
type="StreamTexture"
5-
path="res://.import/CardBack_Db04.png-e1497087b298ddee4db4e3721cd6623b.stex"
5+
path="res://.import/Exploited.webp-5608498de341370e129db007d4fab28c.stex"
66
metadata={
77
"vram_texture": false
88
}
99

1010
[deps]
1111

12-
source_file="res://assets/card_backs/random/CardBack_Db04.png"
13-
dest_files=[ "res://.import/CardBack_Db04.png-e1497087b298ddee4db4e3721cd6623b.stex" ]
12+
source_file="res://assets/archetypes/Exploited.webp"
13+
dest_files=[ "res://.import/Exploited.webp-5608498de341370e129db007d4fab28c.stex" ]
1414

1515
[params]
1616

assets/card_backs/random/CardBack_Db01.png.import renamed to assets/archetypes/Fearless.png.import

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
importer="texture"
44
type="StreamTexture"
5-
path="res://.import/CardBack_Db01.png-3378d10dfd09db0e52dd9b90e7cee3df.stex"
5+
path="res://.import/Fearless.png-d12fa22aefe5f4665837e653122046b4.stex"
66
metadata={
77
"vram_texture": false
88
}
99

1010
[deps]
1111

12-
source_file="res://assets/card_backs/random/CardBack_Db01.png"
13-
dest_files=[ "res://.import/CardBack_Db01.png-3378d10dfd09db0e52dd9b90e7cee3df.stex" ]
12+
source_file="res://assets/archetypes/Fearless.png"
13+
dest_files=[ "res://.import/Fearless.png-d12fa22aefe5f4665837e653122046b4.stex" ]
1414

1515
[params]
1616

assets/archetypes/Fearless.webp

77 KB
Loading

assets/card_backs/random/CardBack_Db02.png.import renamed to assets/archetypes/Fearless.webp.import

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
importer="texture"
44
type="StreamTexture"
5-
path="res://.import/CardBack_Db02.png-8c0e6b39865e72ab2f6e4a5070ae2552.stex"
5+
path="res://.import/Fearless.webp-aab038c002d17b54f0c1d09884c5f7a0.stex"
66
metadata={
77
"vram_texture": false
88
}
99

1010
[deps]
1111

12-
source_file="res://assets/card_backs/random/CardBack_Db02.png"
13-
dest_files=[ "res://.import/CardBack_Db02.png-8c0e6b39865e72ab2f6e4a5070ae2552.stex" ]
12+
source_file="res://assets/archetypes/Fearless.webp"
13+
dest_files=[ "res://.import/Fearless.webp-aab038c002d17b54f0c1d09884c5f7a0.stex" ]
1414

1515
[params]
1616

assets/card_backs/random/CardBack_Db03.png.import renamed to assets/archetypes/Flyer.png.import

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22

33
importer="texture"
44
type="StreamTexture"
5-
path="res://.import/CardBack_Db03.png-1b59a9e227ccbadfd12825743ac6c002.stex"
5+
path="res://.import/Flyer.png-7aa637d9540944b71cc3b09199411086.stex"
66
metadata={
77
"vram_texture": false
88
}
99

1010
[deps]
1111

12-
source_file="res://assets/card_backs/random/CardBack_Db03.png"
13-
dest_files=[ "res://.import/CardBack_Db03.png-1b59a9e227ccbadfd12825743ac6c002.stex" ]
12+
source_file="res://assets/archetypes/Flyer.png"
13+
dest_files=[ "res://.import/Flyer.png-7aa637d9540944b71cc3b09199411086.stex" ]
1414

1515
[params]
1616

assets/archetypes/Flyer.webp

77.1 KB
Loading

0 commit comments

Comments
 (0)