Skip to content

Fix DescriptionEditableScrollable.layout + Make it the default for EditableMissionDescription.et #73

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

Open
Til-Weimann wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Fix DescriptionEditableScrollable.layout + Make it the default for EditableMissionDescription.et #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
95db11d
Fix scrollable layout
Til-Weimann Aug 28, 2025
2da0541
Make scrollable description layout the default
Til-Weimann Aug 28, 2025
dcaece8
Fix ActionManager MapZoom error
Til-Weimann Aug 28, 2025
801ea63
Merge branch 'JiraF4:main' into main
Til-Weimann Nov 10, 2025
448caa9
Fix invoker null pointer
Til-Weimann Nov 10, 2025
70ed70a
Merge pull request #2 from Til-Weimann/Til-Weimann-patch-1
Til-Weimann Nov 10, 2025
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
8 changes: 5 additions & 3 deletions PlayableSelector/Configs/System/chimeraInputCommon.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,8 @@ ActionManager {
"MapMultiSelectGamepad"
"MapWheelUp"
"MapWheelDown"
"MapZoom"
"MapZoomIn"
"MapZoomOut"
"MapPanDrag"
"MapPanH"
"MapPanV"
Expand Down Expand Up @@ -212,7 +213,8 @@ ActionManager {
"MapMultiSelectGamepad"
"MapWheelUp"
"MapWheelDown"
"MapZoom"
"MapZoomIn"
"MapZoomOut"
"MapPanDrag"
"MapPanH"
"MapPanV"
Expand Down Expand Up @@ -262,4 +264,4 @@ ActionManager {
}
}
}
}
}
4 changes: 2 additions & 2 deletions PlayableSelector/PrefabsEditable/MissionDescription/EditableMissionDescription.et
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,6 @@ PS_MissionDescription {
}
}
m_sTitle "Description title"
m_sDescriptionLayout "{41DAF7B7061DC0BC}UI/MissionDescription/DescriptionEditable.layout"
m_sDescriptionLayout "{B6DE04F7CF7A95DA}UI/MissionDescription/DescriptionEditableScrollable.layout"
m_sTextData "Description text"
}
}
5 changes: 4 additions & 1 deletion PlayableSelector/UI/MissionDescription/DescriptionEditableScrollable.layout
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@ FrameWidgetClass {
Name "RichTextEditable"
Slot AlignableSlot "{609140F0AFDAAA55}" {
Padding 0 0 0 15
HorizontalAlign 3
VerticalAlign 3
}
Pivot 0 0
Text ""
"Font Size" 20
"Min Font Size" 20
Expand All @@ -34,4 +37,4 @@ FrameWidgetClass {
}
}
}
}
}
6 changes: 3 additions & 3 deletions PlayableSelector/scripts/game/Modded/PS_M_SCR_AIGroup.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ modded class SCR_AIGroup : ChimeraAIGroup
m_iNameAuthorID = -1;
}

if (m_bSetPlayable)
Event_OnInit.Insert(MakePlayable);
if (m_bSetPlayable && GetGame().InPlayMode())
GetOnInit().Insert(MakePlayable);

super.EOnInit(owner);
}
Expand Down Expand Up @@ -65,4 +65,4 @@ modded class SCR_AIGroup : ChimeraAIGroup
callsignComponent.GetCallsignIndexes(company, platoon, squad);
return 1000000 * company + 1000 * platoon + 1 * squad;
}
}
}