Branch: refs/heads/3.1
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 9784c655af2a66bd541268e2c9e6f19fcd1ac200
      
https://github.com/Warzone2100/warzone2100/commit/9784c655af2a66bd541268e2c9e6f19fcd1ac200
  Author: Cyp <c...@wz2100.net>
  Date:   2012-06-20 (Wed, 20 Jun 2012)

  Changed paths:
    M lib/framework/crc.cpp
    M lib/framework/crc.h
    M src/configuration.cpp
    M src/levels.cpp
    M src/levels.h
    M src/multiint.cpp

  Log Message:
  -----------
  Save and load map hashes in config file.

This prevents a zero hash from being sent by the host when the user has not 
selected the map between starting the
program and hosting. This also means remembering exactly which map was last 
used, even if multiple maps have the
same name.


  Commit: e8ee5e6f431d03def032659d4f19856176d4df26
      
https://github.com/Warzone2100/warzone2100/commit/e8ee5e6f431d03def032659d4f19856176d4df26
  Author: Cyp <c...@wz2100.net>
  Date:   2012-06-21 (Thu, 21 Jun 2012)

  Changed paths:
    M lib/ivis_opengl/screen.cpp

  Log Message:
  -----------
  Don't require OpenGL extensions to be reported, if present in the reported 
OpenGL version.


  Commit: e1dcb241abcfd42ef988bf88bb1c44dd8cd89d1f
      
https://github.com/Warzone2100/warzone2100/commit/e1dcb241abcfd42ef988bf88bb1c44dd8cd89d1f
  Author: Cyp <c...@wz2100.net>
  Date:   2012-06-21 (Thu, 21 Jun 2012)

  Changed paths:
    M src/combat.cpp
    M src/display3d.cpp
    M src/droid.cpp
    M src/game.cpp
    M src/movedef.h
    M src/structure.cpp
    M src/weapondef.h

  Log Message:
  -----------
  Rename DROID::sMove.iAttackRuns[i] to DROID::asWeaps[i].usedAmmo.

The sMove structure is cleared when unloading from transports, and it makes no 
sense to think of used ammo as pathfinding-related, anyway.

Fixes ticket:3554.


  Commit: adc13fe9fa8f83dbb23abff4d9d0a86b54a2e904
      
https://github.com/Warzone2100/warzone2100/commit/adc13fe9fa8f83dbb23abff4d9d0a86b54a2e904
  Author: Cyp <c...@wz2100.net>
  Date:   2012-06-21 (Thu, 21 Jun 2012)

  Changed paths:
    M src/droid.cpp
    M src/droid.h
    M src/structure.cpp

  Log Message:
  -----------
  Cleanup: Remove unused mendVtol() function and fix excess indentation.


  Commit: 581d65411e714bec6c5b0e783dbaa705ff6a38c4
      
https://github.com/Warzone2100/warzone2100/commit/581d65411e714bec6c5b0e783dbaa705ff6a38c4
  Author: safety0ff <safety...@users.sourceforge.net>
  Date:   2012-06-21 (Thu, 21 Jun 2012)

  Changed paths:
    M src/edit3d.cpp

  Log Message:
  -----------
  Fix blueprint alignment and snap modules.

Closes #3466.


  Commit: 6382bbb08ea7e6ca93a0ba83fdb65952778c962a
      
https://github.com/Warzone2100/warzone2100/commit/6382bbb08ea7e6ca93a0ba83fdb65952778c962a
  Author: safety0ff <safety...@users.sourceforge.net>
  Date:   2012-06-21 (Thu, 21 Jun 2012)

  Changed paths:
    M src/display.cpp
    M src/display.h
    M src/display3d.cpp
    M src/edit3d.cpp
    M src/hci.cpp
    M src/init.cpp
    M src/loop.cpp
    M src/scriptfuncs.cpp
    M src/structure.cpp
    M src/structure.h

  Log Message:
  -----------
  Fix dangling pointer when structures are destroyed and you are repositioning 
the delivery point.

Untangles delivery points code from building placement code.
You can no longer "quick queue" units from the debug menu.

Fixes #2041.


  Commit: 6c6180495cc791afe9f818b7070f8a6bc3b13fae
      
https://github.com/Warzone2100/warzone2100/commit/6c6180495cc791afe9f818b7070f8a6bc3b13fae
  Author: safety0ff <safety...@users.sourceforge.net>
  Date:   2012-06-21 (Thu, 21 Jun 2012)

  Changed paths:
    M lib/exceptionhandler/exceptionhandler.cpp

  Log Message:
  -----------
  Fix compilation on non-x86 platforms.

