Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 500580717937e94793b7c816842384a910f5e658
      
https://github.com/Warzone2100/warzone2100/commit/500580717937e94793b7c816842384a910f5e658
  Author: vexed <[email protected]>
  Date:   2012-04-23 (Mon, 23 Apr 2012)

  Changed paths:
    M src/structure.cpp

  Log Message:
  -----------
  Clarify when we reach unit cap.


  Commit: 84117025e0faabe0543c1181d8987fc2dcccf358
      
https://github.com/Warzone2100/warzone2100/commit/84117025e0faabe0543c1181d8987fc2dcccf358
  Author: vexed <[email protected]>
  Date:   2012-04-23 (Mon, 23 Apr 2012)

  Changed paths:
    M src/multigifts.cpp

  Log Message:
  -----------
  Specify which wrong player was trying to give a gift


  Commit: 62da559ebe7fbb0ede9592b4b5d9382fecd9ef09
      
https://github.com/Warzone2100/warzone2100/commit/62da559ebe7fbb0ede9592b4b5d9382fecd9ef09
  Author: vexed <[email protected]>
  Date:   2012-04-23 (Mon, 23 Apr 2012)

  Changed paths:
    M src/mission.cpp

  Log Message:
  -----------
  Disable being shown the option to save at the end of the mission (in the 
mission summary screen), this is a work around for a flaw in the level loading 
code in some levels. Also disable autosaves, for the same problem. refs #3377


  Commit: 3228514dad2729e919340338020d1fecd1ca98f2
      
https://github.com/Warzone2100/warzone2100/commit/3228514dad2729e919340338020d1fecd1ca98f2
  Author: vexed <[email protected]>
  Date:   2012-04-23 (Mon, 23 Apr 2012)

  Changed paths:
    M src/map.cpp

  Log Message:
  -----------
  Cleanup leaks in floodbucket

refs #3395


  Commit: 2a7a8acc7d78029b934b0682cb8756f0b74a1747
      
https://github.com/Warzone2100/warzone2100/commit/2a7a8acc7d78029b934b0682cb8756f0b74a1747
  Author: vexed <[email protected]>
  Date:   2012-04-23 (Mon, 23 Apr 2012)

  Changed paths:
    M src/main.cpp

  Log Message:
  -----------
  Cleanup leaks in UTF conversion of command line (windows only) refs #3395


  Commit: 7d5315e3ee01cf255ac5a057517ef4b905a2dbd2
      
https://github.com/Warzone2100/warzone2100/commit/7d5315e3ee01cf255ac5a057517ef4b905a2dbd2
  Author: vexed <[email protected]>
  Date:   2012-04-23 (Mon, 23 Apr 2012)

  Changed paths:
    M src/frontend.cpp
    M src/main.cpp

  Log Message:
  -----------
  Move NETinit() routines to better location

refs #3395


  Commit: 2d5f8587b938439b11f2e8f815f7c17f46ee77c4
      
https://github.com/Warzone2100/warzone2100/commit/2d5f8587b938439b11f2e8f815f7c17f46ee77c4
  Author: vexed <[email protected]>
  Date:   2012-04-23 (Mon, 23 Apr 2012)

  Changed paths:
    M lib/netplay/netplay.cpp
    M lib/netplay/netqueue.cpp
    M lib/netplay/netqueue.h
    M lib/netplay/nettypes.cpp
    M lib/netplay/nettypes.h

  Log Message:
  -----------
  Cleanup some leaks in the NET* routines.

refs #3395


  Commit: d8789661fbffe2f648a06a0689de3a9350bbe8b0
      
https://github.com/Warzone2100/warzone2100/commit/d8789661fbffe2f648a06a0689de3a9350bbe8b0
  Author: vexed <[email protected]>
  Date:   2012-04-23 (Mon, 23 Apr 2012)

  Changed paths:
    M src/frontend.cpp
    M src/frontend.h
    M src/ingameop.cpp
    M src/ingameop.h
    M src/loadsave.cpp
    M src/loadsave.h
    M src/main.cpp

  Log Message:
  -----------
  Savegames are now stored by type. Campaign saves are located in 
savegames/campaign/ Skirmish saves are located in savegames/skirmish/


  Commit: 28c10b00a8f3bf6d87176e3aba8fba65993cedba
      
https://github.com/Warzone2100/warzone2100/commit/28c10b00a8f3bf6d87176e3aba8fba65993cedba
  Author: vexed <[email protected]>
  Date:   2012-04-23 (Mon, 23 Apr 2012)

  Changed paths:
    M src/droid.cpp
    M src/game.cpp
    M src/keybind.cpp
    M src/multiplay.cpp
    M src/scriptobj.cpp
    M src/template.cpp
    M src/template.h

  Log Message:
  -----------
  Do away with apsStaticTemplates completely, it caused multiple issues. There 
is no difference in accessing the templates for the AI or Humans now. Only 
write templates out for active players. Make each template's group unique to 
each player. Fix clone wars templates. Remove hacky functions 
GetHumanDroidTemplate & GetAIDroidTemplate fixes ticket:3146 close ticket:3369

refs b99e845d979e89d7735f61cf71c634d0c2b1e033
refs 0cc7c315db4b1b80048e9a45839cdbde5900f698


  Commit: 9775d0c4f66f80d6378cee0dc9ea31d3cdfe5708
      
https://github.com/Warzone2100/warzone2100/commit/9775d0c4f66f80d6378cee0dc9ea31d3cdfe5708
  Author: vexed <[email protected]>
  Date:   2012-04-24 (Tue, 24 Apr 2012)

  Changed paths:
    M src/component.cpp
    M src/move.cpp

  Log Message:
  -----------
  Let's try to stop checking for tiles when we are offscreen via a Transporter.

fixes ticket:3403


  Commit: 4879779b631235bdfa5890a0cbfcdeea79023656
      
https://github.com/Warzone2100/warzone2100/commit/4879779b631235bdfa5890a0cbfcdeea79023656
  Author: automerge <[email protected]>
  Date:   2012-04-25 (Wed, 25 Apr 2012)

  Changed paths:
    M lib/netplay/netplay.cpp
    M lib/netplay/netqueue.cpp
    M lib/netplay/netqueue.h
    M lib/netplay/nettypes.cpp
    M lib/netplay/nettypes.h
    M src/component.cpp
    M src/droid.cpp
    M src/frontend.cpp
    M src/frontend.h
    M src/game.cpp
    M src/ingameop.cpp
    M src/ingameop.h
    M src/keybind.cpp
    M src/loadsave.cpp
    M src/loadsave.h
    M src/main.cpp
    M src/map.cpp
    M src/mission.cpp
    M src/move.cpp
    M src/multigifts.cpp
    M src/multiplay.cpp
    M src/scriptobj.cpp
    M src/structure.cpp
    M src/template.cpp
    M src/template.h

  Log Message:
  -----------
  Merge branch 'bugfixes' into 3.1


Compare: https://github.com/Warzone2100/warzone2100/compare/cf77b27...4879779
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and 
threat landscape has changed and how IT managers can respond. Discussions 
will include endpoint security, mobile security and the latest in malware 
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Warzone2100-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

Reply via email to