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

17864 Commits

Author SHA1 Message Date
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
James Chen 093b792221 Merge pull request #5946 from boyu0/iss3804_change_image_private_to_protected 
closed #3804: Change private functions and variables in Image class to protected, since its subclasses may need them.
 2014-03-25 14:07:58 +08:00
James Chen 32f647d38b Merge pull request #5940 from boyu0/iss4513_particle_readd_bug 
closed #4513: Particle doesn't animate when it was removed and re-added to another node.
 2014-03-25 14:05:12 +08:00
James Chen 2549368c62 Update AUTHORS [ci skip] 2014-03-25 14:03:48 +08:00
James Chen 190d0ab0b6 Merge pull request #5941 from LoungeKatt/patch-1 
Corrected a mistake of building android project in README.md.
 2014-03-25 14:00:21 +08:00
James Chen e11e290d9f Update AUTHORS [ci skip] 2014-03-25 13:56:40 +08:00
James Chen 004d5b421a Merge pull request #5947 from CocosRobot/update_lua_bindings_1395726548 
[AUTO]: updating luabinding automatically
 2014-03-25 13:53:38 +08:00
James Chen d2044eeede Update CHANGELOG [ci skip] 2014-03-25 13:53:05 +08:00
CocosRobot 5d2906ad8b [AUTO]: updating luabinding automatically 2014-03-25 05:50:20 +00:00
James Chen 400408f204 Merge pull request #5944 from aeonmine/develop 
Fix a memory leak in ActionManagerEx::initWithDictionary.
 2014-03-25 13:48:33 +08:00
James Chen 8d28884c9f Merge pull request #5806 from Dhilan007/develop_reImplementationWithLabel 
issue #3821: Uses new label instead of LabelTTF in engine.
 2014-03-25 13:46:17 +08:00
aeonmine 4edaa62ec7 Update CCActionManagerEx.cpp 
modify intent
 2014-03-25 12:41:16 +09:00
James Chen 5625c98443 Merge pull request #5942 from Dhilan007/develop_label2 
label: 1) change default value of anchor point to Middle.
2) Shadow offset and outline size passed to new Label consider 'contentScaleFactor'
 2014-03-25 11:39:53 +08:00
boyu0 289e632a40 closed #4513: change 1.0 to 1.0f to avoid the warning. 2014-03-25 11:36:35 +08:00
boyu0 db0fe60974 closed #3804: Change Image private function and variable to protected, for the subclasses can use them. 2014-03-25 11:13:44 +08:00