Branch: refs/heads/master
Home: https://github.com/Warzone2100/warzone2100
Commit: cea585162d631e8a6360153a28d7825405dd9de3
https://github.com/Warzone2100/warzone2100/commit/cea585162d631e8a6360153a28d7825405dd9de3
Author: per p...@wz2100.net
Date: 2013-10-21 (Mon, 21 Oct 2013)
Changed paths:
M lib/ivis_opengl/bitimage.cpp
M lib/netplay/netplay.cpp
M src/data.cpp
M src/hci.cpp
M src/multiint.cpp
M src/multiplay.cpp
M src/multistat.cpp
M src/scriptfuncs.cpp
Log Message:
---
Fixes for various bugs noticed by Coverity static analysis tool.
Commit: b8bdf44737e1d9423c2581b1377cf1be9c4a3666
https://github.com/Warzone2100/warzone2100/commit/b8bdf44737e1d9423c2581b1377cf1be9c4a3666
Author: haonoq noqnoq...@gmail.com
Date: 2013-10-24 (Thu, 24 Oct 2013)
Changed paths:
M data/mp/addon.lev
A data/mp/multiplay/maps/3c-Gamma.gam
A data/mp/multiplay/maps/3c-Gamma/dinit.bjo
A data/mp/multiplay/maps/3c-Gamma/droid.ini
A data/mp/multiplay/maps/3c-Gamma/feat.bjo
A data/mp/multiplay/maps/3c-Gamma/feature.ini
A data/mp/multiplay/maps/3c-Gamma/game.map
A data/mp/multiplay/maps/3c-Gamma/struct.bjo
A data/mp/multiplay/maps/3c-Gamma/struct.ini
A data/mp/multiplay/maps/3c-Gamma/ttypes.ttp
A data/mp/multiplay/maps/6c-Melting.gam
A data/mp/multiplay/maps/6c-Melting/dinit.bjo
A data/mp/multiplay/maps/6c-Melting/droid.ini
A data/mp/multiplay/maps/6c-Melting/feat.bjo
A data/mp/multiplay/maps/6c-Melting/feature.ini
A data/mp/multiplay/maps/6c-Melting/game.map
A data/mp/multiplay/maps/6c-Melting/struct.bjo
A data/mp/multiplay/maps/6c-Melting/struct.ini
A data/mp/multiplay/maps/6c-Melting/ttypes.ttp
Log Message:
---
Add new maps: Gamma (3p) and Melting (6p)
Commit: 99e6ab52dd6d4c8d0a22b66e049280e284cbf804
https://github.com/Warzone2100/warzone2100/commit/99e6ab52dd6d4c8d0a22b66e049280e284cbf804
Author: per p...@wz2100.net
Date: 2013-10-25 (Fri, 25 Oct 2013)
Changed paths:
M ChangeLog
Log Message:
---
Update changelog
(cherry picked from commit 6b0ceca623f710dc5444d35cb1e1fa7965ee684a)
Commit: 53bf0afaf4e6094a74b4048c5276e43b04e2fcac
https://github.com/Warzone2100/warzone2100/commit/53bf0afaf4e6094a74b4048c5276e43b04e2fcac
Author: per p...@wz2100.net
Date: 2013-10-25 (Fri, 25 Oct 2013)
Changed paths:
M ChangeLog
Log Message:
---
Update Changelog
(cherry picked from commit 8d015ad27b5317877b8b9ee8f69c1a291c9278e8)
Commit: 77f37c0a0fda40fa8db0f6cd91135c7326f70f20
https://github.com/Warzone2100/warzone2100/commit/77f37c0a0fda40fa8db0f6cd91135c7326f70f20
Author: vexed ve...@wz2100.net
Date: 2013-10-27 (Sun, 27 Oct 2013)
Changed paths:
M ChangeLog
M data/mp/addon.lev
A data/mp/multiplay/maps/3c-Gamma.gam
A data/mp/multiplay/maps/3c-Gamma/dinit.bjo
A data/mp/multiplay/maps/3c-Gamma/droid.ini
A data/mp/multiplay/maps/3c-Gamma/feat.bjo
A data/mp/multiplay/maps/3c-Gamma/feature.ini
A data/mp/multiplay/maps/3c-Gamma/game.map
A data/mp/multiplay/maps/3c-Gamma/struct.bjo
A data/mp/multiplay/maps/3c-Gamma/struct.ini
A data/mp/multiplay/maps/3c-Gamma/ttypes.ttp
A data/mp/multiplay/maps/6c-Melting.gam
A data/mp/multiplay/maps/6c-Melting/dinit.bjo
A data/mp/multiplay/maps/6c-Melting/droid.ini
A data/mp/multiplay/maps/6c-Melting/feat.bjo
A data/mp/multiplay/maps/6c-Melting/feature.ini
A data/mp/multiplay/maps/6c-Melting/game.map
A data/mp/multiplay/maps/6c-Melting/struct.bjo
A data/mp/multiplay/maps/6c-Melting/struct.ini
A data/mp/multiplay/maps/6c-Melting/ttypes.ttp
M lib/ivis_opengl/bitimage.cpp
M lib/netplay/netplay.cpp
M src/data.cpp
M src/hci.cpp
M src/multiint.cpp
M src/multiplay.cpp
M src/multistat.cpp
M src/scriptfuncs.cpp
Log Message:
---
Merge branch 'bugfixes'
Conflicts:
src/scriptfuncs.cpp
Commit: 853179f2deb3b94ee6ed322c7813dfaa1a157925
https://github.com/Warzone2100/warzone2100/commit/853179f2deb3b94ee6ed322c7813dfaa1a157925
Author: vexed ve...@wz2100.net
Date: 2013-10-27 (Sun, 27 Oct 2013)
Changed paths:
M lib/ivis_opengl/screen.cpp
Log Message:
---
Fix compile issue broken in 5f32c3eafe26c959045f10b21bea2efc69c770d2
Commit: e482b58e7ff394efb35ebbd162c2afbab221dfc7
https://github.com/Warzone2100/warzone2100/commit/e482b58e7ff394efb35ebbd162c2afbab221dfc7
Author: vexed ve...@wz2100.net
Date: 2013-10-27 (Sun, 27 Oct 2013)
Changed paths:
M lib/ivis_opengl/piedraw.cpp
Log Message:
---
fix flickering of trees (and some other objections) see
5ef1eff3eaffd63bbd1a7f3e0d8e1971c9d78f2e for initial changes.
Compare:
https://github.com/Warzone2100/warzone2100/compare/8480d6d92b2e...e482b58e7ff3