Permalink
Commits on Feb 8, 2012
Commits on Feb 7, 2012
  1. Merge branch 'bugfixes' into 3.1

    * bugfixes:
      Fix ChangeLog date.
    cybersphinx committed Feb 7, 2012
  2. Fix ChangeLog date.

    cybersphinx committed Feb 7, 2012
  3. Merge branch 'bugfixes' into 3.1

    * bugfixes:
      Update ChangeLog.
      Update translations.
      Change "System message" to "Server message" for the MOTD.
      Only show "player x joined" message in the lobby when it is someone else.
      Fix libvorbis linking.
      Make research button flash more consistently.
      Always show droids in production, even if obsolete.
      Fix another research cancellation not registering in UI.
    cybersphinx committed Feb 7, 2012
  4. Update ChangeLog.

    cybersphinx committed Feb 7, 2012
  5. Update translations.

    cybersphinx committed Feb 7, 2012
  6. Fix libvorbis linking.

    Possibly fixes #2962.
    cybersphinx committed Feb 5, 2012
  7. Make research button flash more consistently.

    Flash research button, if there is a free lab and a new research becomes available, or if
    a lab becomes available and there is something to research.
    
    Stop flashing the research button, if there is nothing to research, or no free labs; for
    example, due to a lab being upgraded or destroyed.
    
    Available researches which are already being researched by an ally no longer count towards
    the button flashing.
    
    Do not randomly start flashing the research button again, even if there are still free
    labs which are not researching.
    
    Fixes ticket:1835.
    Cyp committed Feb 7, 2012
Commits on Feb 6, 2012
  1. Always show droids in production, even if obsolete.

    This allows cancelling production of obsolete droids, without cancelling all production in the factory.
    Cyp committed Feb 6, 2012
  2. Fix another research cancellation not registering in UI.

    If cancelling a research by clicking on the current research, in the research menu (not
    right-clicking on the facility), then the next completed research in the same facility
    would linger after completion.
    
    Research is cancelled twice when clicking on the current research, but was incorrectly
    registered as cancelling three times, confusing the facility. Also, when cancelling, the
    second cancellation would fail to be registered, due to the ID of the research facility
    not being sent.
    
    Fixes ticket:3130.
    Cyp committed Feb 6, 2012
  3. Merge branch 'bugfixes' into 3.1

    vexed committed Feb 6, 2012
  4. Misc fixes for netcode.

    Only kick people out once, not them, their color, and their color again.
    vexed committed Feb 6, 2012
Commits on Feb 5, 2012
  1. Fix randomly disabled teams and ready buttons.

    Teams of unallocated players affected team and ready-button availability.
    Cyp committed Feb 5, 2012
Commits on Feb 4, 2012
  1. Merge branch 'bugfixes' into 3.1

    * bugfixes:
      Update ChangeLog.
      qt script: Document problem with case sensitivity in script defined globals.
      qtscript: Do not save c++ defined special variables to the savegame.
      Quick workaround for scavs going inactive after savegame loading.
      If you save, the load, then save again, then game.scavengers value was set to false even if you have scavengers in the game, and the scavenger script context is not created, leading to an assert and lack of scavenger action in the game. Fixed.
      Update the docs for xcode builds.
      qtscript: enumBlips() isn't 3.2-only anymore.
      qtscript: Improve documentation
      Make sure we do not start multiple AIs for each player when loading a game.
      Fix desynch on offering an AI an alliance.
      When people are kicked, don't lock them out from all other games. They can't join the game they were kicked from anyway.
      Make latency guesser less optimistic.
      Improve screen while waiting for game to start.
      Hopefully make it so conflicts in the xcode project files are automatically resolved.
      qtscript: Add function enumBlips(player) to get a list of non-transient radar blips.
    cybersphinx committed Feb 4, 2012
  2. Update ChangeLog.

    cybersphinx committed Feb 4, 2012
  3. If you save, the load, then save again, then game.scavengers value wa…

    …s set to false
    
    even if you have scavengers in the game, and the scavenger script context is not
    created, leading to an assert and lack of scavenger action in the game. Fixed.
    perim committed Feb 4, 2012
  4. Update the docs for xcode builds.

    Also restructure the script so it will require less changes in the future.
    dak180 committed Feb 4, 2012
  5. qtscript: Improve documentation

    perim committed Feb 3, 2012
  6. Fix desynch on offering an AI an alliance.

    Only triggers in the rarely-used 'Allow Alliances' game mode, in games with AIs. When
    offering an AI an alliance, the AI would sometimes accept instantly, and the acceptance
    was not synchronised.
    Cyp committed Feb 4, 2012
  7. 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 committed with Cyp Sep 4, 2010
  8. 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 3, 2012
  9. 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 3, 2012
  10. 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 3, 2012
  11. 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
  12. 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