Commit Graph

30832 Commits

Author SHA1 Message Date
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 dbc41828ce Merge pull request #351 from minggo/master
upgrade textures to 1.0.0-rc3
2011-07-04 20:03:49 -07:00
minggo 0d80326392 fixed #564: upgrade textures to 1.0.0-rc3 2011-07-05 10:47:25 +08:00
minggo 89a845ebd7 Merge pull request #350 from minggo/master
upgrade misc_nodes & particle_nodes to 1.0.0-rc3
2011-07-04 04:23:56 -07:00
minggo 0e6bf40e7c fixed #561: upgrade particle_nodes to 1.0.0-rc3 2011-07-04 19:20:16 +08:00
Walzer 3e8f084624 [lua] fix a bug calling CCLuaLog with multiple params in hello.lua 2011-07-04 19:04:21 +08:00
Walzer 80c819d8b6 Merge remote branch 'origin/master' 2011-07-04 16:25:29 +08:00
Walzer d325f1991e [ios] 1. debug builds can run on device (add “Valid Architectures") 2. add correct header search paths for HelloLua release build 2011-07-04 16:25:11 +08:00
minggo 6b97a381e9 fixed #560: upgrade misc_nodes to 1.0.0-rc3 2011-07-04 16:01:57 +08:00
minggo 652bd02f83 Merge pull request #349 from minggo/iss559
fixed  #iss559
2011-07-03 23:51:55 -07:00
minggo 8478288e88 fixed #iss559 2011-07-04 14:47:32 +08:00
minggo f306c44162 Merge pull request #348 from minggo/iss555
fixed #555: upgrade effects to 1.0.0-rc3
2011-07-03 23:24:35 -07:00
minggo 210840a22a fixed #555: upgrade effects to 1.0.0-rc3 2011-07-04 14:21:03 +08:00
minggo 178de84e15 Merge pull request #346 from minggo/iss565
fixed #565: upgrade tileMap_parallax_nodes to 1.0.0-rc3
2011-07-03 23:15:51 -07:00
minggo 70ce4f877f fixed #565: upgrade tileMap_parallax_nodes to 1.0.0-rc3 2011-07-04 14:11:43 +08:00
minggo 00ff3dba4d Merge pull request #345 from minggo/iss557
fixed #557: upgrade label_nodes to 1.0.1-rc3
2011-07-03 20:04:15 -07:00
minggo 6482f5662b fixed #557: upgrade label_nodes to 1.0.1-rc3 2011-07-04 10:59:35 +08:00
minggo 52f22d0b4c Merge pull request #343 from natural-law/master
fixed #562
2011-07-03 18:51:21 -07: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 f42a68e5d9 Merge pull request #342 from minggo/iss554
fixed #554: upgrade base_nodes to 1.0.0-rc3
2011-07-01 00:51:50 -07: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 d59c71330c Merge pull request #340 from natural-law/master
fixed #552
2011-07-01 00:13:22 -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 25b3b15151 Merge pull request #339 from minggo/iss549
[Android] fixed #549: Add comments for playEffect()
2011-06-30 18:28:08 -07:00
minggo 67b85322ed [Android] fixed #549: Add comments for playEffect() 2011-07-01 09:24:40 +08:00
minggo 989c8027d0 Merge pull request #338 from natural-law/master
fixed #522
2011-06-30 18:24:09 -07:00
Walzer 850f23d295 update doxygen configs for 0.8.5 2011-07-01 07:52:05 +08: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 d490bd983e Merge pull request #337 from natural-law/master
fixed #551
2011-06-29 20:08:51 -07:00
minggo 12f816687d Merge pull request #336 from liswei/master
update wophone setup project (such as helloworld,tests)
2011-06-29 20:08:01 -07:00
natural-law f7e31bac17 fixed #551, Add project dependence for project liblua. And set the WorkingDirectory of project HelloLua in VS2010. 2011-06-30 10:55:38 +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
liswei 39fb944297 update wophone setup project (such as helloworld,tests) 2011-06-30 09:36:51 +08:00
minggo e53fad8da2 Merge pull request #331 from minggo/iss546
[iOS] fixed #546
2011-06-29 00:51:14 -07:00
minggo 0f002b112d Merge pull request #334 from liswei/issue545
fixed #545 [Wophone] The effect of ChipmunkTest is wrong.
2011-06-29 00:50:53 -07:00
minggo 6c47f53b13 [Android] fixed #547: line wrap OK on Android 2011-06-29 15:45:30 +08:00
liswei b23409a942 fixed #545 [Wophone] The effect of ChipmunkTest is wrong.
reset glOrthof param value in wophone
2011-06-29 15:24:04 +08:00