teascade/skullball
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: teascade:b6278cbc5a765df3f3a719b53a53970c471616ea
Branches Tags
teascade:main
..
compare: teascade:36f53e14f03b72efa3e3b81f762ec5e225a473dc
Branches Tags
teascade:main

No commits in common. "b6278cbc5a765df3f3a719b53a53970c471616ea" and "36f53e14f03b72efa3e3b81f762ec5e225a473dc" have entirely different histories.
b6278cbc5a ... 36f53e14f0

6 changed files with 11 additions and 14 deletions
Show Stats Expand all files Collapse all files

4
Cargo.lock generated
View File

@ -287,7 +287,7 @@ checksum = "3a219298ac11a56ea9a6d2120044824d6f01aeb034955e7af7bc16858527deea"
[[package]] [[package]]
name = "skullball" name = "skullball"
version = "1.0.0" version = "0.1.0"
dependencies = [ dependencies = [
"ciborium", "ciborium",
"flate2", "flate2",
@ -310,7 +310,7 @@ dependencies = [
[[package]] [[package]]
name = "teanet" name = "teanet"
version = "1.0.0" version = "0.1.0"
dependencies = [ dependencies = [
"ciborium", "ciborium",
"flate2", "flate2",

14
godot/maps/textures/{str_grating1.png.import
View File

@ -3,21 +3,19 @@
importer="texture" importer="texture"
type="CompressedTexture2D" type="CompressedTexture2D"
uid="uid://be6kkun8jvorr" uid="uid://be6kkun8jvorr"
path.s3tc="res://.godot/imported/{str_grating1.png-c56d7008acfd43735ff24601098a1911.s3tc.ctex" path="res://.godot/imported/{str_grating1.png-c56d7008acfd43735ff24601098a1911.ctex"
path.etc2="res://.godot/imported/{str_grating1.png-c56d7008acfd43735ff24601098a1911.etc2.ctex"
metadata={ metadata={
"imported_formats": ["s3tc_bptc", "etc2_astc"], "vram_texture": false
"vram_texture": true
} }
[deps] [deps]
source_file="res://maps/textures/{str_grating1.png" source_file="res://maps/textures/{str_grating1.png"
dest_files=["res://.godot/imported/{str_grating1.png-c56d7008acfd43735ff24601098a1911.s3tc.ctex", "res://.godot/imported/{str_grating1.png-c56d7008acfd43735ff24601098a1911.etc2.ctex"] dest_files=["res://.godot/imported/{str_grating1.png-c56d7008acfd43735ff24601098a1911.ctex"]
[params] [params]
compress/mode=2 compress/mode=0
compress/high_quality=false compress/high_quality=false
compress/lossy_quality=0.7 compress/lossy_quality=0.7
compress/uastc_level=0 compress/uastc_level=0
@ -25,7 +23,7 @@ compress/rdo_quality_loss=0.0
compress/hdr_compression=1 compress/hdr_compression=1
compress/normal_map=0 compress/normal_map=0
compress/channel_pack=0 compress/channel_pack=0
mipmaps/generate=true mipmaps/generate=false
mipmaps/limit=-1 mipmaps/limit=-1
roughness/mode=0 roughness/mode=0
roughness/src_normal="" roughness/src_normal=""
@ -39,4 +37,4 @@ process/normal_map_invert_y=false
process/hdr_as_srgb=false process/hdr_as_srgb=false
process/hdr_clamp_exposure=false process/hdr_clamp_exposure=false
process/size_limit=0 process/size_limit=0
detect_3d/compress_to=0 detect_3d/compress_to=1

1
godot/project.godot
View File

@ -11,7 +11,6 @@ config_version=5
[application] [application]
config/name="SkullBall" config/name="SkullBall"
config/version="1.0.0"
run/main_scene="uid://lahirbqfppvw" run/main_scene="uid://lahirbqfppvw"
config/features=PackedStringArray("4.7", "Forward Plus") config/features=PackedStringArray("4.7", "Forward Plus")
boot_splash/bg_color=Color(0.14993507, 0.13915217, 0.13313693, 1) boot_splash/bg_color=Color(0.14993507, 0.13915217, 0.13313693, 1)

2
rust/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "skullball" name = "skullball"
version = "1.0.0" version = "0.1.0"
edition = "2024" edition = "2024"
[lib] [lib]

2
rust/src/player/weapon.rs
View File

@ -25,7 +25,7 @@ pub struct WeaponMesh {
impl WeaponMesh { impl WeaponMesh {
fn set_color(&mut self, color: Color) { fn set_color(&mut self, color: Color) {
if let Some(mesh) = &mut self.mesh if let Some(mesh) = &mut self.mesh
&& let Some(mut mat) = mesh.get_surface_override_material(0) && let Some(mut mat) = mesh.get_active_material(0)
{ {
mat.set("albedo_color", &color.to_variant()); mat.set("albedo_color", &color.to_variant());
} }

2
teanet-rust

@ -1 +1 @@
Subproject commit c75e0e40c74516ff5447bbe12f78911b2841288d Subproject commit 45db2316526a003c08eef97320b93f220a1d0518