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

29453 Commits

Author SHA1 Message Date
yangxiao 8137b01f23 merge cocos 2015-03-06 18:31:57 +08:00
yangxiao 578053d351 add macro on other platform 2015-03-06 18:03:11 +08:00
XiaoYang 27ae60e626 Merge pull request #249 from songchengjiang/particle_merge 
support win8.1
 2015-03-06 17:57:34 +08:00
minggo 2238cb0dbb Merge pull request #10546 from krishnanm86/knarasimhan_sourcerefactor_jni_audio 
Sourcr Refactor. Abstracted common functionality from two jni methods an...
 2015-03-06 16:14:59 +08:00
minggo b5a95165c4 Merge pull request #10757 from CocosRobot/update_cocosfiles_1425629541 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-03-06 16:13:45 +08:00
CocosRobot 1498c18d1b [AUTO][ci skip]: updating cocos2dx_files.json 2015-03-06 08:12:23 +00:00
minggo 15853a435e Merge pull request #10738 from newnon/v3_mingw_build_fix 
MinGW build fix
 2015-03-06 15:49:13 +08:00
minggo 8d781d9671 Merge pull request #10756 from samuele3hu/v3_5_rc_check 
[ci skip]Fix the error that Android.mk for lua template re-assign the value of  LOCAL_C_INCLUDES
 2015-03-06 15:44:58 +08:00
minggo 65926a9f0b Merge pull request #10734 from pipu/projectnode_animation_innerspeed 
Serialize and parse attribute "innerspeed" for ProjectNode.
 2015-03-06 15:43:57 +08:00
samuele3hu 1844fdd806 Fix the error that Android.mk for lua template re-assign the value of LOCAL_C_INCLUDES 2015-03-06 15:41:48 +08:00
songchengjiang 4ca90341b9 support win8.1 2015-03-06 15:35:02 +08:00
minggo c96f3b135a Merge pull request #10733 from pipu/modify_layout_attribute_name 
To modify layout attribute name that are used in serialized and parsed.
 2015-03-06 15:00:33 +08:00
minggo 065102ae7c Merge pull request #10753 from natural-law/v3 
[ci skip] Update the reference of submodule cocos2d-console.
 2015-03-06 14:53:31 +08:00
zhangbin 8c57edbad5 Update the reference of submodule cocos2d-console. 2015-03-06 14:51:29 +08:00
yangxiao 457ac3fdd7 reset unproject with viewport cocostudio using it 2015-03-06 11:29:40 +08:00
yangxiao d451e13c85 add changelog 2015-03-06 11:21:31 +08:00
yangxiao bac5377e8c format 2015-03-06 10:44:56 +08:00
yangxiao bec346bf73 add comments 2015-03-06 10:35:42 +08:00
yangxiao d7c1d6b6aa add billboard to transparent queue 2015-03-06 09:57:48 +08:00
Huabing.Xu f77fddffe1 Merge pull request #10741 from andyque/fix-linux-compile 
fix Linux glfw linker error on v3
 2015-03-05 17:08:00 +08:00
andyque e93f39fae1 fix typo 2015-03-05 17:05:08 +08:00
andyque a229793e31 fix Linux glfw linker error on v3 2015-03-05 16:34:51 +08:00
Sergey 8270355ad6 blending function for Scale9Sprite 2015-03-05 11:13:51 +03:00
Sergey de284c98ce MinGW build fix 2015-03-05 11:11:13 +03:00
Sergey Perepelitsa 215fe8a0c9 Windows network path fix 2015-03-05 11:10:03 +03:00
minggo e792b6aa9a Merge pull request #10725 from fusijie/fixsource 
fixed source coding error.
 2015-03-05 16:08:33 +08:00
pipu fadac31868 Serialize and parse attribute "inner speed" for ProjectNode. 2015-03-05 15:48:17 +08:00
XiaoYang a8e8037478 Merge pull request #248 from songchengjiang/particle_merge 
modify ParticleUniverse's file structure
 2015-03-05 15:02:45 +08:00
songchengjiang 444dbfdf9e replace .mesh with .c3b 
modify ParticleUniverse file structure
 2015-03-05 14:54:32 +08:00
pipu be1b0b7239 To modify layout attribute name that are used in serialized and parsed. 2015-03-05 14:34:35 +08:00
yangxiao 70c25ecded modify project using short path 2015-03-05 13:40:52 +08:00
yangxiao 4de96cf1e6 modify pu path 2015-03-05 13:28:42 +08:00
yangxiao faf299c5a1 make path shorter 2015-03-05 13:24:06 +08:00
Jacky c38c4a1373 fixed source coding error. 2015-03-04 18:15:05 +08:00
Krishna 35403439f3 Fixed compilation issue. Introduced missing CLASS_NAME 2015-03-04 10:48:30 +01:00
Krishna ec3a8d49f9 Fixed compilation error. 2015-03-04 10:43:31 +01:00
Nite Luo 95bd326829 Replace std::to_string 2015-03-04 01:42:24 -08:00
pipu 010a077fa8 To reconstruct callback binding for nest node as WidgetCallBackHandlerProtocol in CSLoader. 2015-03-04 17:29:40 +08:00
Huabing.Xu 106c67fa4f Merge pull request #10722 from CocosRobot/update_cocosfiles_1425456816 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-03-04 16:23:26 +08:00
CocosRobot 721804a30e [AUTO][ci skip]: updating cocos2dx_files.json 2015-03-04 08:13:38 +00:00
Huabing.Xu 1b32110f8a Merge pull request #10713 from andyque/upgrade-v3-deps 
Upgrade v3 deps
 2015-03-04 16:11:49 +08:00
XiaoYang 231f139a75 Merge pull request #247 from songchengjiang/particle_merge 
fix bugs
 2015-03-04 15:47:47 +08:00
songchengjiang 590912ba49 Merge branch 'particle_merge' of https://github.com/super626/cocos2d-x into particle_merge 2015-03-04 15:29:05 +08:00
songchengjiang 4783ac4f86 remove setParticleSystemScaleVelocity 2015-03-04 15:18:03 +08:00
yangxiao 9665bb6dd8 add to linux project 2015-03-04 15:17:37 +08:00
songchengjiang d861220993 restore model search path 2015-03-04 14:56:04 +08:00
yangxiao 573fdafbd8 android work 2015-03-04 14:25:46 +08:00
Huabing.Xu 714cb3db14 Merge pull request #10719 from andyque/fix-win32-jenkin-issue 
fix android and win32 compile error
 2015-03-04 14:14:40 +08:00
songchengjiang 7c1e8e1a08 Merge branch 'particle_merge' of https://github.com/super626/cocos2d-x into particle_merge 
Conflicts:
	tests/cpp-tests/Classes/Particle3DTest/Particle3DTest.cpp
 2015-03-04 14:12:34 +08:00
andyque 942ceccd99 fix android and win32 compile error 2015-03-04 14:12:11 +08:00