Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
29,041 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

29041 Commits

Author SHA1 Message Date
minggo c785b7a021 Merge pull request #11655 from CocosRobot/update_cocosfiles_1430358246 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-04-30 09:44:27 +08:00
CocosRobot 8507d7e5a4 [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-30 01:44:07 +00:00
minggo 79a6f2f510 Merge pull request #11652 from MSOpenTech/v3.6-winrt-fix 
V3.6 Windows Phone 8.1 fix for issues 11606 and 11607
 2015-04-30 09:41:52 +08:00
Dale Stammen dfee3ae3cb added CC_WINDOWS_PHONE_8_1 to preprocessor defines 2015-04-29 10:23:22 -07:00
Dale Stammen 904abeab87 added CC_WINDOWS_PHONE_8_1 to preprocessor defines 2015-04-29 09:48:14 -07:00
Dale Stammen f64012d77b special shaders for Windows Phone 8.1 with no gl_PointSprite 2015-04-29 09:47:44 -07:00
minggo 0df4c5fc06 [ci skip]update CHANGELOG 2015-04-29 18:47:35 +08:00
minggo c2c44dec82 Merge pull request #11651 from WenhaiLin/v3.6 
VideoPlayer:Fixed can't play video on Android 2.3.x
 2015-04-29 18:43:57 +08:00
WenhaiLin 1950498b0a Replace tab with space. 2015-04-29 18:41:10 +08:00
WenhaiLin 8f3566add9 Merge branch 'v3.6' of https://github.com/WenhaiLin/cocos2d-x into v3.6 2015-04-29 18:37:18 +08:00
Wenhai Lin 1d9ff11837 VideoPlayer:Fixed can't play video on Android 2.3.x 2015-04-29 18:32:59 +08:00
minggo 9586cdf2c8 Merge pull request #11650 from xiaofeng11/v3.6 
Fix a logical bug that may cause null pointer been used
 2015-04-29 16:21:17 +08:00
XiaoFeng 9d0741544c Fix a logical bug that may cause null pointer been used 2015-04-29 15:58:44 +08:00
minggo dd4a285c2d Merge pull request #11644 from andyque/test-pr-v3-jenkins-not-needed 
Fix Jenkins Xcode build return value
 2015-04-29 14:53:09 +08:00
minggo 03d9d3b358 Merge pull request #11648 from minggo/v3.6 
[ci skip]update doxygen config
 2015-04-29 14:40:05 +08:00
minggo d768c8c5f4 Merge pull request #11645 from xiaofeng11/v3.6 
Fix wrong shadow & outline color bug for text component
 2015-04-29 14:16:26 +08:00
minggo d825a74d81 update doxygen config 2015-04-29 14:14:10 +08:00
andyque 46c22fbe21 fix xcode preject jenkins return value 2015-04-29 13:58:35 +08:00
minggo 4ef495e43b [ci skip]update release note 2015-04-29 13:41:57 +08:00
XiaoFeng 49b465f0f4 Fix wrong shadow & outline color bug for text component 2015-04-29 10:46:23 +08:00
minggo d0cf310a0b Merge pull request #11643 from super626/v3.6 
missing texture color
 2015-04-29 10:33:32 +08:00
yangxiao 59988fdcc0 missing texture color 2015-04-29 10:30:18 +08:00
minggo 15c6af1027 Merge pull request #11642 from andyque/fix-jenkins-status-v3.6 
fix jenkins pull request builder return value
 2015-04-29 10:28:35 +08:00
andyque 1613237460 fix jenkins pull request builder return value 2015-04-29 09:53:40 +08:00
minggo 37c9a9cb98 Merge pull request #11636 from super626/v3.6 
fix bug some 3d sprite crash when texture missing on release mode
 2015-04-29 09:35:37 +08:00
minggo 182dcd4152 Merge pull request #11634 from CocosRobot/update_cocosfiles_1430228106 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-04-29 09:34:12 +08:00
yangxiao e424cb4777 fix bug some 3d sprite crash when texture missing on release mode 2015-04-28 23:55:23 +08:00
CocosRobot bea6fe3ce5 [AUTO][ci skip]: updating cocos2dx_files.json 2015-04-28 13:35:07 +00:00
minggo 21987592d2 Merge pull request #11632 from WenhaiLin/v3.6 
Fixed warns and crash on Win32.
 2015-04-28 21:18:42 +08:00
minggo cb00588d46 Merge pull request #11633 from CocosRobot/update_lua_bindings_1430223523 
[AUTO]: updating luabinding automatically
 2015-04-28 21:18:31 +08:00
CocosRobot 1f02af4a94 [AUTO]: updating luabinding automatically 2015-04-28 12:21:56 +00:00
minggo 48729b653f Merge pull request #11630 from samuele3hu/v3.6_test1 
Add Lua-bindings for SpritePolygon and related test case
 2015-04-28 20:13:52 +08:00
minggo 392bac82fd Merge pull request #11631 from super626/v3.6 
modify releasenote
 2015-04-28 20:12:31 +08:00
WenhaiLin ce7e36f76e Fixed warns and crash on Win32. 2015-04-28 20:10:56 +08:00
samuele3hu 5819159889 Add Lua-bindings for SpritePolygon and related test case 2015-04-28 18:19:57 +08:00
yangxiao 79dc972fe7 modify releasenote 2015-04-28 18:14:52 +08:00
WenhaiLin 30cea09082 Merge branch 'v3.6' of https://github.com/cocos2d/cocos2d-x into v3.6 2015-04-28 18:02:13 +08:00
minggo a9e2218600 Merge pull request #11627 from Wu-Hao/v3.6 
updated SpritePolygonc
 2015-04-28 16:47:24 +08:00
minggo 1bff6391d6 [ci skip]update CHANGELOG 2015-04-28 16:44:04 +08:00
minggo e75ea4c892 [ci skip]update AUTHORS 2015-04-28 16:43:43 +08:00
minggo 61ef35ab8e [ci skip]update CHANGELOG 2015-04-28 16:40:05 +08:00
minggo 85e58dce55 Merge pull request #11598 from HueyPark/v3.6 
Fix android http client memory leak
 2015-04-28 16:38:21 +08:00
WuHao 2b245e0318 Merge branch 'v3.6' of https://github.com/cocos2d/cocos2d-x into v3.6 2015-04-28 15:19:52 +08:00
WuHao 9d46c5413d added performance test for SpritePolygon 2015-04-28 15:18:40 +08:00
WenhaiLin 1af9ce8483 Merge branch 'v3.6' of https://github.com/cocos2d/cocos2d-x into v3.6 2015-04-28 13:36:34 +08:00
minggo 164cf78844 Merge pull request #11620 from WenhaiLin/v3.6 
Fixed compile error on VS 2012.
 2015-04-28 13:36:16 +08:00
minggo 692ed1e4ad Merge pull request #11625 from xiaofeng11/v3.6 
Fix simulator crash when miss some armature resource
 2015-04-28 13:34:32 +08:00
minggo 7ddbc59c95 Merge pull request #11622 from MSOpenTech/v3.6-winrt-fix 
Use TextBMFont when text is updated from slider for faster performance
 2015-04-28 11:55:33 +08:00
XiaoFeng 27e3dce628 Fix simulator crash when miss some armature resource 2015-04-28 11:54:36 +08:00
minggo 37c60b7eb1 Merge pull request #11624 from samuele3hu/v3.6_test1 
[ci skip]Update Sprite3DTest and VideoPlayerTest about Lua
 2015-04-28 11:34:17 +08:00