Skip to content
This repository has been archived by the owner on May 23, 2023. It is now read-only.

ModHub FS19 - fixes #7213

Merged
merged 10 commits into from
May 23, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions CpManager.lua
Original file line number Diff line number Diff line change
Expand Up @@ -928,11 +928,11 @@ end;

--FieldScan startup dialog and github info
function CpManager:showYesNoDialogue(title, text, callbackFn)
-- don't show anything if the tutorial dialog is open (it takes a while until is isOpen shows true after startup, hence the clock)
-- don't show anything if the tutorial dialog is open (it takes a while until isOpen, shows true after startup, hence the clock)
if courseplay.clock < 2000 or (g_gui.guis.YesNoDialog.target and g_gui.guis.YesNoDialog.target.isOpen) then
return
end
local text =string.format("%s\n %s",courseplay:loc('COURSEPLAY_YES_NO_FIELDSCAN'),courseplay:loc('COURSEPLAY_SUPPORT_INFO'))
local text =string.format("%s\n\n%s",courseplay:loc('COURSEPLAY_SUPPORT_INFO'),courseplay:loc('COURSEPLAY_YES_NO_FIELDSCAN'))
g_gui:showYesNoDialog({text=text, title=title, callback=callbackFn, target=self})
end;

Expand Down
4 changes: 2 additions & 2 deletions gui/CoursePlot.lua
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ function CoursePlot:new(x, y, width, height, terrainSize)
newCoursePlot = {}
setmetatable( newCoursePlot, self )
self.courseOverlayId = createImageOverlay('dataS/scripts/shared/graph_pixel.dds')
self.startSignOverlayId = createImageOverlay(Utils.getFilename('img/signs/start.dds', courseplay.path))
self.stopSignOverlayId = createImageOverlay(Utils.getFilename('img/signs/stop.dds', courseplay.path))
self.startSignOverlayId = createImageOverlay(Utils.getFilename('img/signs/start_noMM.dds', courseplay.path))
self.stopSignOverlayId = createImageOverlay(Utils.getFilename('img/signs/stop_noMM.dds', courseplay.path))
self.x, self.y = x, y
self.width, self.height = width, height
self.startPosition = {}
Expand Down
Binary file modified img/debug/emissiveMap.dds
Binary file not shown.
Binary file modified img/fieldScanInfo.dds
Binary file not shown.
Binary file removed img/inputCourseNameGUI/inputCourseName_bg.dds
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed img/mouseIcons/mouseBMB.dds
Binary file not shown.
Binary file removed img/mouseIcons/mouseLMB.dds
Binary file not shown.
Binary file removed img/mouseIcons/mouseNMB.dds
Binary file not shown.
Binary file removed img/mouseIcons/mouseRMB.dds
Binary file not shown.
Binary file modified img/signs/start.dds
Binary file not shown.
Binary file added img/signs/start_noMM.dds
Binary file not shown.
Binary file modified img/signs/stop.dds
Binary file not shown.
Binary file added img/signs/stop_noMM.dds
Binary file not shown.
Binary file modified img/signs/unload.dds
Binary file not shown.
2 changes: 1 addition & 1 deletion modDesc.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="no" ?>
<modDesc descVersion="53">
<version>6.04</version>
<version>6.4.0.0</version>
<author><![CDATA[Courseplay.devTeam]]></author>
<title>
<en>CoursePlay</en>
Expand Down
2 changes: 1 addition & 1 deletion translations/translation_de.xml
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,7 @@
<text name="COURSEPLAY_DRIVECONTROL_MODE_3" text="4WD an &amp; Hinterachssperrdiff auf dem Feld" />
<text name="COURSEPLAY_DRIVECONTROL_MODE_4" text="4WD an &amp; Sperrdifferential auf den Feld" />
<text name="COURSEPLAY_YES_NO_FIELDSCAN" text="Möchtest du dass die Felder automatisch gescannt werden?" />
<text name="COURSEPLAY_SUPPORT_INFO" text="Bei Fehler oder Fragen gerne auf der folgenden seite für hilfe vorbeischauen: https://github.com/Courseplay/courseplay oder or https://courseplay.github.io/courseplay/en/index.html" />
<text name="COURSEPLAY_SUPPORT_INFO" text="Bei Fehlern oder Fragen gerne auf der folgenden seite für hilfe vorbeischauen: https://github.com/Courseplay/courseplay oder or https://courseplay.github.io/courseplay/en/index.html" />
<text name="COURSEPLAY_SEEDUSAGECALCULATOR" text="Saatgut-Rechner" />
<text name="COURSEPLAY_SEEDUSAGECALCULATOR_FIELD" text="Feld: %d (%s %s)" />
<text name="COURSEPLAY_SEEDUSAGECALCULATOR_SEEDTYPE" text="Saattyp: %s" />
Expand Down