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

27815 Commits

Author SHA1 Message Date
minggo b552bf3902 Merge pull request #10782 from MSOpenTech/v3-wp8-fix 
V3 updated expiration date of WP8/Universal App project certificates
 2015-03-10 09:31:22 +08:00
yangxiao 5131a23de4 solve conflict 2015-03-10 09:18:13 +08:00
Vladimir Timofeev 0dc7da3e6d Fix lua-template-default win32 project 
Modify project to copy resource files to folder where exe file located.
This commit should fix lua-template-default after https://github.com/cocos2d/cocos2d-x/pull/10431 was commited.
 2015-03-10 00:19:23 +03:00
Vladimir Timofeev 8e9ce48bab Fix cpp-template-default win32 project. 
Modify project to copy resource files to folder where exe files located.
This should fix cpp template to follow https://github.com/cocos2d/cocos2d-x/pull/10431 change.
The change was "Fix win32 resource search path to be relative to the executable."
 2015-03-09 23:44:14 +03:00
SunLightJuly 69cdc3e47c removed win32 project of simulator 2015-03-10 02:39:42 +08:00
SunLightJuly 10a60bb9da removed pbxproj of simulator 2015-03-10 02:28:27 +08:00
SunLightJuly 03f99b38d0 removed proj.android of simulator 2015-03-10 02:21:32 +08:00
Dale Stammen afd0fbab10 added missing /bigobj to c++ compiler command line options 2015-03-09 10:16:42 -07:00
SunLightJuly 18914a764e removed template of runtime 2015-03-10 01:00:23 +08:00
Dale Stammen 24d706cb7a added /bigobj to C++ compiler command line options 2015-03-09 09:39:36 -07:00
Dale Stammen 35222a8193 Merge branch 'v3' into v3-wp8-fix 2015-03-09 09:20:25 -07:00
Dale Stammen a828f73ccb updated expiration date of project certificates 2015-03-09 08:31:06 -07:00
mogemimi de4105516a Add const to Value::getDescription() function 2015-03-09 22:34:24 +09:00
Jongryul Kook 0d65dd13be Fix CCDevice-ios.mm to have the right alpha color for a stroke effect. 2015-03-09 21:20:17 +09:00
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
yangxiao 0eee4e2ab6 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2015-03-09 17:46:43 +08:00
yangxiao 2c468cbdc6 modify changelog 2015-03-09 17:46:17 +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
XiaoYang b0b8ae1112 Merge pull request #250 from songchengjiang/v3 
fix the bug of material reading on linux
 2015-03-09 17:40:33 +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
songchengjiang e30c473f85 fix the bug of material reading on linux 2015-03-09 17:30:28 +08:00
WenhaiLin cd95905a04 Label:Fixed transform not update correctly if this camera mask of Label isn't visible by the current visiting camera 2015-03-09 17:26:43 +08:00
minggo 25dba56d68 [ci skip]update CHANGELOG 2015-03-09 17:14:06 +08:00
yangxiao 45bd6180ad fix create bundle using empty path 2015-03-09 17:09:18 +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
yangxiao ff3eba6143 refact init 2015-03-09 16:29:57 +08:00
m2q1n9 c97742072f fix cocostudio anchor point bug 
fix a bug which will cause anchor point config not work
 2015-03-09 14:30:41 +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
Mazyad Alabduljaleel ce377c4a1e Fix compilation issues on Android and Win 2015-03-06 16:05:05 +04: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