minggo
|
9e6bac803e
|
Merge pull request #418 from minggo/master
[android] fixed #631: Send \n to engine when user input nothing
|
2011-07-25 20:45:40 -07:00 |
minggo
|
b308effdc5
|
[android] fixed #631: Send \n to engine when user input nothing
|
2011-07-26 11:41:28 +08:00 |
minggo
|
ccb46d7c9b
|
Merge pull request #417 from natural-law/master
fixed #632
|
2011-07-25 20:25:25 -07:00 |
natural-law
|
0a8c1cada4
|
fixed #632, [win32] Update the visual studio template for lua supported.
|
2011-07-26 11:15:12 +08:00 |
Walzer
|
20bba80c73
|
Merge remote branch 'origin/master'
|
2011-07-25 15:02:41 +08:00 |
Walzer
|
059e5ebc0b
|
add "virtual" keyword to the destructor of CCMutableArray, to prevent someone delete it as a CCObject and cause memory leak
|
2011-07-25 15:00:00 +08:00 |
minggo
|
912ac3c8fe
|
Merge pull request #415 from minggo/iss623
[android] fixed #623: refactor Cocos2dJni.cpp
|
2011-07-24 23:23:00 -07:00 |
minggo
|
ab4ef0f180
|
Merge https://github.com/cocos2d/cocos2d-x into iss623
|
2011-07-25 14:13:20 +08:00 |
minggo
|
b105b6005e
|
[android] fixed #623: refactor Cocos2dJni.cpp
|
2011-07-25 14:12:30 +08:00 |
minggo
|
461fb43f1f
|
Merge pull request #412 from minggo/iss624
[android]fixed #624: insert white space in front of \n
|
2011-07-24 18:48:45 -07:00 |
Walzer
|
f47ff921e2
|
Merge pull request #414 from leon-li/master
fix warning under android
|
2011-07-24 06:12:25 -07:00 |
Leon
|
9ce402655d
|
Merge remote branch 'upstream/master'
|
2011-07-24 12:24:16 +08:00 |
Leon
|
864878d15a
|
fix warning on android
|
2011-07-24 12:16:40 +08:00 |
Walzer
|
b43d233c08
|
issue #629, pass eImgFmt param to initWithImageData. But still haven't add test case for this.
|
2011-07-24 09:04:08 +08:00 |
Walzer
|
45e8915963
|
fixed #628, CCMutableArray::arrayWithObjects & arrayWithArray should set the return object to autorelease. And add CCAnimation::m_pobFrames->retain() after it get value from arrayWithArray. (it's property with retain in -iphone version but we miss the retain)
|
2011-07-24 08:30:49 +08:00 |
minggo
|
62ea6a2d46
|
issue #623: create JniHelper and use it somewhere
|
2011-07-22 18:14:29 +08:00 |
minggo
|
13a1629299
|
fixed #624: insert white space in front of \n
|
2011-07-22 12:10:41 +08:00 |
minggo
|
5ba5d08e47
|
Merge pull request #411 from minggo/master
use release version of tolua
|
2011-07-20 23:05:34 -07:00 |
minggo
|
17e915fc24
|
use release version of tolua
|
2011-07-21 14:01:55 +08:00 |
minggo
|
60bfa6224f
|
Merge pull request #410 from minggo/master
[win32] add Texture2DTest to vs2010
|
2011-07-20 01:05:06 -07:00 |
minggo
|
eb2cf3afd0
|
[win32] add Texture2DTest to vs2010
|
2011-07-20 16:00:21 +08:00 |
minggo
|
0dac01b3d8
|
Merge pull request #409 from natural-law/master
fixed #621
|
2011-07-20 00:43:02 -07:00 |
minggo
|
36a1f574b3
|
Merge pull request #408 from minggo/iss620
[win32] fixed #620: change the output of lua to a lib
|
2011-07-20 00:40:53 -07:00 |
natural-law
|
32e7ee6e2f
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
|
2011-07-20 15:35:52 +08:00 |
natural-law
|
6a8b563feb
|
fixed #621, Add Texture2dTest in tests project.
|
2011-07-20 15:35:20 +08:00 |
minggo
|
3e080476f3
|
[win32] fixed #620: change the output of lua to a lib
|
2011-07-20 15:21:51 +08:00 |
Leon
|
f021645e90
|
Merge remote branch 'upstream/master'
|
2011-07-20 13:35:48 +08:00 |
minggo
|
6996ccee95
|
Merge pull request #407 from leon-li/master
fix: passing std::string object to CCLOG
|
2011-07-19 20:42:29 -07:00 |
Leon
|
6426e96f82
|
Merge remote branch 'upstream/master'
|
2011-07-20 11:42:00 +08:00 |
Leon
|
5f1f63dabf
|
fix: passing std::string object to CCLOG
|
2011-07-20 08:52:29 +08:00 |
minggo
|
0c495628ea
|
Merge pull request #405 from minggo/iss618
invoke java code(System.exit()) to finish programe
|
2011-07-19 02:20:36 -07:00 |
minggo
|
74113bda68
|
Merge pull request #406 from leon-li/master
Fix compile error on android ndk r6
|
2011-07-19 02:19:45 -07:00 |
Leon
|
d2d02e0c52
|
fix compile error with android-ndk-r6
|
2011-07-19 16:54:42 +08:00 |
Walzer
|
d2b44a203f
|
issue #536, build success on win32
|
2011-07-19 16:03:42 +08:00 |
minggo
|
640d811809
|
[android] fixed #618: invoke java code(System.exit()) to finish programe
|
2011-07-19 16:01:22 +08:00 |
Walzer
|
768bfa9a9b
|
issue #536, add CCTexturePVR, update from 0.99.5 to 1.0.0, remove _POWERVR_SUPPORT marco, use CC_SUPPORT_PVRTC instead, the plan is to support PVR format on all platforms. Compile successfully on ios & android, but haven't compile on other paltforms. Test case haven't written yet.
|
2011-07-19 15:22:13 +08:00 |
Walzer
|
bc44855091
|
issue #536, integrate the CCTexturePVR to project, update from 0.99.5 to 1.0.0, compile successfully on ios & android. Haven't test on other platforms yet.
|
2011-07-19 15:14:59 +08:00 |
minggo
|
58e53d7021
|
Merge pull request #404 from minggo/master
update LuaCocos2d.cpp and pkg files
|
2011-07-18 19:32:52 -07:00 |
minggo
|
914706735f
|
update LuaCocos2d.cpp and pkg files
|
2011-07-18 17:04:15 +08:00 |
minggo
|
c64fed4543
|
Merge pull request #403 from minggo/master
Do some work for lua
|
2011-07-17 19:36:50 -07:00 |
minggo
|
7a12bb9cdc
|
fixed #613: Call executeCallFuncN instead of executeCallFunc in CCMenuItem::activate()
|
2011-07-18 10:31:41 +08:00 |
minggo
|
d97fcbf752
|
fixed #612: export some CCNode methods to lua
|
2011-07-18 10:28:25 +08:00 |
minggo
|
a3e9679578
|
fixed #611: add some functions for lua
|
2011-07-18 10:18:36 +08:00 |
minggo
|
29efe9bd39
|
Merge pull request #402 from minggo/iss615
fixed #615: CCLog may crash when invoke lua function
|
2011-07-17 18:40:23 -07:00 |
minggo
|
9bbab7897a
|
fixed #615: CCLog may crash when invoke lua function
|
2011-07-14 17:52:56 +08:00 |
minggo
|
0817d59edf
|
Merge pull request #401 from minggo/master
[android] fixed #609: retain & release obj in CCSet
|
2011-07-14 02:27:56 -07:00 |
minggo
|
4694926edb
|
[android] fixed #609: retain & release obj in CCSet
|
2011-07-14 15:32:11 +08:00 |
minggo
|
257dfb1135
|
Merge pull request #400 from minggo/iss610
[android] fixed #610: remove the support of ndk-r4
|
2011-07-13 20:39:50 -07:00 |
minggo
|
dd42936bb3
|
[android] fixed #610: remove the support of ndk-r4
|
2011-07-14 10:37:40 +08:00 |
Walzer
|
47e4c719e1
|
update the version in doxygen config
|
2011-07-14 00:33:27 +08:00 |