mustime
96e621bae8
issue #1425 : recreate LuaCocos2d.cpp for .pkg files' changes
2012-08-23 16:13:08 +08:00
mustime
36a99a099e
issue #1425 : add TestLua project
2012-08-23 16:10:50 +08:00
James Chen
06038163ca
iss1429: Finished using Dialog to implement CCEditBox for android port.
...
Next step:
Using Java codes to implement Cocos2dxEditBox. Don't use style.xml, color.xml and keyboard.xml.
2012-08-23 15:34:57 +08:00
minggo
23bd0268cf
Merge pull request #1217 from zeaster/gles20
...
fixed #1298 : double firing CCCallFunc action in CCSequence
2012-08-23 00:34:06 -07:00
minggo
7a6f5cd872
Merge pull request #1219 from minggo/iss1441_testcpp_resources
...
fixed #1441 : put hd and ipad resources into separate directory
2012-08-22 23:28:42 -07:00
minggo
0c5cec0056
fixed #1441:fix a logical error in CCFileUtils::fullPathFromRelativePath()
2012-08-23 14:26:39 +08:00
minggo
d83cdbda09
fixed #1441 : put hd and ipad resources into separate directory
2012-08-23 14:20:32 +08:00
mustime
be3a02c7f3
issue #1425 : fixed the problem when using ccBezierConfig to create
...
CCBezierAction
2012-08-23 13:54:23 +08:00
mustime
ceb5e41ab0
issue #1425 : fixed the problem when using ccBezierConfig to create
...
CCBezierAction
2012-08-23 13:52:12 +08:00
James Chen
a437099779
issue #1429 : Use activity to implement CCEditBox for android. Next step: use dialog to implement CCEditBox.
2012-08-23 09:42:28 +08:00
yichao.zhang
988a8d8a60
fixed #1298 : do not update last action when it is done in IntervalAction
2012-08-22 19:48:32 +08:00
James Chen
9553031196
fixed #1112 : Lua support for blackberry port.
2012-08-22 18:48:57 +08:00
James Chen
dbd02b2726
Merge branch 'gles20' of https://github.com/dducharme/cocos2d-x into dale_lua
2012-08-22 18:28:11 +08:00
minggo
99b81e3e38
Merge pull request #1216 from minggo/iss1439_synchronize
...
fixed #1439:synchronize to cocos2d-iphone v2.0.0
2012-08-22 00:52:54 -07:00
minggo
3b442dfc0f
fixed #1439:synchronize to cocos2d-iphone v2.0.0
2012-08-22 15:51:25 +08:00
minggo
c7d20e2fef
Merge pull request #1214 from John-cdy/gles20
...
issue #1404 : Add android test python script files and modify android com...
2012-08-22 00:26:41 -07:00
minggo
3b1bfa5852
Merge pull request #1215 from minggo/iss1440_ccsprite_displayFrame
...
fixed #1440:convert offert point to pixel
2012-08-21 23:30:37 -07:00
minggo
2a9d29ba21
fixed #1440:convert offert point to pixel
2012-08-22 14:29:23 +08:00
mustime
1ffdbc1639
issue #1425 : add standard comment on CCCallFunc::create(int nHandler) and
...
CCCallFuncN::create(int nHandler)
2012-08-22 14:21:48 +08:00
mustime
354f7a51b2
issue #1425 : recreate luacocos2d.cpp to meet pkg files
2012-08-22 12:02:56 +08:00
Caidongyang
6ed075f09a
issue #1404 : Add android test python script files and modify android compile script files.
2012-08-22 11:08:18 +08:00
James Chen
bcbd161398
issue #1429 : First commit CCEditBox for android port.
2012-08-22 09:47:04 +08:00
mustime
d01842a37b
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into testlua
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2012-08-22 09:39:21 +08:00
Dale Ducharme
d76d9a6451
Adding lua scripting to BlackBerry port.
2012-08-21 13:32:28 -04:00
mustime
57659d1584
issue #1425 : modifing pkg files for Lua
2012-08-21 18:42:35 +08:00
minggo
ce274cfb4f
Merge pull request #1209 from minggo/iss1437_return_pointer
...
make CCEGLView::sharedOpenGLView() and CCApplication::sharedApplication() return pointer
2012-08-21 02:47:47 -07:00
minggo
7cc5d084ce
Merge pull request #1 from dumganhar/iss1437_return_pointer
...
issue #1437 : fixed some compile errors.
2012-08-21 02:47:02 -07:00
James Chen
4c2702fcef
issue #1437 : fixed some compile errors for blackberry port.
2012-08-21 17:42:56 +08:00
James Chen
55ea089fc2
Merge branch 'iss1437_return_pointer' of https://github.com/dumganhar/cocos2d-x into gles20
2012-08-21 17:25:32 +08:00
James Chen
fac3e9c8de
issue #1437 : fixed some compile errors.
2012-08-21 17:25:03 +08:00
James Chen
314a9225a3
Merge branch 'iss1437_return_pointer' of https://github.com/dumganhar/cocos2d-x into gles20
2012-08-21 17:24:40 +08:00
James Chen
74cb2f459d
Merge branch 'iss1437_return_pointer' of https://github.com/minggo/cocos2d-x into gles20
2012-08-21 17:22:37 +08:00
minggo
bc07682875
Merge pull request #1211 from minggo/gles20
...
change version
2012-08-21 02:03:53 -07:00
minggo
e939285c93
change version
2012-08-21 17:03:01 +08:00
James Chen
3eecc283d0
Merge branch 'iss1437_return_pointer' of https://github.com/minggo/cocos2d-x into iss1437_return_pointer
2012-08-21 16:57:41 +08:00
minggo
644f3f04f2
Merge pull request #1210 from minggo/iss1438_android_template
...
android template use its own source codes
2012-08-21 01:52:12 -07:00
minggo
ba2049d086
iss1438_android_template
2012-08-21 16:45:23 +08:00
James Chen
d918c8186f
Update extensions/GUI/CCEditBox/CCEditBox.cpp
...
Revert this file, uncomment some codes in 'initWithXXX'.
2012-08-21 16:03:36 +08:00
minggo
8c483613e7
issue #1437:make CCApplication::sharedApplication() return pointer
2012-08-21 15:41:00 +08:00
minggo
07ddd43695
issue #1437:make CCApplication::sharedApplication() return pointer
2012-08-21 15:28:43 +08:00
minggo
cfdc50fb60
issue #1437:make CCEGLView::sharedOpenGLView() return pointer
2012-08-21 14:58:31 +08:00
minggo
0231f65716
Merge pull request #1208 from minggo/iss1382_ccb_reader
...
fixed #1382:safe retain mOwner to avoid crash caused by null pointer
2012-08-20 20:23:03 -07:00
minggo
19f4356c0b
Merge pull request #1207 from aninggo/patch-2
...
Update cocos2dx/include/ccConfig.h
2012-08-20 20:08:52 -07:00
minggo
0c5ba1989d
Merge pull request #1206 from aninggo/patch-1
...
Update cocos2dx/platform/mac/CCGL.h
2012-08-20 20:08:29 -07:00
ningxu
5baa19992d
Update cocos2dx/include/ccConfig.h
2012-08-21 10:56:12 +08:00
Donald Alan Morrison
81d8dd0eb2
Silenced a false-positive warning from the LLVM Static Analyzer with initialization.
...
The warning is caused because the code has a series of if statements not chained with else clauses -- code that works as-is, but scares the SA. Probably not worth the effort to refactor...the optimizing compiler probably removes a temporary variable.
2012-08-20 18:30:12 -07:00
Donald Alan Morrison
7d66f62881
Removed a Static Analyzer Warning about immutable NSNotification object ownership by changing a property from assign to copy.
2012-08-20 18:09:51 -07:00
Donald Alan Morrison
61a5b2a742
Plugged a memory leak identified by LLVM Static Analyzer.
2012-08-20 16:48:07 -07:00
Donald Alan Morrison
c482a246be
Plugged potential memory leak found by LLVM Static Analyzer.
2012-08-20 16:40:26 -07:00
Donald Alan Morrison
abe45e53b5
Commented out unused debug variable to silence Static Analyzer Warning. (Value never read.)
2012-08-20 16:16:00 -07:00