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

2646 Commits

Author SHA1 Message Date
andyque d309286c84 rename gui folder to ui 2014-03-11 18:48:25 +08:00
Dhilan007 df12ca963e issue #4337:label support create by font name,compatible with old labelTTF 
1.fixed color and opacity has not yet gone into effect.
2.fixed display is not consistent with old LabelTTF when content scale factor of Director not equal to 1.
 2014-03-11 18:06:14 +08:00
samuele3hu 9a30984783 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_fix 2014-03-11 17:36:43 +08:00
samuele3hu 5c33155bc9 fix:Remove some warning about lua. 2014-03-11 17:35:09 +08:00
CocosRobot b6ebd84534 [AUTO]: updating luabinding automatically 2014-03-11 08:38:10 +00:00
Dhilan007 b72d009eac Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-03-11 16:16:07 +08:00
heliclei 80417f0f35 correct naming convetion 2014-03-11 15:27:28 +08:00
Dhilan007 c2ef7b8796 fix incorrect implementation of Label::getContentSize 2014-03-11 15:03:16 +08:00
Dhilan007 792e182e12 typo fix and coding style improvements. 2014-03-11 14:32:07 +08:00
heliclei 8db680b9ee add EnumChildNodesByName, walk node tree with callback 2014-03-11 13:58:43 +08:00
CaiWenzhi 6efa17cddf Add event type to ListView 2014-03-11 11:53:44 +08:00
CocosRobot 725440fe3f [AUTO]: updating luabinding automatically 2014-03-11 02:52:22 +00:00
boyu0 23f42da548 closed #4324: fix double free bug. move _preContactData to PhysicsContact class, add PhysicsContact::getPreContactData() method. 2014-03-11 05:09:08 +08:00
minggo 5e7f2dee8f Merge pull request #5643 from nutty898/develop_nutty_modify_framework_for315CrashFixed 
Develop nutty modify framework for315 crash fixed
 2014-03-10 21:49:22 +08:00
minggo 2aa5c7aadd Merge pull request #5649 from dabingnn/develop_fix_clippingNodeShaderBug 
closed #4315: fixed clippingNode alphaTest Bug
 2014-03-10 21:45:47 +08:00
Dhilan007 11d3acd478 fixed inappropriate usage of inline. 2014-03-10 20:35:36 +08:00
Dhilan007 8bac35ae2a closed #4337:label support create by font name,compatible with old labelTTF. 2014-03-10 19:42:43 +08:00
CocosRobot 8aa11f005b [AUTO]: updating luabinding automatically 2014-03-10 11:27:21 +00:00
James Chen 63292b5ba6 Merge pull request #5544 from heliclei/node-string-tag 
CCNode:Add String tag, to support runtime manipulation
 2014-03-10 18:26:51 +08:00
heliclei 83c4d5b479 fix comments 2014-03-10 18:21:53 +08:00
Huabing.Xu f0ae3fd4dc Merge branch 'develop' into develop_RenderTextureImprovement 2014-03-10 18:11:55 +08:00
James Chen 2147a711ba Merge pull request #5650 from dumganhar/re-add-lua 
Re-add lua bindings support
 2014-03-10 17:47:52 +08:00
Huabing.Xu e15d0a9d20 RenderTexture saveToFile will return true 2014-03-10 17:42:27 +08:00
James Chen 479579fadc Update CMakeLists.txt, lua-tests works ok on linux now. 2014-03-10 02:39:54 -07:00
James Chen e39dcd9974 [Linux] Updates CMakeLists.txt to re-add lua scripting support. 2014-03-10 17:10:08 +08:00
James Chen fd44277e7c lua-tests works again for Win32. 2014-03-10 17:05:35 +08:00
CaiWenzhi f2197cea6f Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed 2014-03-10 16:19:27 +08:00
James Chen 6deadf34b8 lua-tests works again for Android. 2014-03-10 16:04:46 +08:00
James Chen 69bbda688b lua-tests works ok for iOS / Mac, luabindings has its own project. 2014-03-10 15:32:48 +08:00
Huabing.Xu f8f2373c2a closed #4315: fixed clippingNode alphaTest Bug 2014-03-10 15:12:44 +08:00
CaiWenzhi 26b3013f77 Format codes 2014-03-10 15:08:42 +08:00
boyu0 d5031f950a closed #4324: fix PhysicsContact::generateContactData() memory leak. 2014-03-10 14:51:26 +08:00
James Chen 650a88a8b1 Re-add lua bindings codes. 2014-03-10 14:04:58 +08:00
CaiWenzhi 083872f65c Fixed bug of setting anchor point 2014-03-10 12:02:49 +08:00
CaiWenzhi f78d05c85f Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed 2014-03-10 11:49:15 +08:00
James Chen eca0bce1be Merge pull request #5633 from huangml/patch-1 
closed #4319: Node::removeAllChildrenWithCleanup() does not remove PhysicsBody.
 2014-03-10 10:55:54 +08:00
