GameDev/2DHackAndSlay
GameDev/2DHackAndSlay
Archived
4
0
Fork 0
Code Issues 2 Pull requests Projects 1 Releases 1 Wiki Activity Actions

Compare commits

base: GameDev:4a7a0f59caab22bb45aa8bbe85ecb80b4414bd33
Branches Tags
GameDev:master
GameDev:nightly
GameDev:dev-base
GameDev:dev-player
GameDev:dev-resouces
GameDev:dev-scene
GameDev:stable
GameDev:v0.0.1.0
..
compare: GameDev:e151d2be84d17606027cb65cd569aa38375f2b6d
Branches Tags
GameDev:nightly
GameDev:dev-base
GameDev:dev-player
GameDev:dev-resouces
GameDev:dev-scene
GameDev:master
GameDev:stable
GameDev:v0.0.1.0

No commits in common. "4a7a0f59caab22bb45aa8bbe85ecb80b4414bd33" and "e151d2be84d17606027cb65cd569aa38375f2b6d" have entirely different histories.
4a7a0f59ca ... e151d2be84

5 changed files with 145 additions and 319 deletions
Show stats Expand all files Collapse all files

BIN
Assets/Textures/Tilesets/colony.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 42 KiB

BIN
Assets/Textures/basic_enemy.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 139 B

After

Width:  |  Height:  |  Size: 157 B

BIN
Assets/Textures/color_cube.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 195 B

After

Width:  |  Height:  |  Size: 195 B

BIN
Guidelines/ColorPallet.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 240 B

After

Width:  |  Height:  |  Size: 208 B

464
Guidelines/ColorPallet.tres
View file

