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

27628 Commits

Author SHA1 Message Date
minggo 485e4e4bf4 Merge pull request #10776 from CocosRobot/update_cocosfiles_1425894356 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-03-09 18:03:14 +08:00
CocosRobot 3f7e2eb1ff [AUTO][ci skip]: updating cocos2dx_files.json 2015-03-09 09:45:58 +00:00
minggo f4eba9c30e Merge pull request #10775 from minggo/sync-from-v4-config 
[ci skip]Add more include files in config.gitingore
 2015-03-09 17:44:09 +08:00
samuele3hu d72a0c3985 Add more include files in config.gitingore for generating templates/cocos2dx_files.json 2015-03-09 17:39:57 +08:00
minggo 25dba56d68 [ci skip]update CHANGELOG 2015-03-09 17:14:06 +08:00
minggo 5999c487a1 [ci skip]update CHANGELOG 2015-03-09 16:43:54 +08:00
minggo b8b1c9d018 Merge pull request #9708 from minggo/use-console 
use cocos console in build_native.py and android-build.py
 2015-03-09 16:41:56 +08:00
minggo b9c5f775d6 Merge pull request #10766 from MSOpenTech/v3-wp8-fix 
V3 WP8/Universal App fixes for Particle3D
 2015-03-09 13:50:27 +08:00
Dale Stammen a9479a1585 updated WP8 precompiled shaders 2015-03-08 21:42:27 -07:00
Dale Stammen 6cd881d8f8 added missing Particle3D files 2015-03-08 21:37:29 -07:00
Dale Stammen 362edec6d6 added missing Particle3D files 2015-03-08 21:31:43 -07:00
minggo 62c3f59d43 Merge pull request #10765 from CocosRobot/update_cocosfiles_1425869975 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-03-09 11:48:30 +08:00
CocosRobot f46817eac7 [AUTO][ci skip]: updating cocos2dx_files.json 2015-03-09 02:59:36 +00:00
minggo badfa5501d Merge pull request #10723 from pipu/reconstruct_parse_callbackbind 
To reconstruct callback binding for nest node
 2015-03-09 10:55:47 +08:00
minggo 6d2e6b97ec Merge pull request #10762 from CocosRobot/update_lua_bindings_1425867910 
[AUTO]: updating luabinding automatically
 2015-03-09 10:54:06 +08:00
pipu c21538e6e2 Merge branch 'v3' into reconstruct_parse_callbackbind 2015-03-09 10:38:02 +08:00
CocosRobot 1f78b18d22 [AUTO]: updating luabinding automatically 2015-03-09 02:27:14 +00:00
minggo a767ffea62 Merge pull request #10761 from CocosRobot/update_cocosfiles_1425867824 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-03-09 10:25:32 +08:00
CocosRobot d7d85625fa [AUTO][ci skip]: updating cocos2dx_files.json 2015-03-09 02:23:45 +00:00
minggo eaf0b457ff Merge pull request #10707 from super626/particle_merge 
Missing features of PU
 2015-03-09 10:21:55 +08:00
pipu 1fa9b2577a Merge branch 'v3' into reconstruct_parse_callbackbind 2015-03-09 10:16:14 +08:00
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 de284c98ce MinGW build fix 2015-03-05 11:11:13 +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