CaiWenzhi 8d3f33bb30 Merge branch 'develop' into develop_nutty_modify_framework_for315CrashFixed 2014-03-10 09:58:26 +08:00
James Chen 2784955845 Merge pull request #5636 from dumganhar/iss3290-onenter-order 
closed #3290: The order of onEnter / onExit  work correctly on JSB and LuaBindings.
 2014-03-08 22:35:09 +08:00
James Chen 7aec578b35 closed #3290: The order of onEnter works correctly on JSB and LuaBindings. 2014-03-08 22:07:55 +08:00
andyque 82fcf939d0 fix ease elastic action error 2014-03-08 21:51:17 +08:00
黄梦龙 8b737d8aab Update CCNode.cpp 
removeAllChildrenWithCleanup() not remove PhysicsBody
 2014-03-08 17:42:35 +08:00
CaiWenzhi 80d97bb107 Modify action 2014-03-07 21:49:24 +08:00
minggo c291cb32a0 Merge pull request #5624 from Dhilan007/develop_label 
label:fixed vertical alignment is incorrect.
 2014-03-07 21:07:09 +08:00
James Chen 84a76db060 Merge pull request #5622 from pandamicro/MotionStreakFix 
closed #4294: Added unimplemented position getter/setter in MotionStreak.
 2014-03-07 19:10:02 +08:00
pandamicro 2427314a65 Issue #4294: MotionStreak: Improve position setters 2014-03-07 19:06:51 +08:00
Dhilan007 4905acfa0b label:fixed vertical alignment is incorrect. 2014-03-07 18:31:33 +08:00
pandamicro e94cd2357d Issue #4294: Add override declaration 2014-03-07 18:11:37 +08:00
Huabing.Xu ad9c104cfd migrate saveToFile compatible with new renderer 2014-03-07 17:41:51 +08:00
CaiWenzhi 0c4bca9bb2 Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-07 16:42:38 +08:00
pandamicro a005fa1dce Issue #4294: Add unimplemented position getter/setter in MotionStreak 2014-03-07 16:32:00 +08:00
minggo 07c0fac44f Merge pull request #5620 from Dhilan007/develop_label 
closed #4301:Label support vertical alignment and assign dimensions.
 2014-03-07 16:12:21 +08:00
Dhilan007 ac944cd42b fixed incorrect display when the size of label not enough to support display all text. 2014-03-07 15:58:49 +08:00
minggo 4251bcf425 Merge pull request #5469 from natural-law/issue3991 
Add method to reload cached texture & update the nodes used the texture.
 2014-03-07 15:58:17 +08:00
heliclei 600c661acb remove script support 2014-03-07 15:12:46 +08:00
Dhilan007 c233b636cd closed #4301:Label support vertical alignment and assign dimensions. 2014-03-07 14:58:44 +08:00
CaiWenzhi 5ee35be0ad Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-07 14:41:32 +08:00
James Chen 9b0c0ab44e Merge pull request #5616 from dumganhar/glview-refactor 
Refactoring GLView for desktop platforms, and adding protected method `updateDesignResolutionSize` for GLViewProtocol class.
 2014-03-07 14:15:20 +08:00
James Chen e0e9e1723c Merge pull request #5612 from Dhilan007/develop_label 
fixed #4300:fixed Label:draw location and BBOX is incorrect.
 2014-03-07 14:09:39 +08:00
James Chen 1cfd14f27d Tab -> 4 spaces, remove unused spaces for CCGLView.h 2014-03-07 14:03:57 +08:00
James Chen ae2f7a4a7d updateDesignResolution -> updateDesignResolutionSize. 2014-03-07 14:01:30 +08:00
James Chen d699f62193 Tab -> 4 spaces, remove unused spaces. 2014-03-07 13:59:56 +08:00
James Chen 49223fe50c Compilation error fixes for linux port (clang compiler). 2014-03-07 13:52:54 +08:00
James Chen 8b359dd90e Refactoring GLView for desktop platforms, and adding protected method `updateDesignResolutionSize` for GLViewProtocol class. 2014-03-07 13:51:12 +08:00
CaiWenzhi 58db7b5c75 Some widgets would be default enabled touch 2014-03-07 12:34:19 +08:00
CaiWenzhi 1606671224 Fixed bug of Text 2014-03-07 12:05:33 +08:00
Dhilan007 f0119ef62f fixed horizontal kerning is incorrect. 2014-03-07 12:03:45 +08:00
CaiWenzhi 51a6eb6d64 Fixed bug of Action Manger Ex 2014-03-07 12:01:51 +08:00
CaiWenzhi b4466fab12 Fixed bug of action manager 2014-03-07 11:58:54 +08:00
CaiWenzhi 0602410958 Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-07 11:51:28 +08:00
Dhilan007 063bde51c3 fixed #4300:fixed Label:draw location and BBOX is incorrect. 2014-03-07 11:42:13 +08:00
minggo 69d445efca Merge pull request #5525 from andyque/bug3868 
fixed #3868. Add guard check to send method of HttpClient
 2014-03-07 11:31:32 +08:00