@ -1,327 +1,182 @@
[gd_resource type="Resource" load_steps=67 format=2] [gd_resource type="Resource" load_steps=38 format=2]
[ext_resource path="res://src/Palette/PaletteColor.gd" type="Script" id=1] [ext_resource path="res://src/Palette/PaletteColor.gd" type="Script" id=1]
[ext_resource path="res://src/Palette/Palette.gd" type="Script" id=2] [ext_resource path="res://src/Palette/Palette.gd" type="Script" id=2]
[sub_resource type="Resource" id=1] [sub_resource type="Resource" id=20]
script = ExtResource( 1 ) script = ExtResource( 1 )
color = Color( 0.901961, 0.360784, 0.4, 1 ) color = Color( 0.337255, 0.745098, 0.74902, 1 )
index = 0 index = 0
[sub_resource type="Resource" id=2]
script = ExtResource( 1 )
color = Color( 0.901961, 0.592157, 0.360784, 1 )
index = 1
[sub_resource type="Resource" id=3]
script = ExtResource( 1 )
color = Color( 0.894118, 0.901961, 0.360784, 1 )
index = 2
[sub_resource type="Resource" id=4]
script = ExtResource( 1 )
color = Color( 0.360784, 0.901961, 0.360784, 1 )
index = 3
[sub_resource type="Resource" id=5]
script = ExtResource( 1 )
color = Color( 0.360784, 0.901961, 0.733333, 1 )
index = 4
[sub_resource type="Resource" id=6]
script = ExtResource( 1 )
color = Color( 0.360784, 0.815686, 0.901961, 1 )
index = 5
[sub_resource type="Resource" id=7]
script = ExtResource( 1 )
color = Color( 0.360784, 0.423529, 0.901961, 1 )
index = 6
[sub_resource type="Resource" id=8]
script = ExtResource( 1 )
color = Color( 0.545098, 0.360784, 0.901961, 1 )
index = 7
[sub_resource type="Resource" id=9]
script = ExtResource( 1 )
color = Color( 0.74902, 0.298039, 0.329412, 1 )
index = 8
[sub_resource type="Resource" id=10]
script = ExtResource( 1 )
color = Color( 0.74902, 0.490196, 0.298039, 1 )
index = 9
[sub_resource type="Resource" id=11]
script = ExtResource( 1 )
color = Color( 0.741176, 0.74902, 0.298039, 1 )
index = 10
[sub_resource type="Resource" id=12]
script = ExtResource( 1 )
color = Color( 0.298039, 0.74902, 0.298039, 1 )
index = 11
[sub_resource type="Resource" id=13]
script = ExtResource( 1 )
color = Color( 0.298039, 0.74902, 0.611765, 1 )
index = 12
[sub_resource type="Resource" id=14]
script = ExtResource( 1 )
color = Color( 0.298039, 0.682353, 0.74902, 1 )
index = 13
[sub_resource type="Resource" id=15]
script = ExtResource( 1 )
color = Color( 0.298039, 0.352941, 0.74902, 1 )
index = 14
[sub_resource type="Resource" id=16] [sub_resource type="Resource" id=16]
script = ExtResource( 1 ) script = ExtResource( 1 )
color = Color( 0.458824, 0.298039, 0.74902, 1 ) color = Color( 0.25098, 0.552941, 0.682353, 1 )
index = 15 index = 1
[sub_resource type="Resource" id=17] [sub_resource type="Resource" id=17]
script = ExtResource( 1 ) script = ExtResource( 1 )
color = Color( 0.501961, 0.2, 0.223529, 1 ) color = Color( 0.227451, 0.439216, 0.631373, 1 )
index = 16 index = 2
[sub_resource type="Resource" id=18]
script = ExtResource( 1 )
color = Color( 0.501961, 0.32549, 0.2, 1 )
index = 17
[sub_resource type="Resource" id=19] [sub_resource type="Resource" id=19]
script = ExtResource( 1 ) script = ExtResource( 1 )
color = Color( 0.498039, 0.501961, 0.2, 1 ) color = Color( 0.207843, 0.333333, 0.584314, 1 )
index = 18 index = 3
[sub_resource type="Resource" id=20] [sub_resource type="Resource" id=18]
script = ExtResource( 1 ) script = ExtResource( 1 )
color = Color( 0.2, 0.501961, 0.2, 1 ) color = Color( 0.235294, 0.203922, 0.482353, 1 )
index = 19 index = 4
[sub_resource type="Resource" id=21] [sub_resource type="Resource" id=15]
script = ExtResource( 1 ) script = ExtResource( 1 )
color = Color( 0.2, 0.501961, 0.411765, 1 ) color = Color( 0.729412, 0.807843, 0.729412, 1 )
index = 20 index = 8
[sub_resource type="Resource" id=22] [sub_resource type="Resource" id=4]
script = ExtResource( 1 ) script = ExtResource( 1 )
color = Color( 0.2, 0.45098, 0.501961, 1 ) color = Color( 0.576471, 0.698039, 0.607843, 1 )
index = 21 index = 9
[sub_resource type="Resource" id=23] [sub_resource type="Resource" id=2]
script = ExtResource( 1 ) script = ExtResource( 1 )
color = Color( 0.2, 0.235294, 0.501961, 1 ) color = Color( 0.396078, 0.560784, 0.529412, 1 )
index = 22 index = 10
[sub_resource type="Resource" id=1]
script = ExtResource( 1 )
color = Color( 0.227451, 0.356863, 0.415686, 1 )
index = 11
[sub_resource type="Resource" id=3]
script = ExtResource( 1 )
color = Color( 0.176471, 0.231373, 0.34902, 1 )
index = 12
[sub_resource type="Resource" id=5]
script = ExtResource( 1 )
color = Color( 0.196078, 0.168627, 0.317647, 1 )
index = 13
[sub_resource type="Resource" id=24] [sub_resource type="Resource" id=24]
script = ExtResource( 1 ) script = ExtResource( 1 )
color = Color( 0.305882, 0.2, 0.501961, 1 ) color = Color( 0.819608, 0.92549, 0.356863, 1 )
index = 23 index = 16
[sub_resource type="Resource" id=21]
script = ExtResource( 1 )
color = Color( 0.4, 0.72549, 0.286275, 1 )
index = 17
[sub_resource type="Resource" id=22]
script = ExtResource( 1 )
color = Color( 0.207843, 0.470588, 0.235294, 1 )
index = 18
[sub_resource type="Resource" id=23]
script = ExtResource( 1 )
color = Color( 0.164706, 0.305882, 0.227451, 1 )
index = 19
[sub_resource type="Resource" id=14]
script = ExtResource( 1 )
color = Color( 0.913725, 0.721569, 0.427451, 1 )
index = 24
[sub_resource type="Resource" id=8]
script = ExtResource( 1 )
color = Color( 0.862745, 0.541176, 0.360784, 1 )
index = 25
[sub_resource type="Resource" id=7]
script = ExtResource( 1 )
color = Color( 0.807843, 0.396078, 0.313726, 1 )
index = 26
[sub_resource type="Resource" id=9]
script = ExtResource( 1 )
color = Color( 0.690196, 0.305882, 0.313726, 1 )
index = 27
[sub_resource type="Resource" id=25] [sub_resource type="Resource" id=25]
script = ExtResource( 1 ) script = ExtResource( 1 )
color = Color( 0.4, 0.160784, 0.180392, 1 ) color = Color( 0.1452, 0.181353, 0.22, 1 )
index = 24 index = 20
[sub_resource type="Resource" id=26] [sub_resource type="Resource" id=6]
script = ExtResource( 1 ) script = ExtResource( 1 )
color = Color( 0.4, 0.262745, 0.160784, 1 ) color = Color( 0.152941, 0.12549, 0.192157, 1 )
index = 25 index = 6
[sub_resource type="Resource" id=27]
script = ExtResource( 1 )
color = Color( 0.396078, 0.4, 0.160784, 1 )
index = 26
[sub_resource type="Resource" id=28]
script = ExtResource( 1 )
color = Color( 0.160784, 0.4, 0.160784, 1 )
index = 27
[sub_resource type="Resource" id=29]
script = ExtResource( 1 )
color = Color( 0.160784, 0.4, 0.32549, 1 )
index = 28
[sub_resource type="Resource" id=30] [sub_resource type="Resource" id=30]
script = ExtResource( 1 ) script = ExtResource( 1 )
color = Color( 0.160784, 0.364706, 0.4, 1 ) color = Color( 0.396078, 0.192157, 0.317647, 1 )
index = 29 index = 36
[sub_resource type="Resource" id=31] [sub_resource type="Resource" id=11]
script = ExtResource( 1 ) script = ExtResource( 1 )
color = Color( 0.160784, 0.188235, 0.4, 1 ) color = Color( 0.282353, 0.168627, 0.317647, 1 )
index = 30 index = 37
[sub_resource type="Resource" id=32]
script = ExtResource( 1 )
color = Color( 0.243137, 0.160784, 0.4, 1 )
index = 31
[sub_resource type="Resource" id=33]
script = ExtResource( 1 )
color = Color( 0.278431, 0.113725, 0.12549, 1 )
index = 32
[sub_resource type="Resource" id=34]
script = ExtResource( 1 )
color = Color( 0.278431, 0.184314, 0.113725, 1 )
index = 33
[sub_resource type="Resource" id=35]
script = ExtResource( 1 )
color = Color( 0.27451, 0.278431, 0.113725, 1 )
index = 34
[sub_resource type="Resource" id=36] [sub_resource type="Resource" id=36]
script = ExtResource( 1 ) script = ExtResource( 1 )
color = Color( 0.113725, 0.278431, 0.113725, 1 ) color = Color( 0.152941, 0.12549, 0.192157, 1 )
index = 35 index = 14
[sub_resource type="Resource" id=37]
script = ExtResource( 1 )
color = Color( 0.113725, 0.278431, 0.231373, 1 )
index = 36
[sub_resource type="Resource" id=38] [sub_resource type="Resource" id=38]
script = ExtResource( 1 ) script = ExtResource( 1 )
color = Color( 0.113725, 0.254902, 0.278431, 1 ) color = Color( 0.152941, 0.12549, 0.192157, 1 )
index = 37 index = 22
[sub_resource type="Resource" id=37]
script = ExtResource( 1 )
color = Color( 0.152941, 0.12549, 0.192157, 1 )
index = 38
[sub_resource type="Resource" id=39] [sub_resource type="Resource" id=39]
script = ExtResource( 1 ) script = ExtResource( 1 )
color = Color( 0.113725, 0.129412, 0.278431, 1 ) color = Color( 0.533333, 0.223529, 0.313726, 1 )
index = 38 index = 35
[sub_resource type="Resource" id=40] [sub_resource type="Resource" id=40]
script = ExtResource( 1 ) script = ExtResource( 1 )
color = Color( 0.168627, 0.113725, 0.278431, 1 ) color = Color( 0.65, 0.2405, 0.30875, 1 )
index = 39 index = 34
[sub_resource type="Resource" id=41] [sub_resource type="Resource" id=41]
script = ExtResource( 1 ) script = ExtResource( 1 )
color = Color( 0.2, 0.0823529, 0.0901961, 1 ) color = Color( 0.75, 0.2775, 0.2775, 1 )
index = 40 index = 33
[sub_resource type="Resource" id=42] [sub_resource type="Resource" id=42]
script = ExtResource( 1 ) script = ExtResource( 1 )
color = Color( 0.2, 0.129412, 0.0823529, 1 ) color = Color( 0.91, 0.451208, 0.4095, 1 )
index = 41 index = 32
[sub_resource type="Resource" id=43] [sub_resource type="Resource" id=43]
script = ExtResource( 1 ) script = ExtResource( 1 )
color = Color( 0.2, 0.2, 0.0823529, 1 ) color = Color( 0.196078, 0.168627, 0.317647, 1 )
index = 42 index = 5
[sub_resource type="Resource" id=44] [sub_resource type="Resource" id=44]
script = ExtResource( 1 ) script = ExtResource( 1 )
color = Color( 0.0823529, 0.2, 0.0823529, 1 ) color = Color( 0.196078, 0.168627, 0.317647, 1 )
index = 43 index = 21
[sub_resource type="Resource" id=45] [sub_resource type="Resource" id=45]
script = ExtResource( 1 ) script = ExtResource( 1 )
color = Color( 0.0823529, 0.2, 0.164706, 1 ) color = Color( 0.396078, 0.192157, 0.317647, 1 )
index = 44 index = 28
[sub_resource type="Resource" id=46] [sub_resource type="Resource" id=46]
script = ExtResource( 1 ) script = ExtResource( 1 )
color = Color( 0.0823529, 0.184314, 0.2, 1 ) color = Color( 0.282353, 0.168627, 0.317647, 1 )
index = 45 index = 29
[sub_resource type="Resource" id=47] [sub_resource type="Resource" id=47]
script = ExtResource( 1 ) script = ExtResource( 1 )
color = Color( 0.0823529, 0.0941176, 0.2, 1 ) color = Color( 0.152941, 0.12549, 0.192157, 1 )
index = 46 index = 30
[sub_resource type="Resource" id=48]
script = ExtResource( 1 )
color = Color( 0.121569, 0.0823529, 0.2, 1 )
index = 47
[sub_resource type="Resource" id=49]
script = ExtResource( 1 )
color = Color( 0.14902, 0.0627451, 0.0705882, 1 )
index = 48
[sub_resource type="Resource" id=50]
script = ExtResource( 1 )
color = Color( 0.14902, 0.0980392, 0.0627451, 1 )
index = 49
[sub_resource type="Resource" id=51]
script = ExtResource( 1 )
color = Color( 0.14902, 0.14902, 0.0627451, 1 )
index = 50
[sub_resource type="Resource" id=52]
script = ExtResource( 1 )
color = Color( 0.0627451, 0.14902, 0.0627451, 1 )
index = 51
[sub_resource type="Resource" id=53]
script = ExtResource( 1 )
color = Color( 0.0627451, 0.14902, 0.121569, 1 )
index = 52
[sub_resource type="Resource" id=54]
script = ExtResource( 1 )
color = Color( 0.0627451, 0.137255, 0.14902, 1 )
index = 53
[sub_resource type="Resource" id=55]
script = ExtResource( 1 )
color = Color( 0.0627451, 0.0705882, 0.14902, 1 )
index = 54
[sub_resource type="Resource" id=56]
script = ExtResource( 1 )
color = Color( 0.0862745, 0.0627451, 0.14902, 1 )
index = 55
[sub_resource type="Resource" id=57]
script = ExtResource( 1 )
color = Color( 0.901961, 0.901961, 0.901961, 1 )
index = 56
[sub_resource type="Resource" id=58]
script = ExtResource( 1 )
color = Color( 0.74902, 0.74902, 0.74902, 1 )
index = 57
[sub_resource type="Resource" id=59]
script = ExtResource( 1 )
color = Color( 0.501961, 0.501961, 0.501961, 1 )
index = 58
[sub_resource type="Resource" id=60]
script = ExtResource( 1 )
color = Color( 0.4, 0.4, 0.4, 1 )
index = 59
[sub_resource type="Resource" id=61]
script = ExtResource( 1 )
color = Color( 0.278431, 0.278431, 0.278431, 1 )
index = 60
[sub_resource type="Resource" id=62]
script = ExtResource( 1 )
color = Color( 0.2, 0.2, 0.2, 1 )
index = 61
[sub_resource type="Resource" id=63]
script = ExtResource( 1 )
color = Color( 0.14902, 0.14902, 0.14902, 1 )
index = 62
[sub_resource type="Resource" id=64]
script = ExtResource( 1 )
color = Color( 0.101961, 0.101961, 0.101961, 1 )
index = 63
[resource] [resource]
resource_name = "ColorPallet" resource_name = "ColorPallet"
@ -331,69 +186,40 @@ comment = ""
width = 8 width = 8
height = 8 height = 8
colors = { colors = {
0: SubResource( 1 ), 0: SubResource( 20 ),
1: SubResource( 2 ), 1: SubResource( 16 ),
2: SubResource( 3 ), 2: SubResource( 17 ),
3: SubResource( 4 ), 3: SubResource( 19 ),
4: SubResource( 5 ), 4: SubResource( 18 ),
5: SubResource( 6 ), 5: SubResource( 43 ),
6: SubResource( 7 ), 6: SubResource( 6 ),
7: SubResource( 8 ), 8: SubResource( 15 ),
8: SubResource( 9 ), 9: SubResource( 4 ),
9: SubResource( 10 ), 10: SubResource( 2 ),
10: SubResource( 11 ), 11: SubResource( 1 ),
11: SubResource( 12 ), 12: SubResource( 3 ),
12: SubResource( 13 ), 13: SubResource( 5 ),
13: SubResource( 14 ), 14: SubResource( 36 ),
14: SubResource( 15 ), 16: SubResource( 24 ),
15: SubResource( 16 ), 17: SubResource( 21 ),
16: SubResource( 17 ), 18: SubResource( 22 ),
17: SubResource( 18 ), 19: SubResource( 23 ),
18: SubResource( 19 ), 20: SubResource( 25 ),
19: SubResource( 20 ), 21: SubResource( 44 ),
20: SubResource( 21 ), 22: SubResource( 38 ),
21: SubResource( 22 ), 24: SubResource( 14 ),
22: SubResource( 23 ), 25: SubResource( 8 ),
23: SubResource( 24 ), 26: SubResource( 7 ),
24: SubResource( 25 ), 27: SubResource( 9 ),
25: SubResource( 26 ), 28: SubResource( 45 ),
26: SubResource( 27 ), 29: SubResource( 46 ),
27: SubResource( 28 ), 30: SubResource( 47 ),
28: SubResource( 29 ), 32: SubResource( 42 ),
29: SubResource( 30 ), 33: SubResource( 41 ),
30: SubResource( 31 ), 34: SubResource( 40 ),
31: SubResource( 32 ), 35: SubResource( 39 ),
32: SubResource( 33 ), 36: SubResource( 30 ),
33: SubResource( 34 ), 37: SubResource( 11 ),
34: SubResource( 35 ), 38: SubResource( 37 )
35: SubResource( 36 ),
36: SubResource( 37 ),
37: SubResource( 38 ),
38: SubResource( 39 ),
39: SubResource( 40 ),
40: SubResource( 41 ),
41: SubResource( 42 ),
42: SubResource( 43 ),
43: SubResource( 44 ),
44: SubResource( 45 ),
45: SubResource( 46 ),
46: SubResource( 47 ),
47: SubResource( 48 ),
48: SubResource( 49 ),
49: SubResource( 50 ),
50: SubResource( 51 ),
51: SubResource( 52 ),
52: SubResource( 53 ),
53: SubResource( 54 ),
54: SubResource( 55 ),
55: SubResource( 56 ),
56: SubResource( 57 ),
57: SubResource( 58 ),
58: SubResource( 59 ),
59: SubResource( 60 ),
60: SubResource( 61 ),
61: SubResource( 62 ),
62: SubResource( 63 ),
63: SubResource( 64 )
} }
colors_max = 64 colors_max = 64