Skip to content
Commits on Aug 25, 2012
  1. @vexed

    Remove unneeded comment.

    vexed committed
Commits on Aug 24, 2012
  1. @Subsentient @Cyp
  2. @cybersphinx

    Merge branch 'bugfixes' into 3.1

    automerge committed with cybersphinx
Commits on Aug 21, 2012
  1. @Cyp

    Allow researching topics which labs being upgraded are already resear…

    Cyp committed
    …ching.
    
    If researching Kittens Mk2 in lab A, then Kittens Mk2 is unavailable for research in other labs. If upgrading lab
    A, then Kittens Mk2 now becomes available for research in other labs, for the duration of lab A's upgrade. If
    choosing Kittens Mk2 in lab B, then the research of Kittens Mk2 is cancelled in lab A, and the user must manually
    select a new research topic for the lab, such as Puppies Mk3. Otherwise, lab A continues researching Kittens Mk2
    once lab A is done upgrading, as usual. The same applies if lab A is being demolished, except that lab A cannot
    continue researching after it has been demolished.
    
    This is especially useful in the case of a lab upgrade being delayed due to loss of trucks.
  2. @Cyp

    Update disabled uplink and lassat icons.

    Berg committed with Cyp
Commits on Aug 20, 2012
  1. @cybersphinx

    Revert "Update translations."

    cybersphinx committed
    This reverts commit bd10888.
  2. @cybersphinx

    Revert "Update version numbers for 3.1 rc2."

    cybersphinx committed
    This reverts commit a8d00ed.
  3. @cybersphinx
  4. @cybersphinx

    Update translations.

    cybersphinx committed
  5. @cybersphinx

    Merge branch 'bugfixes' into 3.1

    automerge committed with cybersphinx
Commits on Aug 19, 2012
  1. @dak180
  2. @cybersphinx

    French translation update by Amiral JCDG.

    cybersphinx committed
    Closes #3671.
Commits on Aug 18, 2012
  1. @cybersphinx

    Merge branch 'bugfixes' into 3.1

    cybersphinx committed
    * bugfixes:
      Default to xz compression for make dist.
      Update translations.
  2. @cybersphinx

    Default to xz compression for make dist.

    cybersphinx committed
    Also set xz options to the xz default -6, since the automake default -e
    is noticeably slower without noticeably better compression. Fixes #3492.
  3. @dak180

    Disable translations below 80% on the mac.

    dak180 committed
    Refs #3136.
  4. @cybersphinx

    Disable translations below 80%.

    cybersphinx committed
    Closes #3136.
  5. @cybersphinx

    Update translations.

    cybersphinx committed
Commits on Aug 13, 2012
  1. @cybersphinx

    Merge branch 'bugfixes' into 3.1

    automerge committed with cybersphinx
Commits on Aug 11, 2012
  1. @Cyp

    Use std::multiset::iterator instead of std::set::iterator with std::m…

    Cyp committed
    …ultiset.
    
    Apparently, the iterators were compatible, in some library implementations.
Commits on Aug 10, 2012
  1. @vexed
  2. @vexed

    Revert "Fix reported [-Werror=format] issue."

    vexed committed
    This reverts commit 0bfee18.
  3. @cybersphinx

    Merge branch 'bugfixes' into 3.1

    automerge committed with cybersphinx
Commits on Aug 8, 2012
  1. @perim

    Update ChangeLog

    perim committed
  2. @perim

    Fix missing decals in Rocky Mountains tileset that were specially mad…

    perim committed
    …e for it
    
    but never mentioned in the rockiedecals.txt file. It also fixes the ground
    types of certain urban and rocky tiles to resemble the old 2.3 terrain more
    exactly. Patch by NoQ. Closes ticket:3621
Commits on Aug 7, 2012
  1. @cybersphinx

    Revert "Update translations."

    cybersphinx committed
    This reverts commit adbabfa.
  2. @cybersphinx

    Revert "Update version numbers for 3.1 rc1."

    cybersphinx committed
    This reverts commit aa20a4f.
  3. @cybersphinx
  4. @cybersphinx

    Update translations.

    cybersphinx committed
Commits on Aug 6, 2012
  1. @cybersphinx

    Merge branch 'bugfixes' into 3.1

    cybersphinx committed
    * bugfixes:
      Add files missing from 1e5fafa.
      Add header for std::sort.
  2. @Cyp

    Add files missing from 1e5fafa.

    Cyp committed
    Fixes ticket:3646.
  3. @Cyp

    Add header for std::sort.

    Cyp committed
  4. @cybersphinx

    Merge branch 'bugfixes' into 3.1

    automerge committed with cybersphinx
Commits on Aug 5, 2012
  1. @Cyp
  2. @Cyp

    Split frontend*.png and intfac*.png into individual images.

    Cyp committed
    The images are now combined into texture pages at runtime.
    
    This should simplify adding/removing images.
  3. @Cyp

    Correctly handle interface image texture pages which are not 256x256.

    Cyp committed
    Game logo now appears full size.
Something went wrong with that request. Please try again.