CaiWenzhi f9ea39bf81 Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-07 10:54:38 +08:00
CaiWenzhi 7cdfba088d Modify reader 2014-03-07 10:35:58 +08:00
minggo 5999811028 Merge pull request #5547 from nutty898/develop_nutty_modify_framework_for315 
Fixd bugs for editor
 2014-03-07 10:30:55 +08:00
Huabing.Xu 5c1be5f2ef Merge branch 'develop' into develop_fix_node_transform_bug 
* develop:
  Improved documentation
  better doctrings
  fixes for linux
  small setup.py fixes
  Update CHANGELOG [ci skip]
  closed #4291：open CCEditBox as modal dialog
  Fixes 'schedule test/issue#2268' crashes
  closed #4150:  fix physics position/rotation tag bug.
 2014-03-07 10:07:19 +08:00
Huabing.Xu 9fc6177570 fix bug for outdated transform status 2014-03-07 10:03:34 +08:00
Ricardo Quesada 57b6478de7 Improved documentation 2014-03-06 16:14:06 -08:00
Ricardo Quesada 77d19e9bc2 better doctrings 
improved documentation for Node
 2014-03-06 14:04:19 -08:00
CaiWenzhi 1d867d770b Modify Windows project 2014-03-06 22:27:57 +08:00
CaiWenzhi 94339312ba Modify text filed size control 2014-03-06 21:58:45 +08:00
CaiWenzhi fea75444a7 Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-06 21:43:33 +08:00
CaiWenzhi 8b7a5c3141 Add RichText sample 2014-03-06 20:52:29 +08:00
zhangbin 56a46892fe closed #3991, Remove the method CCTextureCache::updateTexture(). 2014-03-06 17:38:18 +08:00
zhangbin 822ef8d588 Merge branch 'develop' into issue3991 2014-03-06 17:28:20 +08:00
CaiWenzhi 03f5be47da Modify for editor 2014-03-06 17:21:09 +08:00
boyu0 b926e4efad closed #4150: fix physics position/rotation tag bug. 2014-03-06 17:04:54 +08:00
CaiWenzhi b02ed6fb1e Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-06 16:17:35 +08:00
CaiWenzhi bd5c11b5ee Modify mk file and solve warnings 2014-03-06 16:15:03 +08:00
CaiWenzhi 2a5ecc2376 Fixed bugs of Flipping 2014-03-06 13:40:46 +08:00
CaiWenzhi 3554dcd749 Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-06 11:22:33 +08:00
zhangbin fec04dd6ae Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-03-06 11:03:49 +08:00
James Chen 87b657b5bb Merge pull request #5575 from dumganhar/iss4286-event-crash 
closed #4286: 'EventDispatcherTest/Issue 4129' crashes on Windows.
 2014-03-06 11:03:34 +08:00
Ricardo Quesada 273d0d22f1 little performance improvement in quad command 2014-03-05 18:50:09 -08:00
James Chen 183622c718 'EventDispatcherTest/Issue 4129' crashes on Windows. 2014-03-06 10:45:29 +08:00
heliclei 73a3011b11 fix comments 2014-03-06 10:31:29 +08:00
heliclei 08d0cde490 Merge remote-tracking branch 'upstream/develop' into node-string-tag 2014-03-06 10:02:50 +08:00
zhangbin 6da0afdd03 Solve the crash in CocoStudioComponentsTest. 2014-03-06 09:23:27 +08:00
Ricardo Quesada a0ab8fcdf3 onDraw() updated 
`onDraw()` receives `const kmMat4 &transform` and `bool
transformUpdated`.

`CC_NODE_DRAW_SETUP()` is no longer used in our code.
`_modelViewTransform` is only used as a cache.
 2014-03-05 15:49:08 -08:00
Ricardo Quesada 0cb759cab8 Better names for tests 2014-03-05 11:50:12 -08:00
CaiWenzhi 5e84c15812 Add RichText 2014-03-05 23:03:49 +08:00