Refs. #3558.


  Commit: 67b2a6210afa4306e813489d7cf2288c7ff4211f
      
https://github.com/Warzone2100/warzone2100/commit/67b2a6210afa4306e813489d7cf2288c7ff4211f
  Author: Per Inge Mathisen <p...@wz2100.net>
  Date:   2012-06-23 (Sat, 23 Jun 2012)

  Changed paths:
    M src/qtscriptfuncs.cpp

  Log Message:
  -----------
  qtscript: Add new function that returns unit limit(s).


  Commit: 88e94391669e54808b2d6f40cba994d3501efb08
      
https://github.com/Warzone2100/warzone2100/commit/88e94391669e54808b2d6f40cba994d3501efb08
  Author: Cyp <c...@wz2100.net>
  Date:   2012-06-23 (Sat, 23 Jun 2012)

  Changed paths:
    M src/structure.cpp

  Log Message:
  -----------
  Fix uninitialised variable usage on removing repair facilities.

See previous commit.


  Commit: 032956e649e69aa51edd80787c9c94bf2c08d164
      
https://github.com/Warzone2100/warzone2100/commit/032956e649e69aa51edd80787c9c94bf2c08d164
  Author: Cyp <c...@wz2100.net>
  Date:   2012-06-23 (Sat, 23 Jun 2012)

  Changed paths:
    M src/droid.cpp
    M src/transporter.cpp

  Log Message:
  -----------
  Fix minor memory leak on loading/unloading transporters.

DROID::sMove.asPath is set to NULL on unloading droids, but was never freed.

Also, clear any remaining pathfinding job for the droid on loading transporter.


  Commit: 3c5e8792be30278fee65ac5d5f59933388f384ed
      
https://github.com/Warzone2100/warzone2100/commit/3c5e8792be30278fee65ac5d5f59933388f384ed
  Author: safety0ff <safety...@users.sourceforge.net>
  Date:   2012-06-23 (Sat, 23 Jun 2012)

  Changed paths:
    M src/edit3d.cpp

  Log Message:
  -----------
  Revert "Fix blueprint alignment and snap modules."

This reverts commit 581d65411e714bec6c5b0e783dbaa705ff6a38c4.


  Commit: 3640b024f28b0fc264e2d33ea516687fc41ffccc
      
https://github.com/Warzone2100/warzone2100/commit/3640b024f28b0fc264e2d33ea516687fc41ffccc
  Author: vexed <ve...@wz2100.net>
  Date:   2012-06-25 (Mon, 25 Jun 2012)

  Changed paths:
    M lib/framework/debug.cpp
    M src/game.cpp
    M src/levels.cpp
    M src/main.cpp
    M src/mission.cpp

  Log Message:
  -----------
  Let's not hide error messages, and add more debugging to track down a few
issues


  Commit: 845903e5b60292d2a15a2f442120122ea1ff90e7
      
https://github.com/Warzone2100/warzone2100/commit/845903e5b60292d2a15a2f442120122ea1ff90e7
  Author: vexed <ve...@wz2100.net>
  Date:   2012-06-25 (Mon, 25 Jun 2012)

  Changed paths:
    M lib/netplay/netplay.cpp
    M src/multiint.cpp
    M src/multiopt.cpp
    M src/multiplay.cpp

  Log Message:
  -----------
  And even more log spam to help track down current issues.


  Commit: 64a3cc13deda9a59aae2cf0705c68dbe3eadeaa8
      
https://github.com/Warzone2100/warzone2100/commit/64a3cc13deda9a59aae2cf0705c68dbe3eadeaa8
  Author: safety0ff <safety...@users.sourceforge.net>
  Date:   2012-06-26 (Tue, 26 Jun 2012)

  Changed paths:
    M lib/ivis_opengl/screen.cpp

  Log Message:
  -----------
  Don't require texture_env_crossbar for shaders.

Refs. #3575.


  Commit: 7e3be754d4daddd771de1e115ed6845652300638
      
