minggo
|
f894e00f27
|
fix a bug of CCProgressTimer when upgrade to rc3
|
2011-07-06 16:29:56 +08:00 |
minggo
|
980ce79ead
|
[android] fixed #577: init member variable to default value
|
2011-07-06 15:22:25 +08:00 |
minggo
|
59ed71df03
|
Merge pull request #353 from minggo/master
upgrade to 1.0.0-rc3
|
2011-07-06 00:02:45 -07:00 |
minggo
|
ff50997eb0
|
issue #574
|
2011-07-06 14:56:05 +08:00 |
Walzer
|
ac700583cc
|
fixed #573, init m_tColor & m_tBlendFunc in CCLayerColor constructor
|
2011-07-05 15:39:50 +08:00 |
minggo
|
7603665165
|
fix merging confict of CCDirector.cpp
|
2011-07-05 14:54:41 +08:00 |
minggo
|
7adb140439
|
fixed #568
|
2011-07-05 14:51:17 +08:00 |
minggo
|
2b963060ab
|
Merge pull request #352 from natural-law/master
fixed #563
|
2011-07-04 22:56:40 -07:00 |
Walzer
|
12aa33e0ee
|
fix an unsafe call in CCDirector::isOpenGLAttached(). Thanks to Ben Smith http://www.cocos2d-x.org/boards/6/topics/2092
|
2011-07-05 12:13:07 +08:00 |
natural-law
|
6c95a3190f
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
|
2011-07-05 12:05:43 +08:00 |
natural-law
|
7107c6612b
|
fixed #563, Upgrade folder support to rc3.
|
2011-07-05 12:05:19 +08:00 |
minggo
|
ad3bad964f
|
fixed #567
|
2011-07-05 11:36:46 +08:00 |
minggo
|
0d80326392
|
fixed #564: upgrade textures to 1.0.0-rc3
|
2011-07-05 10:47:25 +08:00 |
minggo
|
0e6bf40e7c
|
fixed #561: upgrade particle_nodes to 1.0.0-rc3
|
2011-07-04 19:20:16 +08:00 |
minggo
|
6b97a381e9
|
fixed #560: upgrade misc_nodes to 1.0.0-rc3
|
2011-07-04 16:01:57 +08:00 |
minggo
|
8478288e88
|
fixed #iss559
|
2011-07-04 14:47:32 +08:00 |
minggo
|
210840a22a
|
fixed #555: upgrade effects to 1.0.0-rc3
|
2011-07-04 14:21:03 +08:00 |
minggo
|
70ce4f877f
|
fixed #565: upgrade tileMap_parallax_nodes to 1.0.0-rc3
|
2011-07-04 14:11:43 +08:00 |
minggo
|
6482f5662b
|
fixed #557: upgrade label_nodes to 1.0.1-rc3
|
2011-07-04 10:59:35 +08:00 |
natural-law
|
0378a6a36d
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Conflicts:
cocos2dx/include/CCNode.h
|
2011-07-01 16:24:23 +08:00 |
natural-law
|
7d7f3a9241
|
fixed #562, Upgrade folder sprite_nodes to rc3.
|
2011-07-01 16:11:31 +08:00 |
minggo
|
16f79cb0be
|
fixed #554: upgrade base_nodes to 1.0.0-rc3
|
2011-07-01 15:48:05 +08:00 |
minggo
|
de705986f8
|
Merge pull request #341 from minggo/iss553
fixed #533: upgrade actions to 1.0.0-r3
|
2011-07-01 00:18:32 -07:00 |
minggo
|
7bdf2cb84e
|
fixed #533: upgrade actions to 1.0.0-r3
|
2011-07-01 15:08:23 +08:00 |
natural-law
|
4d5dab4a40
|
fixed #558, Upgrade folder layers_scenes_transitions_nodes to rc3.
|
2011-07-01 11:26:26 +08:00 |
natural-law
|
dab077d2a1
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
|
2011-07-01 10:27:39 +08:00 |
natural-law
|
d892872d2f
|
fixed #552, Treat the parameter of method CCTextureCache::removeTextureForKey() as relative path.
|
2011-07-01 09:32:15 +08:00 |
minggo
|
989c8027d0
|
Merge pull request #338 from natural-law/master
fixed #522
|
2011-06-30 18:24:09 -07:00 |
natural-law
|
b684cbdc6c
|
fixed #522, CCSpriteFrameCache::addSpriteFramesWithFile(const char *pszPlist) will not crash any more if the parameter don't have '/'.
|
2011-06-30 17:50:28 +08:00 |
minggo
|
2a39fe0aa4
|
Merge pull request #335 from minggo/iss547
[Android] fixed #547: line wrap OK on Android
|
2011-06-29 19:46:25 -07:00 |
minggo
|
6c47f53b13
|
[Android] fixed #547: line wrap OK on Android
|
2011-06-29 15:45:30 +08:00 |
minggo
|
bb90fbfb1e
|
[iOS] fixed #546: CCLabelTTF:initWithString() will crash when the height is 0
|
2011-06-28 15:24:58 +08:00 |
yangws
|
9d4c4b5cb6
|
delete some unused codes.
|
2011-06-28 14:37:06 +08:00 |
yangws
|
0dec97a303
|
fixed #544 The bug reaised by CCGrid render texture in another FBO.
|
2011-06-28 14:32:59 +08:00 |
yangws
|
3b6265aa58
|
Compile ok on vs2010
|
2011-06-27 17:02:58 +08:00 |
yangws
|
59f37ddb5d
|
fixed #526 Wrap glScissor in CCEGLVIew::setScissorInPoints.
|
2011-06-27 10:55:45 +08:00 |
Walzer
|
00568c229a
|
[android] back to shared library link
|
2011-06-25 11:21:16 +08:00 |
minggo
|
e8fda66ccc
|
Merge https://github.com/cocos2d/cocos2d-x
|
2011-06-24 13:55:52 +08:00 |
minggo
|
8440d6a267
|
[android] fixed #364: show string correct & line break ok
|
2011-06-24 13:55:00 +08:00 |
liswei
|
0c5f28fc11
|
fixed #539 call unzOpen, then may not call unzClose(WVGA)
|
2011-06-24 09:29:55 +08:00 |
liswei
|
4793713daa
|
fixed #539 call unzOpen, then may not call unzClose(WVGA)
|
2011-06-23 18:24:32 +08:00 |
Walzer
|
156dfa8859
|
Merge remote branch 'origin/master'
|
2011-06-23 16:31:52 +08:00 |
Walzer
|
9e74b1f50d
|
fixed #534, use #if (CC_TARGET_PLATFORM != CC_PLATFORM_IOS) - #endif to wrap the useless codes on ios.
|
2011-06-23 16:31:04 +08:00 |
Walzer
|
481010a417
|
Merge pull request #316 from minggo/iss364
[Android] line break ok on Android
|
2011-06-23 01:04:22 -07:00 |
Walzer
|
39d62d69a7
|
add script_support into cocos2dx/proj.wophone/Makefile.ARM, but untest.
|
2011-06-23 16:02:16 +08:00 |
Walzer
|
fea9f3b943
|
add script_support to cocos2d-wophone.vcproj
|
2011-06-23 15:59:28 +08:00 |
minggo
|
53eafa77ff
|
Merge https://github.com/cocos2d/cocos2d-x into iss364
|
2011-06-23 14:45:25 +08:00 |
minggo
|
10cdd7f798
|
[android] fixed #364: line break ok on Android
|
2011-06-23 14:44:20 +08:00 |
minggo
|
d4bd6e63d2
|
synchrolize java code to HelloLua
|
2011-06-23 12:47:02 +08:00 |
Walzer
|
d4e9e5a9d9
|
Merge pull request #314 from yangws/master
PVRFrame lib update to version 2.8 r1 (2.08.28.0634)
|
2011-06-22 20:10:09 -07:00 |
Walzer
|
a98a3b9ca7
|
[airplay] add script_support
|
2011-06-23 09:31:18 +08:00 |
yangws
|
2c22cf0621
|
fixed #537 update to version 2.8 r1 (2.08.28.0634)
|
2011-06-22 17:55:03 +08:00 |
Walzer
|
45933b177f
|
Merge pull request #313 from minggo/iss535
[Android] Use Android widget Bitmap to drawing string
|
2011-06-22 02:17:07 -07:00 |
Walzer
|
67ac46647f
|
issue #531, Merge liswei/issue531 manually.
|
2011-06-22 17:13:01 +08:00 |
minggo
|
1122a7c7d0
|
[android] use Android widget Bitmap other than skia to drawstring
|
2011-06-22 16:58:50 +08:00 |
minggo
|
fd86f1ef8c
|
Merge pull request #309 from minggo/master
fix a compile bug
|
2011-06-21 02:39:45 -07:00 |
minggo
|
53a5ec412e
|
fixed #528: fix a compile bug
|
2011-06-21 17:36:38 +08:00 |
minggo
|
6cb6359168
|
Merge pull request #308 from minggo/master
fixed #528
|
2011-06-21 02:06:11 -07:00 |
Walzer
|
f3375f0dbb
|
issue #528, improve CCScriptEngineManager. AppDelegate should hold the whole lifecycle of LuaEngine object.
|
2011-06-21 17:02:08 +08:00 |
minggo
|
00cc1d277d
|
fixed #528: safe call of CCScriptEngineManager::sharedScriptEngineManager()->getScriptEngine()->xxx()
|
2011-06-21 16:59:17 +08:00 |
Walzer
|
ddbdf67f97
|
Merge http://github.com/minggo/cocos2d-x into lua
|
2011-06-21 16:03:34 +08:00 |
minggo
|
968779912a
|
fixed #528: add copyright & modify pop menu position
|
2011-06-21 15:50:47 +08:00 |
Walzer
|
175e9394bc
|
Merge https://github.com/minggo/cocos2d-x into lua
|
2011-06-21 15:22:00 +08:00 |
Walzer
|
f80948d2eb
|
Merge pull request #303 from natural-law/master
fixed #323
|
2011-06-20 23:03:08 -07:00 |
minggo
|
d72d8a52f4
|
Merge https://github.com/cocos2d/cocos2d-x
|
2011-06-21 13:53:04 +08:00 |
minggo
|
8066312098
|
fixed #528: refactor lua ok
|
2011-06-21 13:51:36 +08:00 |
Marat Yakupov
|
14c43f4246
|
changed postfix increment of iterators to prefix increment
|
2011-06-21 09:30:03 +04:00 |
natural-law
|
49a4481473
|
fixed #323, Remove the #include <map> in CCApplication_win32.cpp.
|
2011-06-21 12:01:59 +08:00 |
natural-law
|
ba4c3b8928
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
|
2011-06-21 11:58:52 +08:00 |
natural-law
|
960ef65f53
|
fixed #323, Modify the implement of getCurrentLanguage method on win32.
|
2011-06-21 11:58:10 +08:00 |
minggo
|
80e618f6ed
|
issue #528: fix some bug & complete hello.lua
|
2011-06-21 11:47:57 +08:00 |
Walzer
|
3559258d94
|
Merge pull request #305 from moadib/cclabelbmfont_ref_instead_copy
Removed unnecessary copy of ccBMFontDef structure in CCLabelBMFont::createFontChars()
|
2011-06-20 20:38:05 -07:00 |
Walzer
|
4d161e7948
|
fix #529, add static node() method to CCLayerColor, CCLayerGradient, CCMultiplexLayer
|
2011-06-21 10:53:20 +08:00 |
minggo
|
2f97a43439
|
issue #528: refactor lua ok on Android
|
2011-06-21 10:18:43 +08:00 |
minggo
|
022e2b9998
|
issue #528: refactor ok on win32
|
2011-06-20 17:31:38 +08:00 |
Marat Yakupov
|
0b3586126b
|
Removed unnecessary copy of ccBMFontDef structure in CCLabelBMFont::createFontChars()
|
2011-06-20 10:40:27 +04:00 |
natural-law
|
fae0498b3c
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
|
2011-06-17 10:49:25 +08:00 |
natural-law
|
cfee246959
|
fixed #323, Add an interface to get the current language.
|
2011-06-17 10:49:02 +08:00 |
Marat Yakupov
|
7be492d1b5
|
Parameters should be passed by const reference instead copy
|
2011-06-16 09:27:51 +04:00 |
yangws
|
19eaefab72
|
CCImage_win32 hasn't release font resource in Destructor.
|
2011-06-16 10:55:57 +08:00 |
minggo
|
33008fc8de
|
Merge pull request #300 from minggo/lua
Lua support
|
2011-06-15 02:24:17 -07:00 |
minggo
|
738f0b3426
|
Merge https://github.com/cocos2d/cocos2d-x into lua
|
2011-06-15 15:32:09 +08:00 |
liswei
|
3e54282e04
|
fixed #502 modify CCConfiguration to singleton mode
|
2011-06-15 11:48:00 +08:00 |
liswei
|
c6cd929dac
|
fixed #516 ccactionmanager.cpp L289: 'if (UINT_MAX == i)' modify to 'if (UINT_MAX != i)'
|
2011-06-15 09:56:33 +08:00 |
liswei
|
585792f3da
|
Merge branch 'work1'
|
2011-06-14 16:29:41 +08:00 |
liswei
|
7c669cfcb4
|
fixed #523 [all] CCParticleSystemQuad::particleWithFile can't work correctly
|
2011-06-14 16:27:47 +08:00 |
natural-law
|
5d70774b4f
|
fixed #524, Parse the special format of plist files on ios & airplay.
|
2011-06-14 16:15:20 +08:00 |
minggo
|
49f1518893
|
fix a bug when compile in android
|
2011-06-14 15:43:45 +08:00 |
natural-law
|
214e86a5b6
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Conflicts:
cocos2dx/platform/CCFileUtils.cpp
|
2011-06-14 15:05:52 +08:00 |
natural-law
|
489fb7824b
|
fixed #524, Parse the special format of plist files.
|
2011-06-14 14:53:00 +08:00 |
minggo
|
a7a22e528b
|
remove the usage of NDController
|
2011-06-14 14:46:39 +08:00 |
minggo
|
9c49e27bf1
|
add extensions & tools directory
|
2011-06-14 14:31:25 +08:00 |
minggo
|
0f19c30921
|
remove redifine functions
|
2011-06-14 11:32:01 +08:00 |
minggo
|
4d8b2c284c
|
support lua
|
2011-06-14 11:08:39 +08:00 |
minggo
|
8003de7468
|
update to latest code and merge
|
2011-06-14 11:01:38 +08:00 |
liswei
|
91326028ec
|
fixed #516 Undefined Behaviour in ccCArray.h (signed / unsigned conversion)
|
2011-06-13 16:58:55 +08:00 |
liswei
|
1591c7edc8
|
fixed #512 fix warnings in /Wall flag
|
2011-06-10 17:51:37 +08:00 |
Walzer
|
f600846d4b
|
Merge http://github.com/flyingpacer/cocos2d-x, resolve conflicts in cocos2dx/CCScheduler.cpp
|
2011-06-08 11:08:29 +08:00 |
RongHong
|
67eb87abfe
|
To fix the crash when the gles version is too low
|
2011-06-08 10:02:07 +08:00 |
RongHong
|
a13e8ae859
|
1.修正gles版本过低时会崩溃的问题
2.修正unscheduleAllSelectors()中遍历哈希表导致崩溃的问题
|
2011-06-03 15:22:50 +08:00 |