Commits on Dec 12, 2013

  1. Use the tag for 3.1.1 not 3.1! 

    Revert "Bump version for 3.1.1 (final)"

This reverts commit f6e8dad.
    @vexed
    vexed committed Dec 12, 2013
    Configuration menu
    Copy the full SHA
    b4a49b3 View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2013

  1. An attempt to make Nexus and Semperfi no longer leave modules unfinis… 

    …hed.

(cherry picked from commit f50c036)
    @haoNoQ
    haoNoQ committed Dec 22, 2013
    Configuration menu
    Copy the full SHA
    f454eae View commit details
    Browse the repository at this point in the history

  2. Make sure the AI no longer gets stuck with no power in new starting c… 

    …onditions.
    @haoNoQ
    haoNoQ committed Dec 22, 2013
    1 Configuration menu
    Copy the full SHA
    643bab9 View commit details
    Browse the repository at this point in the history

  3. Updated textures and models by Christian Scholz (cnceo), and tcmasked… 

    … VTOL pad by Berg.
    @perim
    perim committed Dec 22, 2013
    Configuration menu
    Copy the full SHA
    90f9ef0 View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2014

  1. Fix path concatenation bug in CheckInMap, don't forget to check out t… 

    …he skirmish folder.
    @haoNoQ
    haoNoQ committed Jan 19, 2014
    Configuration menu
    Copy the full SHA
    016b717 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2014

  1. Merge branch 'newbugfixes' into 3.1

    @cybersphinx
    automerge authored and cybersphinx committed Jan 20, 2014
    Configuration menu
    Copy the full SHA
    af2a6b3 View commit details
    Browse the repository at this point in the history

Commits on Jan 27, 2014

  1. Merge branch 'newbugfixes' into bugfixes

    @vexed
    vexed committed Jan 27, 2014
    Configuration menu
    Copy the full SHA
    e0dd069 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2014

  1. Merge branch 'bugfixes' into 3.1

    @cybersphinx
    automerge authored and cybersphinx committed Jan 31, 2014
    Configuration menu
    Copy the full SHA
    ea1b7da View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2014

  1. Place newly produced droids correctly when building is rotated.

    @haoNoQ
    haoNoQ committed Feb 6, 2014
    Configuration menu
    Copy the full SHA
    19c16ed View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2014

  1. Merge branch 'bugfixes' into 3.1

    @cybersphinx
    automerge authored and cybersphinx committed Feb 10, 2014
    Configuration menu
    Copy the full SHA
    b2e3b0e View commit details
    Browse the repository at this point in the history

Commits on Jun 16, 2014

  1. Fix some issues for different compilers. 

    NOTE to VS users:
If you installed git, so it is part of your system path, then there is
no need to change anything.  If not, then, you need to edit
build_tools/autorevision.bat, and fix the PATH statement to point to where you installed git.
    @vexed
    vexed committed Jun 16, 2014
    Configuration menu
    Copy the full SHA
    ae58541 View commit details
    Browse the repository at this point in the history

  2. Fix: 

    C6289    Mutual exclusion over logical-OR is true.
Incorrect operator: mutual exclusion over || is always a non-zero constant.

(Make sure it is a wall, before we skip it.)
    @vexed
    vexed committed Jun 16, 2014
    Configuration menu
    Copy the full SHA
    b562feb View commit details
    Browse the repository at this point in the history

  3. [backport fix commit 144c2e3] 

    Fix feature creation to have the actual feature selected, and not the
first feature of the same type.
Show the pies instead of the '?' button for features (debug menu!)

Closes ticket:4166
    @vexed
    vexed committed Jun 16, 2014
    Configuration menu
    Copy the full SHA
    67df2f2 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'bugfixes' into 3.1

    @vexed
    vexed committed Jun 16, 2014
    Configuration menu
    Copy the full SHA
    2298ef6 View commit details
    Browse the repository at this point in the history

Commits on Sep 23, 2014

  1. Fix throttling of danger function. It was only supposed to do work every 

    GAME_TICKS_FOR_DANGER ticks, but last call time was never saved. Patch by NoQ.