https://github.com/Warzone2100/warzone2100/commit/7e3be754d4daddd771de1e115ed6845652300638
  Author: safety0ff <safety...@users.sourceforge.net>
  Date:   2012-06-26 (Tue, 26 Jun 2012)

  Changed paths:
    M lib/ivis_opengl/piestate.cpp
    M lib/ivis_opengl/piestate.h
    M lib/ivis_opengl/screen.cpp
    M src/frontend.cpp
    M src/main.cpp
    M src/warzoneconfig.h

  Log Message:
  -----------
  Add settings / UI support for shaders without tex_env_crossbar (added in 
64a3cc1).


  Commit: ef2b23681b2840478a4203b8bd3a75b8882bd9f0
      
https://github.com/Warzone2100/warzone2100/commit/ef2b23681b2840478a4203b8bd3a75b8882bd9f0
  Author: safety0ff <safety...@users.sourceforge.net>
  Date:   2012-06-27 (Wed, 27 Jun 2012)

  Changed paths:
    M src/main.cpp

  Log Message:
  -----------
  Always initialize shader usage setting.


  Commit: 134c51c8902bf80c699d29a8db1c71fea9a4e85d
      
https://github.com/Warzone2100/warzone2100/commit/134c51c8902bf80c699d29a8db1c71fea9a4e85d
  Author: Cyp <c...@wz2100.net>
  Date:   2012-06-29 (Fri, 29 Jun 2012)

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

  Log Message:
  -----------
  Add a bit of overly-paranoid checking, to detect hard drive failures, or 
similar.


  Commit: 7621581c8f76f3b7a774182cd3b5eee8e26b7954
      
https://github.com/Warzone2100/warzone2100/commit/7621581c8f76f3b7a774182cd3b5eee8e26b7954
  Author: Cyp <c...@wz2100.net>
  Date:   2012-06-29 (Fri, 29 Jun 2012)

  Changed paths:
    M src/structure.cpp
    M src/template.cpp
    M src/template.h

  Log Message:
  -----------
  Do not halt production on template becoming redundant.

Production would halt until the redundant tank was manually removed from the 
build order.


  Commit: 6a04b6ad677678e1d824209dda45a70f85b64a96
      
https://github.com/Warzone2100/warzone2100/commit/6a04b6ad677678e1d824209dda45a70f85b64a96
  Author: Cyp <c...@wz2100.net>
  Date:   2012-06-29 (Fri, 29 Jun 2012)

  Changed paths:
    M src/multiplay.cpp
    M src/researchdef.h

  Log Message:
  -----------
  Reset research pending state even if research facility is destroyed.

Destroyed research facilities can no longer permanently hog a research.

Steps to reproduce: Enable debug mode, slow down game speed to 0, destroy 
facility with Alt+K, start research, speed
  up game to normal speed. Research remained missing even after the facility 
exploded.

Fixes ticket:3570.


  Commit: 28cbd8bcc32bbb3d5e0b6808dfb81d803916cfaf
      
https://github.com/Warzone2100/warzone2100/commit/28cbd8bcc32bbb3d5e0b6808dfb81d803916cfaf
  Author: Cyp <c...@wz2100.net>
  Date:   2012-06-29 (Fri, 29 Jun 2012)

  Changed paths:
    M lib/exceptionhandler/exceptionhandler.cpp
    M lib/framework/crc.cpp
    M lib/framework/crc.h
    M lib/framework/debug.cpp
    M lib/ivis_opengl/piestate.cpp
    M lib/ivis_opengl/piestate.h
    M lib/ivis_opengl/screen.cpp
    M lib/netplay/netplay.cpp
    M lib/netplay/netplay.h
    M src/combat.cpp
    M src/configuration.cpp
    M src/display.cpp
    M src/display.h
    M src/display3d.cpp
    M src/droid.cpp
    M src/droid.h
    M src/edit3d.cpp
    M src/frontend.cpp
    M src/game.cpp
    M src/hci.cpp
    M src/init.cpp
    M src/levels.cpp
    M src/levels.h
    M src/loop.cpp
    M src/main.cpp
    M src/mission.cpp
    M src/movedef.h
    M src/multiint.cpp
    M src/multiopt.cpp
    M src/multiplay.cpp
    M src/qtscriptfuncs.cpp
    M src/researchdef.h
    M src/scriptfuncs.cpp
    M src/structure.cpp
    M src/structure.h
    M src/template.cpp
    M src/template.h
    M src/transporter.cpp
    M src/warzoneconfig.h
    M src/weapondef.h

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

Conflicts:
        lib/ivis_opengl/screen.cpp


Compare: 
https://github.com/Warzone2100/warzone2100/compare/5b8165e087e4...28cbd8bcc32b
------------------------------------------------------------------------------
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
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits

Reply via email to