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

752 Commits

Author SHA1 Message Date
Zhe Wang 9b6027d284 Merge pull request #4947 from walzer/develop 
udpate copyrights for the new year 2014 and Chukong.
 2014-01-06 19:50:18 -08:00
minggo 49d314363f Merge pull request #4945 from dabingnn/develop_label_shaderBug 
fix label fnt bug for wrong shader
 2014-01-06 19:44:06 -08:00
Huabing.Xu 6c6da4cf77 fix label fnt bug for wrong shader 2014-01-07 11:39:55 +08:00
walzer 64af0de648 update copyrights for 2014, in cocos/2d/ folder 2014-01-07 11:25:07 +08:00
minggo 721181632b Merge pull request #4930 from Dhilan007/develop_crash 
fix error for load spriteFrames from plist in CCAnimationCache class.
 2014-01-06 18:57:47 -08:00
Dhilan007 aec4045797 fix error for load spriteFrames from plist in CCAnimationCache class. 2014-01-06 20:23:45 +08:00
James Chen 75804ac8a2 Warning fix in ccUTF8.cpp/h 2014-01-06 20:04:09 +08:00
James Chen dd0e157c74 Warning fix in CCTextFieldTTF.cpp. 2014-01-06 20:01:28 +08:00
minggo 9b44e80cf2 Merge pull request #4900 from dabingnn/develop_SpriteBatchNodeShaderBug 
init shader on construction instead of draw in class CCSpriteBatchNode
 2014-01-06 00:11:59 -08:00
minggo e4bec7d1ef Merge pull request #4902 from Dhilan007/develop_crash 
fix TextInput not show IME on android.
 2014-01-05 19:50:19 -08:00
Dhilan007 5b317196c8 fix TextInput not show IME on android. 2014-01-06 11:45:18 +08:00
Huabing.Xu 381be48c56 init shader on construction instead of draw in class CCSpriteBatchNode 2014-01-06 11:26:00 +08:00
James Chen d74d21a6f0 Merge pull request #4884 from daltomi/debug 
Proposal: remove boolean flag, The pointer *atlas == item.second not change in map::erase().
 2014-01-05 19:08:37 -08:00
minggo fcfa6744f4 make TMXLayer::getProperties() return reference 2014-01-05 18:20:29 +08:00
chengstory 4893c561db Merge branch 'develop' into #3582 2014-01-05 12:43:41 +08:00
James Chen 03200374b0 Merge pull request #4887 from Dhilan007/develop_crash 
fix crash related to not support the z length modifier for size_t on vs
 2014-01-04 20:10:40 -08:00
Dhilan007 49d8b76b9e fix crash related to not support the z length modifier for size_t on vs 2014-01-05 11:59:32 +08:00
chengstory 7efacc4890 issue #3582 void serialize(void *r) -> bool serialize(void *r) 2014-01-05 01:13:16 +08:00
James Chen f94221a93b compilation error fix. ssize_t -> int 2014-01-04 22:21:14 +08:00
James Chen 3c04d586b0 Wrong warning fixes correct in ccUTF8.cpp. 2014-01-04 21:54:05 +08:00
James Chen 42356e8597 Exchanges order of Sprite::setSpriteFrame(string), Sprite::setSpriteFrame(frame) . It’s needed for bindings-generator to generate correct binding glue codes. 2014-01-04 21:53:03 +08:00
Daniel T. Borelli 08dad98592 map:erase() is safe for item.second == FontAtlas* 2014-01-04 07:22:50 -03:00
James Chen 6827538802 Adds override keyword for override functions. 2014-01-04 18:12:09 +08:00
James Chen 43cdf1713b Merge pull request #4864 from daltomi/test 
fix bad name variable CCDirector
 2014-01-03 21:44:42 -08:00
Daniel T. Borelli d10992951b fix bad name variable 2014-01-04 02:22:09 -03:00
Dhilan007 35246b0810 fix compiling error and miss file on vs. 2014-01-04 12:25:12 +08:00
James Chen f55be38ad8 Merge pull request #4853 from Dhilan007/develop_crash 
fix label not appear on the screen
 2014-01-03 19:00:06 -08:00
Dhilan007 b14999a7a7 fix label not appear on the screen 2014-01-04 10:56:14 +08:00
James Chen f3eb21e748 Merge pull request #4852 from dumganhar/iss3579-lua-bugtest914-crash 
closed #3579: TestLua->BugsTest->bug914 crashes if clicking 'reset' button all the time.
 2014-01-03 18:51:16 -08:00
