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

2801 Commits

Author SHA1 Message Date
CaiWenzhi c976791f7d Merge branch 'develop' into develop_nutty_modifylayout_add_Boxes 2014-03-25 17:17:57 +08:00
CaiWenzhi 243b7e5822 Modify layout and add Boxes 2014-03-25 17:15:54 +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
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
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
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
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
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 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
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 004d5b421a Merge pull request #5947 from CocosRobot/update_lua_bindings_1395726548 
[AUTO]: updating luabinding automatically
 2014-03-25 13:53:38 +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 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
Kazuki Sakamoto 3fba61f384 Remove NativeActivity 2014-03-24 19:57:29 -07:00
mine_masahiro 3a0ee65a7e Fix ActionObject memory leak bug 2014-03-25 11:44:26 +09:00
Dhilan007 8278a510aa Label:fixed shadow offset didn't consider 'contentScaleFactor' 2014-03-25 10:41:53 +08:00
Dhilan007 859fe98502 label:1.change default value of anchor point. 2.Shadow offset and outline size passed to new Label didn't consider 'contentScaleFactor' 2014-03-25 09:58:16 +08:00
boyu0 759ec61639 closed #4513: Particle doesn't animate when readd it. 2014-03-24 18:08:55 +08:00
James Chen ae2027ea53 Remove unneed CC_DEPRECATED_ATTRIBUTE macro in SocketIO.cpp 2014-03-24 17:59:44 +08:00
James Chen e075b82dfe tab -> 4 spaces, whitespace cleanup. 2014-03-24 17:58:35 +08:00
James Chen b6a175457c Merge commit 'refs/pull/5923/head' of git://github.com/cocos2d/cocos2d-x into merge5923 2014-03-24 17:55:43 +08:00
pandamicro bdfcc6c8cc Issue #3897: Add missed constructors 2014-03-24 17:44:01 +08:00
James Chen 892662c5ef Merge pull request #5932 from pandamicro/ComponentScriptSupport 
Component script support
 2014-03-24 14:41:16 +08:00
pandamicro 6a8dfc4664 Fixed #4512: JSB script support added to Component 2014-03-24 14:24:27 +08:00
Dhilan007 538c01e76e label:support clip blank of upper and lower margin. 2014-03-24 14:16:27 +08:00
Chris Hannon ba37c07053 [add-socketio-jsb] implement fireEventToScript method to integrate JSB event handling with the original native code 
-update static connect method to match JS API, kept original method but marked deprecated

Signed-off-by: Chris Hannon <himynameschris@gmail.com>
 2014-03-21 11:45:14 -04:00
James Chen 7e526f1976 Merge pull request #5918 from boyu0/iss4498_refactor_PhysicsDebugDraw 
closed #4498: Refactor PhysicsDebugDraw.
 2014-03-21 16:50:42 +08:00
James Chen 832ab120aa Merge pull request #5862 from samuele3hu/develop_script_mgr 
closed #4452: Adds `addCustomHandler` in the ScriptHandlerMgr for Console auto test.
 2014-03-21 16:48:53 +08:00
CocosRobot 3bd000b236 [AUTO]: updating luabinding automatically 2014-03-21 08:38:19 +00:00
James Chen da0c15c982 Merge pull request #5847 from newnon/develop_small_improvements 
Adds getCurrentLanguageCode() which returns iso 639-1 language code
 2014-03-21 16:33:43 +08:00
boyu0 5edb9b9f86 closed #4499: Read ParticleSystem::_endRadiusVar from "minRadiusVariance" in plist. 2014-03-21 16:25:22 +08:00
boyu0 41f9760f15 closed #4498: Refactor PhysicsDebugDraw. 2014-03-21 15:49:18 +08:00