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

Add GUI for controlling organelle split order #5688

Merged
merged 24 commits into from
Nov 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
a833e05
Started on the GUI parts for reordering items
hhyyrylainen Nov 15, 2024
d171054
More GUI work
hhyyrylainen Nov 15, 2024
ffe9dca
Did more on the generic part of the GUI
hhyyrylainen Nov 15, 2024
35d922e
Growth order GUI can now work a bit
hhyyrylainen Nov 15, 2024
9538dba
Added most of the text for growth order feature
hhyyrylainen Nov 15, 2024
9e3b95b
Fixed non-expanding draggable item
hhyyrylainen Nov 15, 2024
5c0a3ab
Fixed bug with clearing unintended growth controls
hhyyrylainen Nov 18, 2024
34fafc9
Implemented growth order list order filter
hhyyrylainen Nov 18, 2024
1cfb9e2
Made growth numbers update
hhyyrylainen Nov 18, 2024
8e03a50
Re-show growth numbers when needed
hhyyrylainen Nov 18, 2024
acdd295
Hide growth numbers on tab change
hhyyrylainen Nov 18, 2024
ff205b5
Enable down button when needed
hhyyrylainen Nov 18, 2024
abc7b7f
Implemented drag reacting to organelle list
hhyyrylainen Nov 18, 2024
baf1426
Hooked up the callbacks for moving items
hhyyrylainen Nov 19, 2024
9265c7c
Merge branch 'master' into 1622_organelle_split_order
hhyyrylainen Nov 19, 2024
352e40f
Implemented the up/down growth buttons
hhyyrylainen Nov 19, 2024
7be4aa6
Drag and drop now works
hhyyrylainen Nov 19, 2024
4235506
Made growth order be actually applied
hhyyrylainen Nov 19, 2024
d93d571
Added explanation text for the growth order tab
hhyyrylainen Nov 19, 2024
990ad5b
Made the growth GUI scrollbar make more sense
hhyyrylainen Nov 19, 2024
11f24d1
Made saving work for the growth order GUI
hhyyrylainen Nov 19, 2024
75143ad
Added placeholder tolerances tab
hhyyrylainen Nov 19, 2024
cccdf15
Ran formatting script
hhyyrylainen Nov 19, 2024
0c0e001
Ran reordering script
hhyyrylainen Nov 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
94 changes: 94 additions & 0 deletions assets/textures/gui/bevel/DragHandle.svg
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 assets/textures/gui/bevel/DragHandle.svg.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
[remap]

importer="texture"
type="CompressedTexture2D"
uid="uid://bvs25j23bpuic"
path="res://.godot/imported/DragHandle.svg-167fe1547367d430f3bfb791f75fc8fb.ctex"
metadata={
"vram_texture": false
}

[deps]

source_file="res://assets/textures/gui/bevel/DragHandle.svg"
dest_files=["res://.godot/imported/DragHandle.svg-167fe1547367d430f3bfb791f75fc8fb.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=256
detect_3d/compress_to=1
svg/scale=0.25
editor/scale_with_editor_scale=false
editor/convert_colors_with_editor_theme=false
32 changes: 31 additions & 1 deletion locale/af.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 31 additions & 1 deletion locale/ar.po

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading