[Warzone2100-commits] [Warzone2100/warzone2100] b7de2d: Fix wrong class for some research results.

2014-11-09 Thread per
  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: b7de2d663dd3da95071190f0ce45e6abfbe50de8
  
https://github.com/Warzone2100/warzone2100/commit/b7de2d663dd3da95071190f0ce45e6abfbe50de8
  Author: per p...@wz2100.net
  Date:   2014-11-09 (Sun, 09 Nov 2014)

  Changed paths:
M data/base/stats/research_cam1.json
M data/base/stats/research_cam2.json
M data/base/stats/research_cam3.json
M data/mp/stats/research.json
R tools/conversion/ini2json/conv_all.sh
M tools/conversion/ini2json/ini2json_research.py

  Log Message:
  ---
  Fix wrong class for some research results.

During the conversion to json, some researches (upgrades for research,
production, repair, rearm) got a wrong class field in their results
description, leading to them having no effect on gameplay. Based on
patch and bug report by Althalus, closing ticket:4242


--
___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits


[Warzone2100-commits] [Warzone2100/warzone2100] 4d2304: Fix bad log spam and unnecessary LOG_FATAL if temp...

2014-11-09 Thread per
  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 4d23046ceea71c1b563e1242bbc1fe7c99341ed2
  
https://github.com/Warzone2100/warzone2100/commit/4d23046ceea71c1b563e1242bbc1fe7c99341ed2
  Author: per p...@wz2100.net
  Date:   2014-11-09 (Sun, 09 Nov 2014)

  Changed paths:
M lib/framework/wzconfig.cpp
M src/game.cpp
M src/template.cpp

  Log Message:
  ---
  Fix bad log spam and unnecessary LOG_FATAL if templates do not exist.

This closes ticket:4235


--
___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits


[Warzone2100-commits] [Warzone2100/warzone2100] bcaef4: For jsdebug, do not attempt to interate over a ref...

2014-11-09 Thread per
  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: bcaef449f1220bfb64d92ebaae4dedda5b01d13d
  
https://github.com/Warzone2100/warzone2100/commit/bcaef449f1220bfb64d92ebaae4dedda5b01d13d
  Author: per p...@wz2100.net
  Date:   2014-11-09 (Sun, 09 Nov 2014)

  Changed paths:
M src/qtscript.cpp

  Log Message:
  ---
  For jsdebug, do not attempt to interate over a reference to the global 
context.
Fixes a crash in campaign when starting jsdebug.


--
___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits


[Warzone2100-commits] [Warzone2100/warzone2100]

2014-11-09 Thread perim
  Branch: refs/heads/qt5andjson
  Home:   https://github.com/Warzone2100/warzone2100
--
___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits


[Warzone2100-commits] [Warzone2100/warzone2100] f0ed5a: That JSON still is not correct for some types...

2014-11-09 Thread NoQ
  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: f0ed5aad9a19ab9169bb9d5f9cc56d1a207d414f
  
https://github.com/Warzone2100/warzone2100/commit/f0ed5aad9a19ab9169bb9d5f9cc56d1a207d414f
  Author: vexed ve...@wz2100.net
  Date:   2014-11-09 (Sun, 09 Nov 2014)

  Changed paths:
M data/base/stats/templates.json
M src/template.cpp

  Log Message:
  ---
  That JSON still is not correct for some types...
(DROID_REPAIR is missing, and some others)
Same with the loadTemplateCommon(), it is missing types as well.

refs ticket:4234


  Commit: 2b9ff58084ee2cfb78e5de7f6cc534e5b393f3f4
  
https://github.com/Warzone2100/warzone2100/commit/2b9ff58084ee2cfb78e5de7f6cc534e5b393f3f4
  Author: NoQ noqnoq...@gmail.com
  Date:   2014-11-09 (Sun, 09 Nov 2014)

  Changed paths:
M data/base/script/campaign/cam1-3.js
M data/base/script/campaign/libcampaign.js
M data/base/wrf/cam1/sub1-3/labels.json

  Log Message:
  ---
  jscam: Implement commander support and regrouping in SUB_1_3

refs ticket:4234


Compare: 
https://github.com/Warzone2100/warzone2100/compare/bcaef449f122...2b9ff58084ee--
___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits


[Warzone2100-commits] [Warzone2100/warzone2100] 83398d: No need to move the mouse to the position it has a...