Closes ticket:4212
    @perim
    perim committed Sep 23, 2014
    Configuration menu
    Copy the full SHA
    9827d7a View commit details
    Browse the repository at this point in the history

  2. Stop Auto-repair from repairing unfinished structures. Patch by Kreuvf. 

    Closes ticket:4205.
    @perim
    perim committed Sep 23, 2014
    1 Configuration menu
    Copy the full SHA
    8f7b9c8 View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2014

  1. Merge branch 'bugfixes' into 3.1

    @cybersphinx
    automerge authored and cybersphinx committed Sep 26, 2014
    Configuration menu
    Copy the full SHA
    c356b59 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2014

  1. Fix an fsanitize=address warning. Patch by NoQ.

    @perim
    perim committed Sep 27, 2014
    Configuration menu
    Copy the full SHA
    b7ee637 View commit details
    Browse the repository at this point in the history

  2. No longer need to enforce a 255 max limit on number of structure types.

    @perim
    perim committed Sep 27, 2014
    Configuration menu
    Copy the full SHA
    9236bae View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2014

  1. Merge branch 'bugfixes' into 3.1

    @cybersphinx
    automerge authored and cybersphinx committed Sep 29, 2014
    Configuration menu
    Copy the full SHA
    ec43ce8 View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2014

  1. cleanup the autorevision.h.new file when it is not moved to replace a… 

    …utorevision.h

Patch by rbt
closes ticket:4018
    @vexed
    vexed committed Oct 1, 2014
    Configuration menu
    Copy the full SHA
    a81330d View commit details
    Browse the repository at this point in the history

  2. Put back debug line that was incorrectly removed.

    @vexed
    vexed committed Oct 1, 2014
    Configuration menu
    Copy the full SHA
    3b45165 View commit details
    Browse the repository at this point in the history

  3. Fix string subscript out of range.

    @vexed
    vexed committed Oct 1, 2014
    Configuration menu
    Copy the full SHA
    3fadd3c View commit details
    Browse the repository at this point in the history

  4. Fix vector subscript out of range.

    @vexed
    vexed committed Oct 1, 2014
    Configuration menu
    Copy the full SHA
    d9071fd View commit details
    Browse the repository at this point in the history

  5. Fix iterator erasing from std::list 

    Fix data race condition.
Fixes ticket:4213
Fixes ticket:3228
    @vexed
    vexed committed Oct 1, 2014
    Configuration menu
    Copy the full SHA
    4986580 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'bugfixes' into 3.1

    @vexed
    vexed committed Oct 1, 2014
    Configuration menu
    Copy the full SHA
    a642a79 View commit details
    Browse the repository at this point in the history

Commits on Oct 12, 2014

  1. Fix some uses of undefined values and integer overflow. Closes ticket… 

    …:4216
    @perim
    perim committed Oct 12, 2014
    Configuration menu
    Copy the full SHA
    cdadf82 View commit details
    Browse the repository at this point in the history

Commits on Oct 13, 2014

  1. Merge branch 'bugfixes' into 3.1

    @cybersphinx
    automerge authored and cybersphinx committed Oct 13, 2014
    Configuration menu
    Copy the full SHA
    7364a77 View commit details
    Browse the repository at this point in the history

Commits on Oct 25, 2014

  1. Fix CC issues to resolve trying to link to shared libs instead of sta… 

    …tic. Remove functions that are now integrated with the new CC.

This commit is ONLY for the Cross-Compiler.
Nothing else should be affected by these changes.
    @vexed
    vexed committed Oct 25, 2014
    Configuration menu
    Copy the full SHA
    a41b6e2 View commit details
    Browse the repository at this point in the history

Commits on Oct 26, 2014

  1. Merge branch 'bugfixes' into 3.1

    @vexed
    vexed committed Oct 26, 2014
    Configuration menu
    Copy the full SHA
    4fd9e08 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2014

  1. Remove severely outdated build system that doesn't work 

        and wasn't maintained.
    @vexed
    vexed committed Oct 28, 2014
    Configuration menu
    Copy the full SHA
    437c672 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'bugfixes' into 3.1

    @vexed
    vexed committed Oct 28, 2014
    Configuration menu
    Copy the full SHA
    cb2515c View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2014

  1. remove useless conditional.

    @vexed
    vexed committed Nov 10, 2014
    Configuration menu
    Copy the full SHA
    8065c2f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'bugfixes' into 3.1

    @vexed
    vexed committed Nov 10, 2014
    Configuration menu
    Copy the full SHA
    b45a382 View commit details
    Browse the repository at this point in the history

