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

25118 Commits

Author SHA1 Message Date
samuele3hu ab7b6cb102 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine 2014-10-20 14:19:55 +08:00
samuele3hu 37ba316d0a Update Lua AssetsManagerEx test 2014-10-20 14:12:55 +08:00
minggo 1fba616ba7 Merge pull request #8859 from super626/v3 
3d shader optimize
 2014-10-20 14:12:54 +08:00
minggo 1ae3dd7fc9 Merge pull request #8860 from CocosRobot/update_lua_bindings_1413785078 
[AUTO]: updating luabinding automatically
 2014-10-20 14:12:21 +08:00
minggo 66b693bf66 [ci skip] Update CHANGELOG 2014-10-20 14:11:48 +08:00
minggo 4f8f40cfd9 [ci skip]Update Authors 2014-10-20 14:10:56 +08:00
CocosRobot 5e09b1e3b1 [AUTO]: updating luabinding automatically 2014-10-20 06:06:43 +00:00
minggo f661703307 Merge pull request #8852 from zhongfq/patch-1 
fix memory leak when reload texture
 2014-10-20 14:06:09 +08:00
minggo 49bd79d14a Merge pull request #8853 from 2youyouo2/v3_EventFrame 
fixed emit frame event
 2014-10-20 13:57:38 +08:00
minggo 2c3f22eb11 Merge pull request #8854 from Dhilan007/v3-labelfix 
Fix Label: endless loop if not using system font, and constrained length is less than one character width
 2014-10-20 13:52:38 +08:00
minggo 63a0899850 Merge pull request #8855 from dabingnn/v3_fixAssetMgrTestCase 
change asset manager to use a new resource, which will not affect other ...
 2014-10-20 13:49:10 +08:00
yangxiao 30733cf35e shader optimize 2014-10-20 13:41:26 +08:00
pipu 50a8f9f3fb Modify that parse "AnchorPointFrame" 2014-10-20 12:43:01 +08:00
pipu 8072328ca6 Modify that record path of .csb file 2014-10-20 11:56:48 +08:00
Huabing.Xu ede7f75f5d change lua asset manager test cases 2014-10-20 11:54:10 +08:00
minggo 72057cc30a Merge pull request #8858 from minggo/update-release-note 
[ci skip]Update release note
 2014-10-20 11:42:01 +08:00
minggo 73d6e36c25 Merge pull request #8856 from samuele3hu/v3_new_spine 
Fix a bug in the tolua_cocos2dx_GLProgram_setUniformLocationF32 and update plugin submodule
 2014-10-20 11:37:26 +08:00
minggo 80c4ce3e7a update release note 2014-10-20 11:34:04 +08:00
Eric Zhong 2206e4edb8 fix memory leak when add listener to ui object 2014-10-20 11:20:53 +08:00
samuele3hu 29bf39bfab Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine 2014-10-20 11:09:41 +08:00
samuele3hu a151ea0163 Update plugin submodule 2014-10-20 11:03:54 +08:00
Huabing.Xu 86fedffd56 change asset manager to use a new resource, which will not affect other test cases 2014-10-20 11:03:13 +08:00
minggo 8d3e4818a5 Merge pull request #8842 from joshuastray/v3 
add needed link library for linux
 2014-10-20 10:56:54 +08:00
Eric Zhong fdd20b4d73 fix memory leak when reload texture 2014-10-20 10:43:18 +08:00
Dhilan007 0bb02fb34f Fix Label: endless loop if not using system font, and constrained length is less than one character width 2014-10-20 10:41:01 +08:00
samuele3hu 1195960ea7 Fix the bug in the tolua_cocos2dx_GLProgram_setUniformLocationF32 2014-10-20 10:22:44 +08:00
pipu 0134e9247d Fixed #8838 2014-10-20 10:15:44 +08:00
minggo 84e0ae750c [ci skip]update README.md 2014-10-20 09:50:11 +08:00
minggo fed7787ceb [ci skip]update config.json 2014-10-20 09:36:01 +08:00
minggo 1134112748 Merge pull request #8849 from samuele3hu/v3_new_spine 
Fix some bugs reported in the test
 2014-10-20 09:35:13 +08:00
minggo be296265a4 [ci skip]update config.json 2014-10-20 09:29:26 +08:00
samuele3hu 5112f4ab5e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine 2014-10-19 22:41:15 +08:00
samuele3hu 66a9d1c52e Fix FontTest' output error message-> “cocos2d: removeChildByTag(tag = 0): child not found!” 2014-10-19 22:35:30 +08:00
samuele3hu 1194873b60 Fix Camera3DTest has not effect on the Linux 2014-10-19 22:20:34 +08:00
youyou 03ebe0152b fixed timeline loop 2014-10-19 21:32:23 +08:00
minggo 9f4ef42882 Merge pull request #8848 from CocosRobot/update_cocosfiles_1413720591 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-10-19 20:10:34 +08:00
minggo c1128a227d Merge pull request #8847 from samuele3hu/v3_new_spine 
Update CocoStudioUIEditorTest,adjust Xcode project configure and fix some compile warning
 2014-10-19 20:10:12 +08:00
CocosRobot aa7478d375 [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-19 12:09:52 +00:00
minggo 1a549b9c1d Merge pull request #8840 from CocosRobot/update_lua_bindings_1413617697 
[AUTO]: updating luabinding automatically
 2014-10-19 20:08:12 +08:00
samuele3hu 634d42775e Update CocoStudioUIEditorTest,adjust Xcode project configure and fix some compile warning 2014-10-19 17:00:05 +08:00
Jialong Zhai 2befd74b0e add needed link library for linux 2014-10-18 15:40:47 +08:00
CocosRobot 96d709aff3 [AUTO]: updating luabinding automatically 2014-10-18 07:36:54 +00:00
minggo 8318b16922 Merge pull request #8827 from cocoscodeide/v3 
don't show runtime on top by default
 2014-10-18 15:12:17 +08:00
minggo bca15538e3 Merge pull request #8823 from super626/v3 
add isVisibleByVisitingCamera check
 2014-10-18 15:11:45 +08:00
minggo 8218804c52 Merge pull request #8820 from Dhilan007/v3-audioengine-lua 
[LUA]Add New AudioEngine on window
 2014-10-18 15:11:29 +08:00
minggo df0e33c07f Merge pull request #8833 from huangshiwu/v3_wp8template 
fix wp8 template crash bug by modefy font resource's properties
 2014-10-18 15:10:40 +08:00
minggo 7bd5e3f94c Merge pull request #8834 from andyque/fixLongFilePathOnWP8 
fix long file path on WP8
 2014-10-18 15:10:03 +08:00
andyque 0dc7bbe861 fix long file path on WP8 2014-10-18 14:48:27 +08:00
Dhilan007 5ca3483dd8 fixed compile error 2014-10-18 13:44:19 +08:00
Dhilan007 c9bc80f831 Fix compile error 2014-10-18 13:03:28 +08:00