Skip to content

Commit bfad9af

Browse files
AessiAessi
committed
Makers update.
1 parent b90c184 commit bfad9af

File tree

49 files changed

+4893
-220
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+4893
-220
lines changed

‎Common/Scripts/_TMTitleMaker_LocalSoloBase.Script.txt‎

Lines changed: 1808 additions & 0 deletions
Large diffs are not rendered by default.

‎Makers/base/Scripts/Libs/Nadeo/Common/ManialinkTools/2DArrayCardBuilder.Script.txt‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -266,16 +266,14 @@ Text SecondDeclares()
266266
Void Private_TwoDArrayCardBuilder_SelectCard(CMlFrame _Card)
267267
{
268268
declare CardContainer <=> Private_TwoDArrayCardBuilder_GetCardContainerFromFrameInstance(_Card);
269-
//CardContainer.ZIndex = 1.;
270-
// HACK : Décommenter ces lignes quand le bug de ZIndexes dynamique sera résolu
269+
CardContainer.ZIndex = 1.;
271270
TwoDArrayCardBuilder_SelectCard(_Card);
272271
}
273272

274273
Void Private_TwoDArrayCardBuilder_UnSelectCard(CMlFrame _Card)
275274
{
276275
declare CardContainer <=> Private_TwoDArrayCardBuilder_GetCardContainerFromFrameInstance(_Card);
277-
//CardContainer.ZIndex = 0.;
278-
// HACK : Décommenter ces lignes quand le bug de ZIndexes dynamique sera résolu
276+
CardContainer.ZIndex = 0.;
279277
TwoDArrayCardBuilder_UnSelectCard(_Card);
280278
}
281279

‎Makers/base/Scripts/Libs/Nadeo/MP4/Common/Components/AssetMaker/LBAssetMaker.Script.txt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717
#Const C_DefaultLogo "file://Media/MEDIABROWSER_HiddenResources/Common/Images/Menus/Buttons/Logo_Editor.dds"
1818
#Const C_DefaultAssetLogo "file://Media/MEDIABROWSER_HiddenResources/Maker/Images/Editor/Editor_Logo.dds"
1919
#Const C_ScrollButton "file://Media/MEDIABROWSER_HiddenResources/Common/Images/Menus/Buttons/Button_Scroll_Smallv.dds"
20+
#Const C_ScrollTenButton "file://Media/MEDIABROWSER_HiddenResources/Common/Images/Menus/Buttons/Button_ScrollTen_Smallv.dds"
21+
#Const C_ScrollLastButton "file://Media/MEDIABROWSER_HiddenResources/Common/Images/Menus/Buttons/Button_ScrollLast_Smallv.dds"
2022
#Const C_MaxAssetNb 9
2123
#Const C_AllAssetPositions [<0., -5.0>, <0., -15.65>, <0., -26.3>, <0., -36.95>, <0., -47.6>, <0., -58.25>, <0., -68.9>, <0., -79.55>, <0., -90.2>]
2224

@@ -94,7 +96,7 @@ Text ManialinkFrameModels()
9496
Text ScrollIfCanScroll()
9597
{
9698
if (G_CanScroll) {
97-
return DesignManialinks::ManialinkScrollFrame(<-5., -50.>, C_ScrollButton, 3.6, "", "AssetScroll");
99+
return DesignManialinks::ManialinkScrollFrame(<-5., -50.>, C_ScrollButton, C_ScrollTenButton, C_ScrollLastButton, 3.6, "", "AssetScroll");
98100
}
99101
return "";
100102
}

‎Makers/base/Scripts/Libs/Nadeo/MP4/Common/Components/FileBrowser/FileBrowserAPI.Script.txt‎

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ Void FetchData(Text _BrowserName, Text _Path, Boolean _Flatten)
9292
if (G_ListTaskResult[_BrowserName] != Null) {
9393
DataFileMgr.TaskResult_Release(G_ListTaskResult[_BrowserName].Id);
9494
}
95-
G_ListTaskResult[_BrowserName] = DataFileMgr.Media_GetGameList(G_FileType[_BrowserName], _Path, _Flatten);
95+
G_ListTaskResult[_BrowserName] = DataFileMgr.Media_GetGameList(G_FileType[_BrowserName], _Path, _Flatten,!G_IsSortingFromDescendingOrder[_BrowserName], !G_IsSortingFromDateRatherThanName[_BrowserName]);
9696
}
9797