James Chen 0082cf3e4d closed #3579: TestLua->BugsTest->bug914 crashes if clicking 'reset' button all the time. 2014-01-04 10:28:09 +08:00
Ricardo Quesada 76960ab83a Merge pull request #4851 from ricardoquesada/node_vertex_z_fix 
Node vertex Z fix
 2014-01-03 17:55:32 -08:00
Ricardo Quesada 5a0284c183 Node vertex Z fix 
Node correctly  sets the Z vertex in getNodeToParentTransform(),
and not in transform().

This is the correct thing to do, and also fixes possible collisions
with the additionalTransform (eg: Camera)
 2014-01-03 17:54:07 -08:00
James Chen 46153d8c34 More warning fixes. 2014-01-04 09:17:37 +08:00
Ricardo Quesada a7b33e3ec3 Fixes NodeToWorld 
Multiplication was in the incorrect order
 2014-01-03 14:21:33 -08:00
minggo 5ad3414921 Merge pull request #4834 from minggo/bug-fix 
Put "initxx" functions into protected.
 2014-01-03 03:27:55 -08:00
minggo 4fc7ad6e3d Merge pull request #4791 from dabingnn/develop_clippingNodeMobile 
fix bug clippingNodetest on mobile
 2014-01-03 02:36:52 -08:00
minggo 1d04b42947 Put "initxx" functions into protected. 2014-01-03 18:15:56 +08:00
samuele3hu 2b19da00df Update the lua test cases about the armature 2014-01-03 14:51:36 +08:00
James Chen 0fe73f3a5d Merge pull request #4804 from minggo/android-config 
don't build spine module when build 2d module
 2014-01-02 06:53:15 -08:00
minggo 676e25d304 2d module don't denpend on spine 2014-01-02 20:17:11 +08:00
James Chen 602468e3f2 Merge pull request #4802 from dumganhar/develop 
Fixes two memory leaks in EventDispatcher::removeEventListener(removeEventListeners).
 2014-01-02 04:08:22 -08:00
James Chen 05b1be3aeb Fixes two memory leaks in EventDispatcher::removeEventListener(removeEventListeners). 2014-01-02 19:59:10 +08:00
minggo ded3e753f3 use std::function for call back 2014-01-02 17:23:00 +08:00
Huabing.Xu 57b0426994 fix bug clippingNodetest on mobile 2014-01-02 16:19:23 +08:00
Dhilan007 ebf3faadc3 fix crash related to not support the z length modifier for size_t on vs 2013-12-31 16:32:16 +08:00
Huabing.Xu b2934d32bc Merge branch 'develop' into develop_RenderTextureBug 
* develop: (32 commits)
  fix align text error in label
  Update the JS binding code & samples for latest cocos2d engine.
  [AUTO] : updating submodule reference to latest autogenerated bindings
  texture listener was enabled only when the macro CC_ENABLE_CACHE_TEXTURE_DATA was enabled.
  Updates nativeactivity.cpp.
  closed #2865: Deprecates CCNotificationCenter, uses EventDispatcher instead.
  remove other non-functional jenkins scripts
  [AUTO] : updating submodule reference to latest autogenerated bindings
  move ghprb.py to tools/jenkins-scripts/
  issue #2050: commit resources
  add github pull request builder for Jenkins
  Adds an empty LuaEngine::parseConfig function.
  [JSB] Adds trigger bindings for CocoStudio.
  update cocos2d-x version string
  update describe for support translucency on android
  update describe for support translucency on android
  update describe for support translucency on android
  recover java activity on android.
  remove draw increment
  migrate ShaderTestSprite to new renderer
  ...
 2013-12-31 14:58:11 +08:00
Dhilan007 b51efbd654 fix align text error in label 2013-12-31 14:13:26 +08:00
Huabing.Xu bf1f5dd0e0 fix rendertexture bug 2013-12-31 11:48:51 +08:00
James Chen 8145bf903e texture listener was enabled only when the macro CC_ENABLE_CACHE_TEXTURE_DATA was enabled. 2013-12-31 11:02:01 +08:00
James Chen 973adc6b2f Updates nativeactivity.cpp. 2013-12-31 10:55:59 +08:00