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

9748 Commits

Author SHA1 Message Date
Yongqin Liu d0f75ba92a Fix the bug for the bound check 
Signed-off-by: Yongqin Liu  <liuyq0307@thundersoft.com>
 2013-05-30 09:54:09 +08:00
James Gregory 09bc00032c Add destructor for CCGLBufferedNode class to delete GL buffers. 2013-05-29 17:46:25 -07:00
Ricardo Quesada 827fa638ca Adds support for "CCString" types for boolean and integers 2013-05-29 15:49:34 -07:00
Jaroslaw Lewandowski 7d4eea0646 Fixed compilation error for iOS project using Compiler Default C++ Language Dialect 2013-05-29 21:14:19 +01:00
Ben Ward d166de4684 Fixed tabbing. 2013-05-29 15:40:19 +01:00
James Chen 8456072aa0 Merge pull request #2671 from pyrasis/tizen_2.1 
Implement setIMEKeyboardState function for Tizen
 2013-05-29 07:23:47 -07:00
Lee, Jae-Hong ae78bb9b47 Modify space character check. 2013-05-29 23:14:52 +09:00
Lee, Jae-Hong ccd20af8f9 Implement setIMEKeyboardState function for Tizen. 2013-05-29 22:46:52 +09:00
James Chen 50c9515741 Merge pull request #2663 from pyrasis/tizen_2.1 
Fix Tizen CCEditBox bug.
 2013-05-29 06:39:01 -07:00
Yongqin Liu aea9e04fbf Add out of bound check for the index before do the update 
Signed-off-by: Yongqin Liu  <liuyq0307@thundersoft.com>
 2013-05-29 19:18:46 +08:00
minggo 82e56774dd Update AUTHORS 
[ci ignore]
 2013-05-29 17:12:19 +08:00
minggo 53365b9e46 Merge pull request #2669 from frranck/master 
adding norwegian language
 2013-05-29 02:10:37 -07:00
Ricardo Quesada a219f9c520 CCConfiguration has format 
CCconfiguration has a file format.
It has a data and metadata
 2013-05-29 17:09:04 +08:00
minggo 05db67e8ae Merge pull request #2667 from ricardoquesada/configuration_format_2 
CCConfiguration has format
 2013-05-29 01:59:34 -07:00
minggo fdce4038e1 Update AUTHORS 
[ci ignore]
 2013-05-29 16:55:57 +08:00
minggo c862357b50 Merge pull request #2650 from varlucian/onentertransitionfinnished 
OnEnterTransitionDidFinish was called twice when a node is added in onEnter
 2013-05-29 01:53:37 -07:00
minggo 0ca5d99a30 Update AUTHORS 
[ci ignore]
 2013-05-29 16:44:14 +08:00
minggo 9db1a7b550 Merge pull request #2665 from jotel/accel-fix 
Explicitly initialising CCAcceleration structure
 2013-05-29 01:41:26 -07:00
franck 81a0fed3e2 adding norwegian language... 2013-05-29 10:31:46 +02:00
franck 3fab093f5b adding Norwegian language support 2013-05-29 10:16:22 +02:00
Jaroslaw Lewandowski 94eef4d235 Removed unused variable which caused Linux build to fail 2013-05-29 10:15:31 +02:00
zhangbin a6346a8036 issue #2224 : Use variable argument functions in the implementation of reflection. 2013-05-29 14:22:08 +08:00
Yongqin Liu f6b5208be5 CCLabelAtlas.cpp: add check for n when call setDirty 
in CCLabelAtlas::updateAtlasValues, there is the case that n equal to 0,
so we need to check it before when call m_pTextureAtlas->setDirty(true) and do
other process.

Signed-off-by: Yongqin Liu <liuyq0307@thundersoft.com>
 2013-05-29 10:45:47 +08:00
Lee, Jae-Hong e48553bc27 Delete ByteBuffer pointer and NULL check. 2013-05-29 10:52:45 +09:00
Ricardo Quesada ebb392ca8e CCConfiguration has format 
CCconfiguration has a file format.
It has a data and metadata
 2013-05-28 18:15:16 -07:00
