Branch: refs/heads/master
Home: https://github.com/Warzone2100/warzone2100
Commit: 0c03151e250a89f23ea5960cd488367112bd3fdc
https://github.com/Warzone2100/warzone2100/commit/0c03151e250a89f23ea5960cd488367112bd3fdc
Author: Cyp <[email protected]>
Date: 2012-06-15 (Fri, 15 Jun 2012)
Changed paths:
M lib/ivis_opengl/screen.cpp
Log Message:
-----------
Check for shader version ≥ 1.20, instead of checking for OpenGL 2.0.
Try to simplify checks a bit.
Commit: 752eef9410c4ee3ba1ceb5984d98cb68729e641f
https://github.com/Warzone2100/warzone2100/commit/752eef9410c4ee3ba1ceb5984d98cb68729e641f
Author: Per Inge Mathisen <[email protected]>
Date: 2012-06-15 (Fri, 15 Jun 2012)
Changed paths:
M src/qtscriptfuncs.cpp
Log Message:
-----------
qtscript: Make getResearch() return null if tech not found. Closes ticket:3548
Commit: d3144a7f1c7c4f46ecae199f04082fd2ac9e0901
https://github.com/Warzone2100/warzone2100/commit/d3144a7f1c7c4f46ecae199f04082fd2ac9e0901
Author: safety0ff <[email protected]>
Date: 2012-06-16 (Sat, 16 Jun 2012)
Changed paths:
A doc/gl/extractGlEnums.sh
A doc/gl/extractGlFunctions.sh
A doc/gl/wzgl.ods
Log Message:
-----------
Add documentation for opengl usage.
Commit: 174c56190df54fcd7ed4316c7a6f39f32087ccb8
https://github.com/Warzone2100/warzone2100/commit/174c56190df54fcd7ed4316c7a6f39f32087ccb8
Author: safety0ff <[email protected]>
Date: 2012-06-16 (Sat, 16 Jun 2012)
Changed paths:
M doc/gl/wzgl.ods
Log Message:
-----------
Fix bugs in glUseProgram and glAttachShader extension names.
Commit: 96272ebf5008ad7ac47865e3493d43a597371944
https://github.com/Warzone2100/warzone2100/commit/96272ebf5008ad7ac47865e3493d43a597371944
Author: Cyp <[email protected]>
Date: 2012-06-16 (Sat, 16 Jun 2012)
Changed paths:
M doc/gl/wzgl.ods
M lib/ivis_opengl/screen.cpp
M lib/ivis_opengl/screen.h
M src/init.cpp
M src/terrain.cpp
Log Message:
-----------
Use OpenGL functions under extension names, if not present under regular
names.
Commit: 1a7c1a41b7a5171695e8e59f2d41c7de6638a14f
https://github.com/Warzone2100/warzone2100/commit/1a7c1a41b7a5171695e8e59f2d41c7de6638a14f
Author: vexed <[email protected]>
Date: 2012-06-16 (Sat, 16 Jun 2012)
Changed paths:
M src/frontend.cpp
Log Message:
-----------
Add missing vids message when they are not found
Commit: dc856acbd9fe2a1e335436fa637812b3e40a7483
https://github.com/Warzone2100/warzone2100/commit/dc856acbd9fe2a1e335436fa637812b3e40a7483
Author: vexed <[email protected]>
Date: 2012-06-16 (Sat, 16 Jun 2012)
Changed paths:
M src/structure.cpp
Log Message:
-----------
Don't crash on null pointers.
Commit: 6ff93f694096364d1111631d02521309105191da
https://github.com/Warzone2100/warzone2100/commit/6ff93f694096364d1111631d02521309105191da
Author: vexed <[email protected]>
Date: 2012-06-16 (Sat, 16 Jun 2012)
Changed paths:
M lib/netplay/netsocket.cpp
Log Message:
-----------
Don't crash on NULL socket
Commit: 190c7a99cccc9e831a49712ec431b194f0b65cb8
https://github.com/Warzone2100/warzone2100/commit/190c7a99cccc9e831a49712ec431b194f0b65cb8
Author: safety0ff <[email protected]>
Date: 2012-06-16 (Sat, 16 Jun 2012)
Changed paths:
M src/display3d.cpp
Log Message:
-----------
Fix hardcoded number of frames for structure animations.
N.B. Animation rates remain hardcoded for now.
Closes #1871.
(cherry picked from commit 55bea095402449d770f84628388242db9a084f9e)
(cherry picked from commit 02ced5ef58c6a63472fc0c0ef0c6759af449d400)
Commit: 2d0a089bad6b6b2fdca75556444a66e07ad3dbaa
https://github.com/Warzone2100/warzone2100/commit/2d0a089bad6b6b2fdca75556444a66e07ad3dbaa
Author: safety0ff <[email protected]>
Date: 2012-06-16 (Sat, 16 Jun 2012)
Changed paths:
M data/base/effects/fxft.pie
M data/base/effects/fxlightr.pie
M data/base/effects/fxvtl01.pie
M data/base/effects/fxvtl04.pie
M data/base/effects/fxvtl09.pie
M data/base/effects/fxvtl10.pie
M data/base/effects/fxvtl11.pie
M data/base/effects/fxvtl12.pie
M data/base/effects/fxvtl2and3.pie
M data/base/effects/fxvtl5to8.pie
M data/base/misc/blipart.pie
M data/base/misc/blipenm.pie
M data/base/misc/blipres.pie
M data/base/misc/taljetfx.pie
M data/base/misc/tbmjetfx.pie
M data/base/misc/tchjetfx.pie
M data/mp/effects/fxvtl14.pie
M lib/ivis_opengl/imdload.cpp
M src/component.cpp
M src/display3d.cpp
Log Message:
-----------
Convert code and models from hard coded animation intervals to model defined
animation intervals.
Also assert on PIE files with bad animation data.
Closes #3539.
(cherry picked from commit 75ff2070dc97c179127b9d92c56a0093e72f5f2e)
(cherry picked from commit b3dc9444da8f453cbf03c418005bca58318e1ce3)
Commit: b59fe8bdb587671c8a382887c10ce804a1d1cd9a
https://github.com/Warzone2100/warzone2100/commit/b59fe8bdb587671c8a382887c10ce804a1d1cd9a
Author: safety0ff <[email protected]>
Date: 2012-06-16 (Sat, 16 Jun 2012)
Changed paths:
M lib/ivis_opengl/piedraw.cpp
Log Message:
-----------
Don't reserve frame 0 for team colour (we use tcmask now).
Fixes bug in animation found by Berg.
(cherry picked from commit 2a9548aaf4de880726ae94ac991cd3743449099d)
(cherry picked from commit ecacd970674fd044491756c7c0275a80057cfc1f)
Commit: 07a2a9671b32d4817942739de723f380c7b88cc7
https://github.com/Warzone2100/warzone2100/commit/07a2a9671b32d4817942739de723f380c7b88cc7
Author: safety0ff <[email protected]>
Date: 2012-06-16 (Sat, 16 Jun 2012)
Changed paths:
M lib/ivis_opengl/imdload.cpp
Log Message:
-----------
Fix texture animation data loading for pie 3
(cherry picked from commit 7c451d54485b93d213894e7036e48b7f11b072e1)
(cherry picked from commit cea701af5c4babf4a2bfbba527dfa93490b533be)
Commit: 4a2f7d4399649662f33d146cbe97a12110b8995b
https://github.com/Warzone2100/warzone2100/commit/4a2f7d4399649662f33d146cbe97a12110b8995b
Author: Per Inge Mathisen <[email protected]>
Date: 2012-06-16 (Sat, 16 Jun 2012)
Changed paths:
M src/hci.cpp
Log Message:
-----------
Fix debug mode after player switching. Patch by vexed. Closes ticket:3264
(cherry picked from commit 15d7ef0295e9baaa171254e78b7f12b257f7139b)
Commit: 00f437c18d6c4c58e7154a580b0799168d7ebd41
https://github.com/Warzone2100/warzone2100/commit/00f437c18d6c4c58e7154a580b0799168d7ebd41
Author: vexed <[email protected]>
Date: 2012-06-16 (Sat, 16 Jun 2012)
Changed paths:
M data/base/effects/fxft.pie
M data/base/effects/fxlightr.pie
M data/base/effects/fxvtl01.pie
M data/base/effects/fxvtl04.pie
M data/base/effects/fxvtl09.pie
M data/base/effects/fxvtl10.pie
M data/base/effects/fxvtl11.pie
M data/base/effects/fxvtl12.pie
M data/base/effects/fxvtl2and3.pie
M data/base/effects/fxvtl5to8.pie
M data/base/misc/blipart.pie
M data/base/misc/blipenm.pie
M data/base/misc/blipres.pie
M data/base/misc/taljetfx.pie
M data/base/misc/tbmjetfx.pie
M data/base/misc/tchjetfx.pie
M data/mp/effects/fxvtl14.pie
A doc/gl/extractGlEnums.sh
A doc/gl/extractGlFunctions.sh
A doc/gl/wzgl.ods
M lib/ivis_opengl/imdload.cpp
M lib/ivis_opengl/piedraw.cpp
M lib/ivis_opengl/screen.cpp
M lib/ivis_opengl/screen.h
M lib/netplay/netsocket.cpp
M src/component.cpp
M src/display3d.cpp
M src/frontend.cpp
M src/hci.cpp
M src/init.cpp
M src/qtscriptfuncs.cpp
M src/structure.cpp
M src/terrain.cpp
Log Message:
-----------
Merge branch 'bugfixes'
Conflicts:
src/structure.cpp
Compare:
https://github.com/Warzone2100/warzone2100/compare/ea5b6ed75c2d...00f437c18d6c
------------------------------------------------------------------------------
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