2014-11-09 Thread per
  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 83398d7c6d438169091797ece38c6b1ff9c76931
  
https://github.com/Warzone2100/warzone2100/commit/83398d7c6d438169091797ece38c6b1ff9c76931
  Author: per p...@wz2100.net
  Date:   2014-11-09 (Sun, 09 Nov 2014)

  Changed paths:
M lib/framework/input.h
M lib/qtgame/wzapp_qt.cpp
M lib/sdl/main_sdl.cpp
M src/intdisplay.cpp
M src/loadsave.cpp

  Log Message:
  ---
  No need to move the mouse to the position it has already been moved.


  Commit: 38eea693c447d122aac82651c801f5c2685dd255
  
https://github.com/Warzone2100/warzone2100/commit/38eea693c447d122aac82651c801f5c2685dd255
  Author: per p...@wz2100.net
  Date:   2014-11-09 (Sun, 09 Nov 2014)

  Changed paths:
M lib/ivis_opengl/imdload.cpp
M lib/ivis_opengl/piestate.cpp
M lib/ivis_opengl/piestate.h
M lib/ivis_opengl/screen.cpp
M lib/ivis_opengl/tex.cpp

  Log Message:
  ---
  Utilize more of the OpenGL KHR_debug extension.

Adds message callback and object labelling.


Compare: 
https://github.com/Warzone2100/warzone2100/compare/2b9ff58084ee...38eea693c447--
___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits


[Warzone2100-commits] [Warzone2100/warzone2100] 675ceb: qtscript: Prettier performance monitor output

2014-11-09 Thread NoQ
  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 675cebe5034678bd55423c4c7da80e883e39
  
https://github.com/Warzone2100/warzone2100/commit/675cebe5034678bd55423c4c7da80e883e39
  Author: NoQ noqnoq...@gmail.com
  Date:   2014-11-09 (Sun, 09 Nov 2014)

  Changed paths:
M src/qtscript.cpp

  Log Message:
  ---
  qtscript: Prettier performance monitor output


--
___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits


[Warzone2100-commits] [Warzone2100/warzone2100] 8dfaae: jscam: Fix documentation for camManageGroup. refs ...

2014-11-09 Thread NoQ
  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 8dfaaefce78b1379fa5346452cde1a2ed36abcbb
  
https://github.com/Warzone2100/warzone2100/commit/8dfaaefce78b1379fa5346452cde1a2ed36abcbb
  Author: NoQ noqnoq...@gmail.com
  Date:   2014-11-09 (Sun, 09 Nov 2014)

  Changed paths:
M data/base/script/campaign/libcampaign.js

  Log Message:
  ---
  jscam: Fix documentation for camManageGroup. refs ticket:4234


--
___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits


[Warzone2100-commits] [Warzone2100/warzone2100] 99fa49: Fix adding power bar broken in cd54d3880cb5bc742b4...

2014-11-09 Thread vexed
  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: 99fa49bf00c4fe09278c4b76384a426e580493ab
  
https://github.com/Warzone2100/warzone2100/commit/99fa49bf00c4fe09278c4b76384a426e580493ab
  Author: vexed ve...@wz2100.net
  Date:   2014-11-09 (Sun, 09 Nov 2014)

  Changed paths:
M src/hci.cpp
M src/init.cpp

  Log Message:
  ---
  Fix adding power bar broken in cd54d3880cb5bc742b4b46725ea55a7b9a042c75.
(We should NOT init the power bar in stage 3, since it causes us to
keep trying to create it when it already exists in campaigns.)


--
___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits


[Warzone2100-commits] [Warzone2100/warzone2100] d47e12: jscam: Fix a few issues with convoy and commander ...

2014-11-09 Thread NoQ
  Branch: refs/heads/master
  Home:   https://github.com/Warzone2100/warzone2100
  Commit: d47e122d64b8de867eef7c6a70320c73b9ee9a63
  
https://github.com/Warzone2100/warzone2100/commit/d47e122d64b8de867eef7c6a70320c73b9ee9a63
  Author: NoQ noqnoq...@gmail.com
  Date:   2014-11-10 (Mon, 10 Nov 2014)

  Changed paths:
M data/base/script/campaign/cam1-3.js

  Log Message:
  ---
  jscam: Fix a few issues with convoy and commander unit movement on SUB_1_3.

refs ticket:4234


--
___
Warzone2100-commits mailing list
Warzone2100-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/warzone2100-commits