Commits on Jan 30, 2012

  1. Fix crash in semperfi-js

    perim committed Jan 30, 2012
    Configuration menu
    Copy the full SHA
    406d744 View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2012

  1. Actually initialize SDL paste system somewhere.

    Got lost with the move into lib/sdl. Fixes #3091.
    cybersphinx committed Jan 31, 2012
    Configuration menu
    Copy the full SHA
    de3a411 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    395cb1b View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2012

  1. Configuration menu
    Copy the full SHA
    5506dae View commit details
    Browse the repository at this point in the history
  2. Remove redundant dependency for version.o.

    Prevents autorevision.h from being built twice.
    cybersphinx committed Feb 1, 2012
    Configuration menu
    Copy the full SHA
    26cfcb8 View commit details
    Browse the repository at this point in the history
  3. Remove hg stuff from autorevision.sh.

    Can possibly break stuff as mentioned in
    http://forums.wz2100.net/viewtopic.php?p=93700#p93700, and any hashes
    are meaningless and possibly confusing anyway since we use git.
    cybersphinx committed Feb 1, 2012
    Configuration menu
    Copy the full SHA
    a1e6011 View commit details
    Browse the repository at this point in the history
  4. Merge branch 'bugfixes'

    * bugfixes:
      Remove hg stuff from autorevision.sh.
      Remove redundant dependency for version.o.
      Move WZ_WRITEDIR to frame.h and use it for the crashdumps as well.
      Disentangle some Mac includes.
      Actually initialize SDL paste system somewhere.
      Update ChangeLog.
    cybersphinx committed Feb 1, 2012
    Configuration menu
    Copy the full SHA
    8294e0b View commit details
    Browse the repository at this point in the history
  5. Revert "Remove hg stuff from autorevision.sh."

    This reverts commit a1e6011.
    
    Sorry, didn't actually intend to push this.
    cybersphinx committed Feb 1, 2012
    Configuration menu
    Copy the full SHA
    b8278a8 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    1759623 View commit details
    Browse the repository at this point in the history
  7. Add the error tag back.

    This way message will actually show up in xcode builds if reached.
    dak180 committed Feb 1, 2012
    Configuration menu
    Copy the full SHA
    699c83a View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    20134c2 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    09a8817 View commit details
    Browse the repository at this point in the history
  10. 1 Configuration menu
    Copy the full SHA
    6f7e523 View commit details
    Browse the repository at this point in the history
  11. Configuration menu
    Copy the full SHA
    d61aa20 View commit details
    Browse the repository at this point in the history
  12. Configuration menu
    Copy the full SHA
    e299040 View commit details
    Browse the repository at this point in the history
  13. Configuration menu
    Copy the full SHA
    1f83c84 View commit details
    Browse the repository at this point in the history
  14. Fix cross-compilation.

    Broken in 5506dae, which was supposed
    to fix #3108.
    cybersphinx committed Feb 1, 2012
    Configuration menu
    Copy the full SHA
    1b0a7b7 View commit details
    Browse the repository at this point in the history
  15. Merge branch 'bugfixes'

    * bugfixes:
      Fix cross-compilation.
      Add assert for droids added to wrong group.
      qtscript: Try harder not to crash if we fail to load our script context.
      Fix ticket:3094 unit designs in factory menu not appearing when saving and loading.
    cybersphinx committed Feb 1, 2012
    Configuration menu
    Copy the full SHA
    2a39eac View commit details
    Browse the repository at this point in the history
  16. Merge branch 'bugfixes' into 3.1

    * bugfixes:
      Fix cross-compilation.
      Add assert for droids added to wrong group.
      qtscript: Try harder not to crash if we fail to load our script context.
      Fix ticket:3094 unit designs in factory menu not appearing when saving and loading.
      Better repo detection for autorevision.sh.
      Revert "Remove hg stuff from autorevision.sh."
      Remove hg stuff from autorevision.sh.
      Remove redundant dependency for version.o.
      Move WZ_WRITEDIR to frame.h and use it for the crashdumps as well.
      Disentangle some Mac includes.
      Actually initialize SDL paste system somewhere.
      Fix crash in semperfi-js
    
    Conflicts:
    	src/main.cpp
    cybersphinx committed Feb 1, 2012
    Configuration menu
    Copy the full SHA
    e756e7f View commit details
    Browse the repository at this point in the history
  17. Configuration menu
    Copy the full SHA
    9c1bb0c View commit details
    Browse the repository at this point in the history
  18. Don't assume Xcode's build products are in the source tree.

    Fixes builds in Xcode 4 with the default external
    derived data directory.
    nanotech committed Feb 1, 2012
    Configuration menu
    Copy the full SHA
    1ea990e View commit details
    Browse the repository at this point in the history
  19. Configuration menu
    Copy the full SHA
    c6a37b4 View commit details
    Browse the repository at this point in the history
  20. Add the error tag back.

    This way message will actually show up in xcode builds if reached.
    dak180 committed Feb 1, 2012
    Configuration menu
    Copy the full SHA
    7cc9072 View commit details
    Browse the repository at this point in the history
  21. Configuration menu
    Copy the full SHA
    15d0fc5 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2012

  1. Configuration menu
    Copy the full SHA
    f273c9d View commit details
    Browse the repository at this point in the history
  2. Get all of the scripts that are likely to change with any regularity …

    …out of the xcode project.
    dak180 committed Feb 2, 2012
    Configuration menu
    Copy the full SHA
    c5d4acf View commit details
    Browse the repository at this point in the history
  3. Misc Xcode Fixes

     Xcode (4, at least) parses out the 'error:'s in the log and halts the build. This is probably not what was intended.
    
    * nanotech/topic/xcode4-fixes:
      OS X: Fetching new build dependency versions is not an error.
      Don't assume Xcode's build products are in the source tree.
    dak180 committed Feb 2, 2012
    Configuration menu
    Copy the full SHA
    3c9b149 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    44d8bf7 View commit details
    Browse the repository at this point in the history
  5. Fix the help bundle.

    The info.plist file is now once again included in the bundle.
    dak180 committed Feb 2, 2012
    Configuration menu
    Copy the full SHA
    fb7c7cc View commit details
    Browse the repository at this point in the history
  6. Add OS X help menu items for the man page and scripting docs.

    Closes #3109.
    
    * nanotech/topic/help-menu-links:
      Add OS X help menu items for the man page and scripting docs.
    dak180 committed Feb 2, 2012
    Configuration menu
    Copy the full SHA
    9dfe04a View commit details
    Browse the repository at this point in the history
  7. Merge branch 'bugfixes' into 'master'.

    * bugfixes:
      Fix the help bundle.
      Bring back the WarzoneHelp info.plist which was lost in the shuffle.
      Get all of the scripts that are likely to change with any regularity out of the xcode project.
      OS X: Fetching new build dependency versions is not an error.
      Don't assume Xcode's build products are in the source tree.
      Add OS X help menu items for the man page and scripting docs.
    dak180 committed Feb 2, 2012
    Configuration menu
    Copy the full SHA
    6ceb3d7 View commit details
    Browse the repository at this point in the history
  8. Merge branch 'bugfixes' into 3.1

    * bugfixes:
      Fix the help bundle.
      Bring back the WarzoneHelp info.plist which was lost in the shuffle.
      Get all of the scripts that are likely to change with any regularity out of the xcode project.
      OS X: Fetching new build dependency versions is not an error.
      Don't assume Xcode's build products are in the source tree.
      Add OS X help menu items for the man page and scripting docs.
      Simplify dependencies in the xcode build.
    
    Conflicts:
    	macosx/Warzone.xcodeproj/project.pbxproj
    dak180 committed Feb 2, 2012
    Configuration menu
    Copy the full SHA
    ea820dc View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    0b1fbf7 View commit details
    Browse the repository at this point in the history
  10. Configuration menu
    Copy the full SHA
    78dee1c View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2012

  1. Add general rules script for the campaign.

    Enable design and minimap only when an HQ exists.
    cybersphinx committed Feb 3, 2012
    Configuration menu
    Copy the full SHA
    4a71db9 View commit details
    Browse the repository at this point in the history
  2. Set radarOnScreen to true by default.

    Otherwise when loading a campaign game with HQ the minimap is missing.
    cybersphinx committed Feb 3, 2012
    Configuration menu
    Copy the full SHA
    1d123df View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    224c1c8 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    22056fb View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2012

  1. Configuration menu
    Copy the full SHA
    4072208 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    7f7390c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0e107e7 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    7859582 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    32a7fe7 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    9185340 View commit details
    Browse the repository at this point in the history
  7. Merge branch 'bugfixes'

    * bugfixes:
      Check if we actually need to hide widgets before hiding them
      Fix player counts for both AI & humans & 'closed' slots in MP games
      Should fix indicator for loading, skirmish & MP screens. fixes ticket:3104
      Fix calling batch file for autorevision.sh script refs: 1759623
      Don't go past the map's player limits when allocating players. fixes ticket:3089
      Fix issues that were overlooked from the revert(s) in ac550ac
      qtscript: Add a note about local variables to the documentation.
      Splice in the Changelog from 2.3.
      Set radarOnScreen to true by default.
      Add general rules script for the campaign.
      Run eventStartLevel always, not only for skirmish.
    cybersphinx committed Feb 4, 2012
    Configuration menu
    Copy the full SHA
    73ec38c View commit details
    Browse the repository at this point in the history
  8. Merge branch 'bugfixes' into 3.1

    * bugfixes:
      Check if we actually need to hide widgets before hiding them
      Fix player counts for both AI & humans & 'closed' slots in MP games
      Should fix indicator for loading, skirmish & MP screens. fixes ticket:3104
      Fix calling batch file for autorevision.sh script refs: 1759623
      Don't go past the map's player limits when allocating players. fixes ticket:3089
      Fix issues that were overlooked from the revert(s) in ac550ac
      qtscript: Add a note about local variables to the documentation.
      Splice in the Changelog from 2.3.
      Set radarOnScreen to true by default.
      Add general rules script for the campaign.
      Run eventStartLevel always, not only for skirmish.
    cybersphinx committed Feb 4, 2012
    Configuration menu
    Copy the full SHA
    74c3a89 View commit details
    Browse the repository at this point in the history
  9. Hopefully make it so conflicts in the xcode project files are automat…

    …ically resolved.
    
    This is done by making them not actually merge (it still will need to be done though just by hand on a platform where it can be tested).
    dak180 committed Feb 4, 2012
    Configuration menu
    Copy the full SHA
    d9010d1 View commit details
    Browse the repository at this point in the history
  10. Improve screen while waiting for game to start.

    Always display the chat console, instead of only flashing it while pressing Esc
    repeatedly. Fix weird font sizes. Show which players have loaded so far. Show
    joining status for everyone, not just the host.
    Cyp committed Feb 4, 2012
    Configuration menu
    Copy the full SHA
    fc708d6 View commit details
    Browse the repository at this point in the history
  11. Make latency guesser less optimistic.

    Hopefully reduces Zzz microfreezes a bit, in the case of laggy connections.
    
    There's probably a better way of guessing latency than this, but it works for now.
    Cyp committed Feb 4, 2012
    Configuration menu
    Copy the full SHA
    8ab7ba7 View commit details
    Browse the repository at this point in the history
  12. When people are kicked, don't lock them out from all other games.

    They can't join the game they were kicked from anyway.
    
    (cherry picked from commit 370ce6c)
    buginator authored and Cyp committed Feb 4, 2012
    Configuration menu
    Copy the full SHA
    415f6fe View commit details
    Browse the repository at this point in the history