8000 Release 0.1.12-alpha: Merge branch 'dev' · colobot/colobot-data@c467bd9 · GitHub
[go: up one dir, main page]

Skip to content

Commit c467bd9

Browse files
committed
Release 0.1.12-alpha: Merge branch 'dev'
2 parents 3cbab71 + dd12dbe commit c467bd9

File tree

242 files changed

+62024
-41
lines changed
  • level002/po
  • level003/po
  • chapter002
  • chapter003
  • chapter004
  • chapter005
  • chapter006
  • chapter007
  • chapter008
  • chapter009
  • po
  • textures-src/interface/button4
  • textures/interface
  • Some content is hidden

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

    242 files changed

    +62024
    -41
    lines changed

    Jenkinsfile

    Lines changed: 33 additions & 32 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1,39 +1,40 @@
    11
    #!/usr/bin/env groovy
    2-
    if (env.BRANCH_NAME.startsWith('PR-')) {
    3-
    properties([[$class: 'BuildDiscarderProperty', strategy: [$class: 'LogRotator', artifactNumToKeepStr: '1']]])
    4-
    } else {
    5-
    properties([[$class: 'BuildDiscarderProperty', strategy: [$class: 'LogRotator', artifactDaysToKeepStr: '30', artifactNumToKeepStr: '5']]])
    6-
    }
    7-
    8-
    if (env.CHANGE_TARGET == 'master') {
    9-
    error("This pull request targets the wrong branch. Please reopen the pull request targetting the dev branch.")
    10-
    }
    112

    12-
    node('master') {
    13-
    stage('Pull changes') {
    14-
    checkout scm
    3+
    pipeline {
    4+
    agent { label 'colobot-build' }
    5+
    options {
    6+
    buildDiscarder(logRotator(artifactDaysToKeepStr: '30', artifactNumToKeepStr: '5'))
    157
    }
    16-
    17-
    stage('Build data') {
    18-
    sh 'mkdir -p build'
    19-
    dir('build') {
    20-
    sh '''
    21-
    cmake -DCMAKE_INSTALL_PREFIX=/install -DCOLOBOT_INSTALL_DATA_DIR=/install/data ..
    22-
    make
    23-
    rm -rf install
    24-
    DESTDIR=. make install
    25-
    '''
    8+
    stages {
    9+
    stage('Check pull request target') {
    10+
    when { changeRequest() }
    11+
    steps {
    12+
    script {
    13+
    if (env.CHANGE_TARGET == 'master') {
    14+
    throw "This pull request targets the wrong branch. Please reopen the pull request targetting the dev branch."
    15+
    }
    16+
    }
    17+
    }
    18+
    }
    19+
    stage('Build data') {
    20+
    steps {
    21+
    sh 'mkdir -p build'
    22+
    dir('build') {
    23+
    sh '''
    24+
    cmake -DCMAKE_INSTALL_PREFIX=/install -DCOLOBOT_INSTALL_DATA_DIR=/install/data ..
    25+
    make
    26+
    rm -rf install
    27+
    DESTDIR=. make install
    28+
    '''
    29+
    }
    30+
    }
    2631
    }
    27-
    }
    28-
    29-
    stage('Archive data') {
    30-
    sh 'rm -f data.zip'
    31-
    zip zipFile: 'data.zip', archive: true, dir: 'build/install'
    32-
    }
    3332

    34-
    // Clean workspace after building pull requests
    35-
    // to save disk space on the Jenkins host
    36-
    if (env.BRANCH_NAME.startsWith('PR-')) {
    37-
    cleanWs()
    33+
    stage('Archive data') {
    34+
    steps {
    35+
    sh 'rm -f data.zip'
    36+
    zip zipFile: 'data.zip', archive: true, dir: 'build/install'
    37+
    }
    38+
    }
    3839
    }
    3940
    }

    help/bots/po/cs.po

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

    help/bots/po/pt.po

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

    help/cbot/E/goto.txt

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -24,7 +24,7 @@ Flight altitude for \l;winged bots\u object\botgj;. The altitude is useful only
    2424
    This parameter tells the bot how it must reach the goal:
    2525
    \c;0\n; stops exactly at the goal position
    2626
    \c;1\n; goes close to the goal position, without stopping.
    27-
    If no value is given, \c;1\n; (precision) is the default value.
    27+
    If no value is given, \c;0\n; (precision) is the default value.
    2828

    2929
    \t;Return value: \c;\l;int\u cbot\int;\n;
    3030
    Normally an error stops the program. You can prevent the program from stopping on errors by using the \c;\l;errmode\u cbot\errmode;(0)\n; instruction. A value different from zero if an error occurred is then returned by \c;goto()\n;.

    help/cbot/po/cbot.pot

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1547,7 +1547,7 @@ msgid ""
    15471547
    "This parameter tells the bot how it must reach the goal: \n"
    15481548
    "<code>0</code> stops exactly at the goal position\n"
    15491549
    "<code>1</code> goes close to the goal position, without stopping.\n"
    1550-
    "If no value is given, <code>1</code> (precision) is the default value. "
    1550+
    "If no value is given, <code>0</code> (precision) is the default value."
    15511551
    msgstr ""
    15521552

    15531553
    #. type: Plain text

    help/cbot/po/cs.po

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

    help/cbot/po/de.po

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1749,7 +1749,7 @@ msgid ""
    17491749
    "This parameter tells the bot how it must reach the goal: \n"
    17501750
    "<code>0</code> stops exactly at the goal position\n"
    17511751
    "<code>1</code> goes close to the goal position, without stopping.\n"
    1752-
    "If no value is given, <code>1</code> (precision) is the default value. "
    1752+
    "If no value is given, <code>0</code> (precision) is the default value."
    17531753
    msgstr ""
    17541754
    "Dieser Parameter gibt an, wie der Roboter die angegebene Position erreichen muss: \n"
    17551755
    "<code>0</code> Hält genau an der angegebenen Position an.\n"

    help/cbot/po/fr.po

    Lines changed: 1 addition & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -1800,7 +1800,7 @@ msgid ""
    18001800
    "This parameter tells the bot how it must reach the goal: \n"
    18011801
    "<code>0</code> stops exactly at the goal position\n"
    18021802
    "<code>1</code> goes close to the goal position, without stopping.\n"
    1803-
    "If no value is given, <code>1</code> (precision) is the default value. "
    1803+
    "If no value is given, <code>0</code> (precision) is the default value."
    18041804
    msgstr ""
    18051805
    "Normalement, une erreur stoppe l'exécution du programme. Si l'instruction <code>goto</code> est précédée de <c/><a cbot|errmode>errmode</a>(0);<n/>, une valeur nulle est retournée si tout est ok, ou valeur non nulle si une erreur est intervenue.\n"
    18061806
    "<code>== 0 </code>position atteinte\n"

    help/cbot/po/pl.po

    Lines changed: 2 additions & 2 deletions
    Original file line numberDiff line numberDiff line change
    @@ -1793,12 +1793,12 @@ msgid ""
    17931793
    "This parameter tells the bot how it must reach the goal: \n"
    17941794
    "<code>0</code> stops exactly at the goal position\n"
    17951795
    "<code>1</code> goes close to the goal position, without stopping.\n"
    1796-
    "If no value is given, <code>1</code> (precision) is the default value. "
    1796+
    "If no value is given, <code>0</code> (precision) is the default value."
    17971797
    msgstr ""
    17981798
    "Określa sposób w jaki robot powinien osiągnąć swoj cel: \n"
    17991799
    "<code>0</code> zatrzymuje się dokładnie w pozycji docelowej\n"
    18001800
    "<code>1</code> zbliża się do pozycji docelowej bez zatrzymywania się.\n"
    1801-
    "Jeśli nie określono wartości, domyślnie przyjmowane jest <code>1</code> (dokładnie). "
    1801+
    "Jeśli nie określono wartości, domyślni 473F e przyjmowane jest <code>0</code> (dokładnie)."
    18021802

    18031803
    #. type: Plain text
    18041804
    #: ../E/goto.txt:30

    0 commit comments

    Comments
     (0)
    0