From: GitHub <no...@gi...> - 2012-02-04 04:34:05
|
Branch: refs/heads/3.1 Home: https://github.com/Warzone2100/warzone2100 Commit: 78dee1c706577217542752a1455118e107c16aa0 https://github.com/Warzone2100/warzone2100/commit/78dee1c706577217542752a1455118e107c16aa0 Author: cybersphinx <ch...@gm...> Date: 2012-02-02 (Thu, 02 Feb 2012) Changed paths: M src/main.cpp Log Message: ----------- Run eventStartLevel always, not only for skirmish. Commit: 4a71db9e9b9f5884324943350776a7099b478250 https://github.com/Warzone2100/warzone2100/commit/4a71db9e9b9f5884324943350776a7099b478250 Author: cybersphinx <ch...@gm...> Date: 2012-02-03 (Fri, 03 Feb 2012) Changed paths: A data/base/script/rules.js M data/base/wrf/basic.wrf Log Message: ----------- Add general rules script for the campaign. Enable design and minimap only when an HQ exists. Commit: 1d123dffac5deb5bd9fefea79adfaa4ed84d4321 https://github.com/Warzone2100/warzone2100/commit/1d123dffac5deb5bd9fefea79adfaa4ed84d4321 Author: cybersphinx <ch...@gm...> Date: 2012-02-03 (Fri, 03 Feb 2012) Changed paths: M src/display3d.cpp Log Message: ----------- Set radarOnScreen to true by default. Otherwise when loading a campaign game with HQ the minimap is missing. Commit: 224c1c8d02746053af0aed0f19e2eb1d09f77dc0 https://github.com/Warzone2100/warzone2100/commit/224c1c8d02746053af0aed0f19e2eb1d09f77dc0 Author: cybersphinx <ch...@gm...> Date: 2012-02-03 (Fri, 03 Feb 2012) Changed paths: M ChangeLog Log Message: ----------- Splice in the Changelog from 2.3. Commit: 22056fb5c3be663ace0b3b80990558aea1ee2d90 https://github.com/Warzone2100/warzone2100/commit/22056fb5c3be663ace0b3b80990558aea1ee2d90 Author: cybersphinx <ch...@gm...> Date: 2012-02-03 (Fri, 03 Feb 2012) Changed paths: M doc/javascript.tex Log Message: ----------- qtscript: Add a note about local variables to the documentation. Commit: 407220868ef69d79a0169200c1016ac70520bf02 https://github.com/Warzone2100/warzone2100/commit/407220868ef69d79a0169200c1016ac70520bf02 Author: vexed <ve...@wz...> Date: 2012-02-03 (Fri, 03 Feb 2012) Changed paths: M lib/netplay/netplay.cpp M src/multiint.cpp Log Message: ----------- Fix issues that were overlooked from the revert(s) in ac550acd58b9f65bf0a4f68b02131b0f108d1021 Commit: 7f7390cb7e1085a5c22cbb55440e679eb9d6506f https://github.com/Warzone2100/warzone2100/commit/7f7390cb7e1085a5c22cbb55440e679eb9d6506f Author: vexed <ve...@wz...> Date: 2012-02-03 (Fri, 03 Feb 2012) Changed paths: M lib/netplay/netplay.cpp Log Message: ----------- Don't go past the map's player limits when allocating players. fixes ticket:3089 Commit: 0e107e7197b78d19cc2df875ac599abd76afc1b3 https://github.com/Warzone2100/warzone2100/commit/0e107e7197b78d19cc2df875ac599abd76afc1b3 Author: vexed <ve...@wz...> Date: 2012-02-03 (Fri, 03 Feb 2012) Changed paths: M build_tools/autorevision.bat Log Message: ----------- Fix calling batch file for autorevision.sh script refs: 17596232cc207da5007d2120aec849b8db5ea943 Commit: 7859582f13e1f777eaa4e0658fae1629b5b4b923 https://github.com/Warzone2100/warzone2100/commit/7859582f13e1f777eaa4e0658fae1629b5b4b923 Author: vexed <ve...@wz...> Date: 2012-02-03 (Fri, 03 Feb 2012) Changed paths: M src/game.cpp M src/main.cpp M src/multiint.cpp Log Message: ----------- Should fix indicator for loading, skirmish & MP screens. fixes ticket:3104 Commit: 32a7fe731c983adcc02284c7b7f30d2b220ff6fb https://github.com/Warzone2100/warzone2100/commit/32a7fe731c983adcc02284c7b7f30d2b220ff6fb Author: vexed <ve...@wz...> Date: 2012-02-03 (Fri, 03 Feb 2012) Changed paths: M lib/netplay/netplay.cpp Log Message: ----------- Fix player counts for both AI & humans & 'closed' slots in MP games Commit: 91853401ad55299c6f6f057e99fd1293834a15e3 https://github.com/Warzone2100/warzone2100/commit/91853401ad55299c6f6f057e99fd1293834a15e3 Author: vexed <ve...@wz...> Date: 2012-02-03 (Fri, 03 Feb 2012) Changed paths: M src/multiint.cpp Log Message: ----------- Check if we actually need to hide widgets before hiding them Commit: 74c3a8983aac6a95c1b0425689d11ec3b2636511 https://github.com/Warzone2100/warzone2100/commit/74c3a8983aac6a95c1b0425689d11ec3b2636511 Author: cybersphinx <ch...@gm...> Date: 2012-02-03 (Fri, 03 Feb 2012) Changed paths: M ChangeLog M build_tools/autorevision.bat A data/base/script/rules.js M data/base/wrf/basic.wrf M doc/javascript.tex M lib/netplay/netplay.cpp M src/display3d.cpp M src/game.cpp M src/main.cpp M src/multiint.cpp Log Message: ----------- 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: 17596232cc207da5007d2120aec849b8db5ea943 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 ac550acd58b9f65bf0a4f68b02131b0f108d1021 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. Compare: https://github.com/Warzone2100/warzone2100/compare/ea820dc...74c3a89 |