Commits on Nov 11, 2014

  1. Don't allow the transporter to get oil (or any other feature) on camp… 

    …aign games.
    @vexed
    vexed committed Nov 11, 2014
    Configuration menu
    Copy the full SHA
    5496352 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'bugfixes' into 3.1

    @vexed
    vexed committed Nov 11, 2014
    Configuration menu
    Copy the full SHA
    d00686c View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2014

  1. Revert "Don't allow the transporter to get oil (or any other feature)… 

    … on campaign games."

Redoing this another way, see transporter cleanup patch.

This reverts commit 5496352.
    @vexed
    vexed committed Nov 12, 2014
    Configuration menu
    Copy the full SHA
    eaec05d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'bugfixes' into 3.1

    @vexed
    vexed committed Nov 12, 2014
    Configuration menu
    Copy the full SHA
    48f6d91 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2014

  1. Transporter cleanup. 

    Using isTransporter() instead of psDroid->droidType == DROID_TRANSPORTER || psDroid->droidType == DROID_SUPERTRANSPORTER.

There should be no logic changes in this patch.
closes ticket:4246
    @vexed
    vexed committed Nov 13, 2014
    Configuration menu
    Copy the full SHA
    93c18a2 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'bugfixes' into 3.1

    @vexed
    vexed committed Nov 13, 2014
    Configuration menu
    Copy the full SHA
    f8c25de View commit details
    Browse the repository at this point in the history

  3. Don't allow transporters to pick up oil/artifacts either. 

    refs ticket:4246
    @vexed
    vexed committed Nov 13, 2014
    Configuration menu
    Copy the full SHA
    c36361b View commit details
    Browse the repository at this point in the history

  4. Merge branch 'bugfixes' into 3.1

    @vexed
    vexed committed Nov 13, 2014
    Configuration menu
    Copy the full SHA
    b44a4fd View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2014

  1. Update pt_BRO translation by Tucalipe 

    closes ticket #4164
    @vexed
    vexed committed Dec 15, 2014
    Configuration menu
    Copy the full SHA
    b94b1f6 View commit details
    Browse the repository at this point in the history

  2. Update it.po by Alpha93 

    closes ticket #4174
    @vexed
    vexed committed Dec 15, 2014
    Configuration menu
    Copy the full SHA
    8ce802d View commit details
    Browse the repository at this point in the history

  3. Update el.po by Nikos 

    closes ticket #3703
    @vexed
    vexed committed Dec 15, 2014
    Configuration menu
    Copy the full SHA
    8792f5b View commit details
    Browse the repository at this point in the history

  4. Update hu.po by MeszarosTomi 

    Note to updater, keep line endings the same as the original,
and also name the po file correctly as well.

closes ticket #4250
    @vexed
    vexed committed Dec 15, 2014
    Configuration menu
    Copy the full SHA
    65317d8 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'bugfixes' into 3.1

    @vexed
    vexed committed Dec 15, 2014
    Configuration menu
    Copy the full SHA
    6be3d7e View commit details
    Browse the repository at this point in the history

  6. make -Cpo update-po

    @vexed
    vexed committed Dec 15, 2014
    Configuration menu
    Copy the full SHA
    4ffa4a5 View commit details
    Browse the repository at this point in the history

  7. Bump version for 3.1.2 (RC) 

        [NOTE: no tags for this one!]

    (cherry picked from commit 816556d)
    (cherry picked from commit f6e8dad)

    Conflicts:
    	win32/warzone2100_portable.rc
    @vexed
    vexed committed Dec 15, 2014
    Configuration menu
    Copy the full SHA
    67f5e85 View commit details
    Browse the repository at this point in the history

Commits on Dec 22, 2014

  1. Revert this to make buildbot happy once again. 

    Revert "Bump version for 3.1.2 (RC)"

This reverts commit 67f5e85.
    @vexed
    vexed committed Dec 22, 2014
    Configuration menu
    Copy the full SHA
    a0c3fcf View commit details
    Browse the repository at this point in the history