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

17794 Commits

Author SHA1 Message Date
Dhilan007 1247760d95 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_label_fixs 
Conflicts:
	cocos/2d/CCLabel.cpp
 2014-03-26 11:15:48 +08:00
Dhilan007 41ffa372e8 label: Refactor implementation of shadow. 2014-03-26 11:09:16 +08:00
Ricardo Quesada f5585d8409 Merge pull request #5976 from ricardoquesada/chipmunk_fixes 
chipmunk fixes for Linux
 2014-03-25 16:47:21 -07:00
Ricardo Quesada c82933e3c4 chipmunk fixes for Linux 2014-03-25 16:46:10 -07:00
Ricardo Quesada 96e8c4777d Merge pull request #5973 from ricardoquesada/chipmunk_6_2_1 
Upgrades to Chipmunk 6.2.1
 2014-03-25 10:56:37 -07:00
Ricardo Quesada 473a6b19ee Upgrades to Chipmunk 6.2.1 2014-03-25 10:37:35 -07:00
James Chen f6c6d428ad Merge pull request #5926 from andyque/fix_tests_warnings 
issue #4401, remove warnings under win32
 2014-03-25 18:17:42 +08:00
James Chen 12138d893a Merge pull request #5970 from CocosRobot/update_lua_bindings_1395739745 
[AUTO]: updating luabinding automatically
 2014-03-25 17:40:21 +08:00
CocosRobot c5d6e83673 [AUTO]: updating luabinding automatically 2014-03-25 09:30:11 +00:00
James Chen 04fb2b9fa0 Merge pull request #5968 from dumganhar/develop 
[ci] Updates travis scripts. only commit relevant folder.
 2014-03-25 17:13:12 +08:00
James Chen b8eee8e1a4 [ci] Updates travis scripts. only commit relevant folder. 2014-03-25 17:07:15 +08:00
minggo dda53f26d4 [ci skip] 2014-03-25 16:50:36 +08:00
James Chen fe89291be6 Update CHANGELOG [ci skip] 2014-03-25 16:47:59 +08:00
James Chen b6589b0b5a Merge pull request #5931 from Dhilan007/develop_label 
label: Support to clip transparent area of Label, content size will be updated with only non-transparent area.
 2014-03-25 16:47:12 +08:00
LinWenhai 4b454fe7bb Update getter of ClipMarginEnabled. 2014-03-25 16:37:34 +08:00
James Chen 952bb23324 Merge pull request #5964 from CocosRobot/update_lua_bindings_1395735859 
[AUTO]: updating luabinding automatically
 2014-03-25 16:30:36 +08:00
James Chen f672f3153e Update CHANGELOG [ci skip] 2014-03-25 16:30:00 +08:00
minggo cc61df50e7 Merge pull request #5965 from natural-law/issue2880 
Generate mipmap for the texture has mipmaps when reload textures.
 2014-03-25 16:29:05 +08:00
James Chen 8f95e27dc7 Merge pull request #5943 from koowolf/websocket_fix 
closed #4542: WebsocketTest crashes on win32, it may delete mutex which is still being locked
 2014-03-25 16:28:18 +08:00
CocosRobot 81cc05729c [AUTO]: updating luabinding automatically 2014-03-25 08:26:13 +00:00
James Chen f10b563f2f Merge pull request #5962 from CocosRobot/update_cocosfiles_1395735732 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-03-25 16:25:45 +08:00
James Chen 2303a57941 Merge pull request #5963 from dumganhar/develop 
[ci] Updates travis scripts. git diff compared with origin/develop
 2014-03-25 16:25:27 +08:00
James Chen bb190fe78a [ci] Updates travis scripts. 2014-03-25 16:24:08 +08:00
CocosRobot e65315d01e [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-25 08:22:13 +00:00
zhangbin 36892c3a98 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into issue2880 2014-03-25 16:21:41 +08:00
zhangbin d6ad9274c4 closed #2880, Generate mipmap for the texture has mipmaps when reload textures. 2014-03-25 16:19:34 +08:00
James Chen f55dd3d222 Merge pull request #5961 from CocosRobot/update_lua_bindings_1395735167 
[AUTO]: updating luabinding automatically
 2014-03-25 16:14:30 +08:00
koowolf c37584ee5c closed #4542: fix crash in win32(delete mutex while still lock) 2014-03-25 16:14:21 +08:00
CocosRobot bdcd6ea198 [AUTO]: updating luabinding automatically 2014-03-25 08:13:42 +00:00
Dhilan007 674dffce21 Merge branch 'develop-label-stroke' of https://github.com/dumganhar/cocos2d-x into develop_label_fixs 2014-03-25 16:10:47 +08:00
James Chen 39b33831ff Merge pull request #5957 from CocosRobot/update_cocosfiles_1395733777 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-03-25 15:50:18 +08:00
James Chen 27d25a38f1 Update CHANGELOG [ci skip] 2014-03-25 15:49:56 +08:00
CocosRobot 933d9c0476 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-25 07:49:38 +00:00
minggo cf0b3e47cf Merge pull request #5955 from Dhilan007/develop_removeNativeActivity 
update templates for remove native activity
 2014-03-25 15:47:56 +08:00
James Chen 34245d4bd0 Merge pull request #5953 from dumganhar/merge5934 
closed #4541: [ui] Removed Widget::addNode, added ProtectedNode.
 2014-03-25 15:46:56 +08:00
Dhilan007 c642d4d4c4 update templates for remove native activity 2014-03-25 15:43:42 +08:00
James Chen c8a762c92b Merge pull request #5954 from CocosRobot/update_lua_bindings_1395733113 
[AUTO]: updating luabinding automatically
 2014-03-25 15:43:38 +08:00
CocosRobot 86f69a0b4e [AUTO]: updating luabinding automatically 2014-03-25 07:39:29 +00:00
minggo 3fc15e5e7d Merge pull request #5896 from splhack/remove_nativeactivity 
Remove NativeActivity
 2014-03-25 15:37:12 +08:00
minggo c526ef600f Merge pull request #5949 from natural-law/develop 
Update the reference of submodule "cocos2d-console".
 2014-03-25 15:35:28 +08:00
minggo cab21adf4a Merge pull request #5919 from boyu0/bug4499_ParticleSystem_endRadiusVar_bug 
closed #4499: Read ParticleSystem::modeB.endRadiusVar from "minRadiusVariance...
 2014-03-25 15:34:36 +08:00
James Chen b40127ea99 Never include '.cpp' files. 2014-03-25 15:32:14 +08:00
James Chen 91347aca0c closed #4541: Removes wrong coments in CCProtectedNode.h. 2014-03-25 15:07:46 +08:00
James Chen 45b98e7dc0 issue #4541: s_globalOrderOfArrival is an static variable of Node class. 2014-03-25 15:07:11 +08:00
LinWenhai 19341ceaf4 add getter of ClipMarginEnabled. 2014-03-25 14:54:42 +08:00
CaiWenzhi 9a8cf6d813 Modify Windows Project 2014-03-25 14:28:58 +08:00
CaiWenzhi c0b67e6d1b Modify mk files 2014-03-25 14:28:58 +08:00
CaiWenzhi 2dffcb9808 Add ProtectedNode and remove "addNode" 2014-03-25 14:28:58 +08:00
zhangbin beb6f7359c Update the reference of submodule "cocos2d-console". 2014-03-25 14:19:46 +08:00
James Chen d8793a87b9 Update CHANGELOG [ci skip] 2014-03-25 14:12:21 +08:00