9898
Void FetchData(Text _BrowserName, Text _Path)
@@ -312,4 +312,30 @@ Void InputPageDown(Text _BrowserName)
312312
if (G_CurrentPage[_BrowserName] < G_MaxPages[_BrowserName]) {
313313
G_CurrentPage[_BrowserName] += 1;
314314
}
315+
}
316+
317+
Void InputPageUpTen(Text _BrowserName)
318+
{
319+
G_CurrentPage[_BrowserName] += 10;
320+
if (G_CurrentPage[_BrowserName] > G_MaxPages[_BrowserName]) {
321+
G_CurrentPage[_BrowserName] = G_MaxPages[_BrowserName];
322+
}
323+
}
324+
325+
Void InputPageDownTen(Text _BrowserName)
326+
{
327+
G_CurrentPage[_BrowserName] -= 10;
328+
if (G_CurrentPage[_BrowserName] < 0) {
329+
G_CurrentPage[_BrowserName] = 0;
330+
}
331+
}
332+
333+
Void InputFirstPage(Text _BrowserName)
334+
{
335+
G_CurrentPage[_BrowserName] = 0;
336+
}
337+
338+
Void InputLastPage(Text _BrowserName)
339+
{
340+
G_CurrentPage[_BrowserName] = G_MaxPages[_BrowserName];
315341
}

‎Makers/base/Scripts/Libs/Nadeo/MP4/Common/Components/ImageBrowser/ImageBrowserAPI.Script.txt‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,17 +73,36 @@ Boolean HasFetched()
7373
return FileBrowserAPI::HasFetched(C_BrowserName);
7474
}
7575

76-
7776
Void InputPageUp()
7877
{
7978
FileBrowserAPI::InputPageUp(C_BrowserName);
8079
}
8180

81+
Void InputPageUpTen()
82+
{
83+
FileBrowserAPI::InputPageUpTen(C_BrowserName);
84+
}
85+
8286
Void InputPageDown()
8387
{
8488
FileBrowserAPI::InputPageDown(C_BrowserName);
8589
}
8690

