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

Jump to bottom

feat: emote wheel editor #271

Merged
merged 6 commits into from
Feb 19, 2024
Merged

feat: emote wheel editor #271

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7de18b4
wip
kuruk-mm Feb 16, 2024
9b31e82
wip
kuruk-mm Feb 18, 2024
853365c
Merge remote-tracking branch 'origin/main' into feat/emote-wheel-editor
kuruk-mm Feb 18, 2024
d14c797
feat: emote editor working
kuruk-mm Feb 18, 2024
424e923
apply feedback
kuruk-mm Feb 19, 2024
2e29476
Merge branch 'main' into feat/emote-wheel-editor
kuruk-mm Feb 19, 2024
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
18 changes: 18 additions & 0 deletions godot/.godot/global_script_class_cache.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,13 +83,31 @@ list=Array[Dictionary]([{
"language": &"GDScript",
"path": "res://src/ui/components/discover/discover.gd"
}, {
"base": &"BaseButton",
"class": &"EmoteEditorItem",
"icon": "",
"language": &"GDScript",
"path": "res://src/ui/components/emote_editor/emote_editor_item.gd"
}, {
"base": &"BaseButton",
"class": &"EmoteItemUI",
"icon": "",
"language": &"GDScript",
"path": "res://src/ui/components/emotes/emote_item_ui.gd"
}, {
"base": &"Control",
"class": &"EmoteWheelItem",
"icon": "",
"language": &"GDScript",
"path": "res://src/ui/components/emotes/emote_wheel_item.gd"
}, {
"base": &"RefCounted",
"class": &"Emotes",
"icon": "",
"language": &"GDScript",
"path": "res://src/ui/components/emotes/emotes.gd"
}, {
"base": &"RefCounted",
"class": &"Erc20",
"icon": "",
"language": &"GDScript",
Expand Down
Binary file added godot/.godot/imported/EmoteWheelDeck.svg-7073de1c070b028b73065889b028e0de.ctex
View file
Open in desktop
Binary file not shown.
3 changes: 3 additions & 0 deletions godot/.godot/imported/EmoteWheelDeck.svg-7073de1c070b028b73065889b028e0de.md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source_md5="054963e6df61332c34fc042a31b51df7"
dest_md5="4061ce937f6ab1d17a2d6a283737ac53"

Binary file modified godot/.godot/imported/Inter-Bold.ttf-f02f121f4817604db9dfb97bcd3c29aa.fontdata
View file
Open in desktop
Binary file not shown.
2 changes: 1 addition & 1 deletion godot/.godot/imported/Inter-Bold.ttf-f02f121f4817604db9dfb97bcd3c29aa.md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
source_md5="ba74cc325d5f67d0efbeda51616352db"
dest_md5="2582bc560c5770df517107f38a3f0fea"
dest_md5="0dce7bf598ee74790e756e09b3dc2b54"

Binary file added godot/.godot/imported/outfits.svg-e1742c7495accc578c8dc4c15bc4e4d5.ctex
View file
Open in desktop
Binary file not shown.
3 changes: 3 additions & 0 deletions godot/.godot/imported/outfits.svg-e1742c7495accc578c8dc4c15bc4e4d5.md5
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
source_md5="34131c0417fe7ca9fe237e71db08aa04"
dest_md5="b0fd2a4e8659448f0cd98ddeac84ff81"

12 changes: 12 additions & 0 deletions godot/assets/ui/EmoteWheelDeck.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
37 changes: 37 additions & 0 deletions godot/assets/ui/EmoteWheelDeck.svg.import
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://cv6fjk334oiu4"
path="res://.godot/imported/EmoteWheelDeck.svg-7073de1c070b028b73065889b028e0de.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/ui/EmoteWheelDeck.svg"
dest_files=["res://.godot/imported/EmoteWheelDeck.svg-7073de1c070b028b73065889b028e0de.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
svg/scale=4.0
editor/scale_with_editor_scale=false
editor/convert_colors_with_editor_theme=false
4 changes: 4 additions & 0 deletions godot/assets/ui/outfits.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
37 changes: 37 additions & 0 deletions godot/assets/ui/outfits.svg.import
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://b6ydwqk4yhhcb"
path="res://.godot/imported/outfits.svg-e1742c7495accc578c8dc4c15bc4e4d5.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/ui/outfits.svg"
dest_files=["res://.godot/imported/outfits.svg-e1742c7495accc578c8dc4c15bc4e4d5.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=true
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
svg/scale=4.0
editor/scale_with_editor_scale=false
editor/convert_colors_with_editor_theme=false
Loading
Loading