Loading

Paste #px0casfiw

  1. * 652e9f8 (HEAD, n2) x4
  2. * 14a3355 x3
  3. * bc1d38c (n1) x2
  4. * 213d86d x1
  5. * 0f2048e (master) name1

Paste #pvpcqhw1f

  1. $ git lg | head -5
  2. * d07bf7a (HEAD, name2) vflavkbat
  3. * c85f14a (name1) cvfras
  4. * da2ef1b name1
  5. *   3da2349 (upstream/master) Merge pull request #89 from Alberth289346/rework_shop_placer

Paste #puqda0dcf

  1. diff -r 5a280b359966 Makefile
  2. --- a/Makefile  Sun May 31 16:09:34 2015 +0100
  3. +++ b/Makefile  Sun May 31 20:46:51 2015 +0100
  4. @@ -25,10 +25,10 @@
  5.  BASE_FILENAME       ?= mynewgrf

Paste #puzjzi0kx

  1. * f5113b5 (HEAD, origin/transparent_build, transparent_build) Feature: Make new shop semi-transparent.
  2. * cd4a13e Add: Semi-transparent gradient shift mode.
  3.                        <--- here I need a new commit
  4. *   3da2349 (upstream/master, master) Merge pull request #89 from Alberth289346/rework_shop_placer
  5. |\

Paste #pls2rd6ad

  1. diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp
  2. index a66f6fe..bcfbe41 100644
  3. --- a/src/toolbar_gui.cpp
  4. +++ b/src/toolbar_gui.cpp
  5. @@ -236,10 +236,10 @@ public:

Paste #pbl35qpli

  1. """
  2. Meta information about languages.
  3. """
  4. from collections import namedtuple
  5. import os, re, sys

Paste #ptgysfcco

  1. #define TILE_DISALLOW_SLOPES(name, errtext, next) \
  2. switch (FEAT_INDUSTRYTILES, SELF, THIS_ID(name),  \
  3.                                                   ( \
  4.                                                   nearby_tile_height(-1 * relative_x, -1 * relative_y) \
  5.                                                   + (nearby_tile_slope(-1 * relative_x, -1 * relative_y) \

Paste #pfmzadhgu

  1. The string codes
  2. CARGO_LONG CARGO_SHORT CARGO_TINY
  3. take two parameters:
  4. 1. Cargo type Id
  5. 2. Cargo amount

Paste #pvcko8qz5

  1. diff -r 614b4710dc7e webtranslate/newgrf/language_file.py
  2. --- a/webtranslate/newgrf/language_file.py  Wed May 27 19:44:13 2015 +0200
  3. +++ b/webtranslate/newgrf/language_file.py  Thu May 28 17:59:54 2015 +0200
  4. @@ -34,7 +34,7 @@
  5.  gender_assign_pat = re.compile('{G *= *([^ }]+) *}')

Paste #ponhg7ag6

  1. diff -r 614b4710dc7e webtranslate/newgrf/language_file.py
  2. --- a/webtranslate/newgrf/language_file.py  Wed May 27 19:44:13 2015 +0200
  3. +++ b/webtranslate/newgrf/language_file.py  Wed May 27 19:52:12 2015 +0200
  4. @@ -869,7 +869,9 @@
  5.          if line.startswith(bom):

Paste #pguqqq4ko

  1. diff -r 7f4f864f4e20 webtranslate/newgrf/language_file.py
  2. --- a/webtranslate/newgrf/language_file.py  Tue May 26 21:59:05 2015 +0200
  3. +++ b/webtranslate/newgrf/language_file.py  Wed May 27 19:30:19 2015 +0200
  4. @@ -420,7 +420,7 @@
  5.      @type plurals: C{list} of C{int}

Paste #pvqtvtuku

  1. diff -r 7f4f864f4e20 webtranslate/newgrf/language_file.py
  2. --- a/webtranslate/newgrf/language_file.py  Tue May 26 21:59:05 2015 +0200
  3. +++ b/webtranslate/newgrf/language_file.py  Wed May 27 19:11:47 2015 +0200
  4. @@ -420,7 +420,7 @@
  5.      @type plurals: C{list} of C{int}

Paste #pati5pwnd

  1. Index: english.txt
  2. ===================================================================
  3. --- english.txt (revision 27291)
  4. +++ english.txt (working copy)
  5. @@ -927,10 +927,6 @@

Paste #pjqsu4obu

  1. diff -r 5526d64e6def webtranslate/newgrf/language_file.py
  2. --- a/webtranslate/newgrf/language_file.py  Mon May 25 17:14:35 2015 +0200
  3. +++ b/webtranslate/newgrf/language_file.py  Mon May 25 17:59:35 2015 +0200
  4. @@ -420,7 +420,7 @@
  5.      @type plurals: C{list} of C{int}

Paste #peyx5a7e6

  1. diff -r 5526d64e6def webtranslate/newgrf/language_file.py
  2. --- a/webtranslate/newgrf/language_file.py  Mon May 25 17:14:35 2015 +0200
  3. +++ b/webtranslate/newgrf/language_file.py  Mon May 25 17:57:51 2015 +0200
  4. @@ -420,7 +420,7 @@
  5.      @type plurals: C{list} of C{int}