Jaroslaw Lewandowski 3f7c506638 Ability to save/retrieve CCData into/from CCUserDefault 2013-05-29 01:06:41 +01:00
Jaroslaw Lewandowski 2999abed2b Explicitly initialising CCAcceleration structure to report zeros when run in device simulator 2013-05-29 00:02:36 +01:00
Lee, Jae-Hong c20e4f3700 Keep a previous text on Tizen CCEditBox. 2013-05-28 20:43:47 +09:00
Lee, Jae-Hong 5031aa1fd3 Encoding UTF-8 on Tizen CCEditBox and check empty string. 2013-05-28 20:04:37 +09:00
James Chen 1b1fb1253b Merge pull request #2662 from CocosRobot/updategeneratedsubmodule_1369737138 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-05-28 03:44:37 -07:00
CocosRobot 49780e3fcb [AUTO] : updating submodule reference to latest autogenerated bindings 2013-05-28 10:32:21 +00:00
James Chen 8293f68949 Merge pull request #2661 from CocosRobot/updategeneratedsubmodule_1369736349 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-05-28 03:23:42 -07:00
CocosRobot 0f64be0ce4 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-05-28 10:19:13 +00:00
zhangbin 4022e002e8 issue #2224 : Modify the implementation of plugin flurry & umeng. 2013-05-28 18:10:09 +08:00
minggo 27b9a4d4ae Merge pull request #2660 from minggo/ETC1-support 
modify ORGANIZATIONNAME
 2013-05-28 03:09:45 -07:00
minggo 8902d7b762 Merge pull request #2659 from minggo/ETC1-support 
modify ORGANIZATIONNAME
 2013-05-28 03:08:43 -07:00
minggo 98b1d95a74 modify ORGANIZATIONNAME 2013-05-28 18:04:42 +08:00
minggo 35eeb5d829 Merge pull request #2654 from minggo/ETC1-support 
Support ETC1 format on Android
 2013-05-28 00:07:24 -07:00
minggo dee652c989 Merge pull request #2655 from minggo/ETC1-support 
Support ETC1 format on Android
 2013-05-28 00:07:04 -07:00
minggo 5f37e854c4 issue #2161: resolve conflict 2013-05-28 11:50:14 +08:00
minggo 6f624351b3 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ETC1-support 2013-05-28 11:36:05 +08:00
Yongqin Liu 56037a4939 CCTextureAtlas::updateQuad modify for the memcpy hot spot 
change the place that call CCTextureAtlas::updateQuad method to
update the quads with pointer reference directly.

Signed-off-by: Yongqin Liu<liuyq0307@thundersoft.com>
 2013-05-28 10:23:47 +08:00
minggo d6e547cd02 issue #2161:add CCTextureETC.cpp/.h into vs2010 project 2013-05-28 10:04:19 +08:00
Lucian Varlan a70569ff03 OnEnterTransitionDidFinish was called twice when a node is added in onEnter 
Fix ported from cocos2d-iphone:
99b7bef880
 2013-05-27 16:07:09 +03:00
minggo b038741d78 issue #2161: make linux,marmalade,native client,mac and emscripten project to include CCTextureETC.cpp 2013-05-27 15:06:43 +08:00
minggo beef61fc90 issue #2161: android supports ETC format now 2013-05-27 14:42:22 +08:00
zhangbin c5965989b0 issue #2224 : Modify the implementation of plugin admob. 2013-05-27 14:40:08 +08:00
zhangbin 35bc7a51d8 issue #2224 : Modify the implementation of plugin alipay & nd91. 2013-05-27 14:19:36 +08:00
zhangbin 9f61f92017 issue #2224 : Modify the implementation of plugin twitter & weibo on android for the new framework of plugin. 2013-05-27 13:58:31 +08:00
James Chen 3976445848 Merge pull request #2647 from dumganhar/master 
Merge branch 'develop'
 2013-05-26 18:51:42 -07:00