91+
Void InputPageDownTen()
92+
{
93+
FileBrowserAPI::InputPageDownTen(C_BrowserName);
94+
}
95+
96+
Void InputFirstPage()
97+
{
98+
FileBrowserAPI::InputFirstPage(C_BrowserName);
99+
}
100+
101+
Void InputLastPage()
102+
{
103+
FileBrowserAPI::InputLastPage(C_BrowserName);
104+
}
105+
87106
Integer GetCurrentPageIndex()
88107
{
89108
return FileBrowserAPI::GetCurrentPageIndex(C_BrowserName);

‎Makers/base/Scripts/Libs/Nadeo/MP4/Common/Components/ImageBrowser/ImageBrowserController.Script.txt‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,10 +175,26 @@ Void Loop() {
175175
ImageBrowserAPI::InputPageUp();
176176
MediaBrowserController::UpdateData(C_BrowserName, ImageBrowserAPI::FullPath(G_FolderPath), ImageBrowserAPI::GetMainData(), GetLineData(), ImageBrowserAPI::GetCurrentPageIndex(), ImageBrowserAPI::GetMaxPages());
177177
}
178+
if (MediaBrowserController::IsRequestingInputPageUpTen(C_BrowserName)) {
179+
ImageBrowserAPI::InputPageUpTen();
180+
MediaBrowserController::UpdateData(C_BrowserName, ImageBrowserAPI::FullPath(G_FolderPath), ImageBrowserAPI::GetMainData(), GetLineData(), ImageBrowserAPI::GetCurrentPageIndex(), ImageBrowserAPI::GetMaxPages());
181+
}
178182
if (MediaBrowserController::IsRequestingInputPageDown(C_BrowserName)) {
179183
ImageBrowserAPI::InputPageDown();
180184
MediaBrowserController::UpdateData(C_BrowserName, ImageBrowserAPI::FullPath(G_FolderPath), ImageBrowserAPI::GetMainData(), GetLineData(), ImageBrowserAPI::GetCurrentPageIndex(), ImageBrowserAPI::GetMaxPages());
181185
}
186+
if (MediaBrowserController::IsRequestingInputPageDownTen(C_BrowserName)) {
187+
ImageBrowserAPI::InputPageDownTen();
188+
MediaBrowserController::UpdateData(C_BrowserName, ImageBrowserAPI::FullPath(G_FolderPath), ImageBrowserAPI::GetMainData(), GetLineData(), ImageBrowserAPI::GetCurrentPageIndex(), ImageBrowserAPI::GetMaxPages());
189+
}
190+
if (MediaBrowserController::IsRequestingInputFirstPage(C_BrowserName)) {
191+
ImageBrowserAPI::InputFirstPage();
192+
MediaBrowserController::UpdateData(C_BrowserName, ImageBrowserAPI::FullPath(G_FolderPath), ImageBrowserAPI::GetMainData(), GetLineData(), ImageBrowserAPI::GetCurrentPageIndex(), ImageBrowserAPI::GetMaxPages());
193+
}
194+
if (MediaBrowserController::IsRequestingInputLastPage(C_BrowserName)) {
195+
ImageBrowserAPI::InputLastPage();
196+
MediaBrowserController::UpdateData(C_BrowserName, ImageBrowserAPI::FullPath(G_FolderPath), ImageBrowserAPI::GetMainData(), GetLineData(), ImageBrowserAPI::GetCurrentPageIndex(), ImageBrowserAPI::GetMaxPages());
197+
}
182198
if (MediaBrowserController::IsRequestingSteamWorkshop(C_BrowserName)) {
183199
TitleControl.PublishFile(ImageBrowserAPI::FullPath(MediaBrowserController::RequestingSteamWorkshopMediaName(C_BrowserName)));
184200
}

‎Makers/base/Scripts/Libs/Nadeo/MP4/Common/Components/ListDisplayer/LBListDisplayer.Script.txt‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ Text Declares() {
574574
{
575575
declare CMlFrame ListDisplayer_Frame_Sort <=> (Page.MainFrame.GetFirstChild("ListDisplayer_Frame_Sort-"^I) as CMlFrame);
576576
declare CMlLabel ListDisplayer_Label_Sort <=> (ListDisplayer_Frame_Sort.GetFirstChild("ListDisplayer_Label_Sort") as CMlLabel);
577-
declare CMlQuad ListDisplayer_Arrow_Sort <=> (ListDisplayer_Frame_Sort.GetFirstChild("ListDisplayer_Arrow_Sort") as CMlQuad);
577+
declare CMlQuad ListDisplayer_Arrow_Sort <=> (ListDisplayer_Frame_Sort.GetFirstChild("ListDisplayer_Arrow_Sort") as CMlQuad);
578578
if(I == _QuadId)
579579
{
580580
switch(G_Private_ListDisplayer_SortStatePerButton[I])
@@ -584,6 +584,16 @@ Text Declares() {
584584
ListDisplayer_Arrow_Sort.Show();
585585
ListDisplayer_Arrow_Sort.RelativeRotation = 180.;
586586
}
587+
case C_ARRAY_INCREASINGORDER: {
588+
G_Private_ListDisplayer_SortStatePerButton[I] = C_ARRAY_DECREASINGORDER;
589+
ListDisplayer_Arrow_Sort.Show();
590+
ListDisplayer_Arrow_Sort.RelativeRotation = 0.;
591+
}
592+
case C_ARRAY_DECREASINGORDER: {
593+
G_Private_ListDisplayer_SortStatePerButton[I] = C_ARRAY_INCREASINGORDER;
594+
ListDisplayer_Arrow_Sort.Show();
595+
ListDisplayer_Arrow_Sort.RelativeRotation = 180.;
596+
}
587597
}
588598
}
589599
else

‎Makers/base/Scripts/Libs/Nadeo/MP4/Common/Components/ListDisplayer/ListDisplayerController_Ingame.Script.txt‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
// ListDisplayerController_Ingame.Script.txt
2+
3+
Void ChangeListData(Text _LayerName, Text[Text][] _NewDataList)
4+
{
5+
declare UI <=> UIManager.GetUI(Players[0]);
6+
declare netwrite Text[Text][] NewDataList for UI;
7+
declare netwrite Integer UpdateListData for UI;
8+
NewDataList = _NewDataList;
9+
UpdateListData = Now;
10+
}

‎Makers/base/Scripts/Libs/Nadeo/MP4/Common/Components/MatchSettingsEditor/LBMatchSettingsEditor.Script.txt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
#Const C_IMG_Cross_Move "file://Media/MEDIABROWSER_HiddenResources/Common/Images/Menus/Buttons/MoveCross.dds"
1212
#Const C_IMG_Cross_MoveOver "file://Media/MEDIABROWSER_HiddenResources/Common/Images/Menus/Buttons/MoveCrossOver.dds"
1313
#Const C_ScrollButton "file://Media/MEDIABROWSER_HiddenResources/Common/Images/Menus/Buttons/Button_Scroll_Smallv.dds"
14+
#Const C_ScrollTenButton "file://Media/MEDIABROWSER_HiddenResources/Common/Images/Menus/Buttons/Button_ScrollTen_Smallv.dds"
15+
#Const C_ScrollLastButton "file://Media/MEDIABROWSER_HiddenResources/Common/Images/Menus/Buttons/Button_ScrollLast_Smallv.dds"
1416

1517
#Const C_ScaleFactor 1.005
1618

@@ -131,7 +133,7 @@ Text Build() {
131133
</frame>
132134
<frame id="CardsFrame">
133135
{{{MediaCardDisplayer::ManialinkMainBody()}}}
134-
{{{DesignManialinks::ManialinkScrollFrame(ScrollPos, C_ScrollButton, 3.6, "z-index=\"1\"", "MatchSettings_Scroll")}}}
136+
{{{DesignManialinks::ManialinkScrollFrame(ScrollPos, C_ScrollButton, C_ScrollTenButton, C_ScrollLastButton, 3.6, "z-index=\"1\"", "MatchSettings_Scroll")}}}
135137
<quad halign="center" valign="center" size="{{{SizeMaps.X}}} 10" pos="{{{ScrollPos.X}}} {{{ScrollPos.Y - 3.}}}" bgcolor="000" opacity="0.3"/>
136138
</frame>
137139
</frame>

‎Makers/base/Scripts/Libs/Nadeo/MP4/Common/Components/MatchSettingsEditor/MatchSettingsBrowserAPI.Script.txt‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,17 +212,36 @@ Boolean HasFetched()
212212
return FileBrowserAPI::HasFetched(C_BrowserName);
213213
}
214214

215-
216215
Void InputPageUp()
217216
{
218217
FileBrowserAPI::InputPageUp(C_BrowserName);
219218
}
220219

220+
Void InputPageUpTen()
221+
{
222+
FileBrowserAPI::InputPageUpTen(C_BrowserName);
223+
}
224+
221225
Void InputPageDown()
222226
{
223227
FileBrowserAPI::InputPageDown(C_BrowserName);
224228
}
225229

230+
Void InputPageDownTen()
231+
{
232+
FileBrowserAPI::InputPageDownTen(C_BrowserName);
233+
}
234+
235+
Void InputFirstPage()
236+
{
237+
FileBrowserAPI::InputFirstPage(C_BrowserName);
238+
}
239+
240+
Void InputLastPage()
241+
{
242+
FileBrowserAPI::InputLastPage(C_BrowserName);
243+
}
244+
226245
Integer GetCurrentPageIndex()
227246
{
228247
return FileBrowserAPI::GetCurrentPageIndex(C_BrowserName);

0 commit comments

Comments
 (0)