Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
24,911 Commits 2 Branches 34 Tags 1.2 GiB
Commit Graph

24911 Commits

Author SHA1 Message Date
songchengjiang a839cc3ae7 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-10-21 14:32:32 +08:00
yangxiao 25409b441a adjust code 2014-10-21 11:59:03 +08:00
XiaoYang 9a7ecbf22b Merge pull request #146 from tangziwen/v3 
fix some bugs when loading Animation3D from binary file
 2014-10-21 11:47:45 +08:00
tangziwen 61a6fda1c0 fix some bugs when loading Animation3D from binary file 2014-10-21 11:43:28 +08:00
XiaoYang bf931d5883 Merge pull request #145 from tangziwen/v3 
fix animation3D ID bug
 2014-10-21 10:04:46 +08:00
songchengjiang 7306fc24ed Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-10-21 09:02:51 +08:00
yangxiao 1a72d89194 fix AABB computation 2014-10-20 22:53:24 +08:00
tangziwen 8f7d202816 fix animation3D ID bug 2014-10-20 19:22:00 +08:00
yangxiao 30733cf35e shader optimize 2014-10-20 13:41:26 +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
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
minggo 8d3e4818a5 Merge pull request #8842 from joshuastray/v3 
add needed link library for linux
 2014-10-20 10:56:54 +08:00
samuele3hu 1195960ea7 Fix the bug in the tolua_cocos2dx_GLProgram_setUniformLocationF32 2014-10-20 10:22:44 +08:00
songchengjiang 57b7831ca7 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-10-20 10:01:23 +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
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
huanghsiwu f549aa3747 fix wp8 template crash bug by modefy font resource's properties 2014-10-18 11:20:12 +08:00
honghui f2647e56e4 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-10-18 09:45:25 +08:00
minggo 61215e015f Merge pull request #8831 from samuele3hu/v3_new_spine 
Add lua-bindings for Light and test case and fix compile error triggered by UIHelper.cpp
 2014-10-18 09:28:17 +08:00
samuele3hu e74c3cd1e4 Remove some comments 2014-10-18 00:29:04 +08:00
samuele3hu 529ee72432 Fix compile error triggered by UIHelper.cpp 2014-10-18 00:25:55 +08:00
samuele3hu 6502beaf95 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine 2014-10-18 00:14:53 +08:00
samuele3hu 3348f8300e Add lua-bindings for AmbientLight,BaseLight,DirectionLight,PointLight,SpotLight and related test case 2014-10-18 00:13:22 +08:00
minggo 7e6ee9c15a Merge pull request #8801 from 2youyouo2/v3 
add deprecated information for Armature::drawContour
 2014-10-17 23:02:49 +08:00
minggo ac692eaa4d Merge pull request #8818 from samuele3hu/v3_new_spine 
Update Mac project setting and some lua test cases about UI and ActionTimeline
 2014-10-17 23:01:55 +08:00
minggo b4ffad06eb Merge pull request #8822 from huangshiwu/v3_fixtemplate 
change ios and mac template's resource struct
 2014-10-17 23:00:42 +08:00
minggo 1da69a5f7b Merge pull request #8828 from CocosRobot/update_lua_bindings_1413557585 
[AUTO]: updating luabinding automatically
 2014-10-17 22:58:15 +08:00