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

2959 Commits

Author SHA1 Message Date
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
minggo bb90fbfb1e [iOS] fixed #546: CCLabelTTF:initWithString() will crash when the height is 0 2011-06-28 15:24:58 +08:00
Walzer b72641608c update changelog for 0.8.5 2011-06-28 14:45:32 +08:00
Walzer 3e92c7dcac Merge pull request #330 from yangws/master 
fixed #544 #543
 2011-06-27 23:40:05 -07: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
Walzer 7761ab374c changelog for 0.8.5 2011-06-28 14:04:05 +08:00
minggo e8853583df Merge pull request #329 from minggo/master 
Fix some bug
 2011-06-27 18:23:26 -07:00
minggo 7099b24ccb Merge pull request #326 from liswei/issue521 
issue #521 set depthtest value for true ,then set depthtest value for false
 2011-06-27 18:20:10 -07:00
minggo a99b31d831 Merge pull request #327 from natural-law/master 
Add Lua support for the win32 new project template.
 2011-06-27 18:19:16 -07:00
minggo f290f8f9a7 Merge pull request #328 from yangws/master 
compile ok on vs2010
 2011-06-27 18:18:47 -07:00
natural-law 082726f107 Update the win32 template code as same as the HelloLua project. 2011-06-27 17:15:50 +08:00
yangws c56dd6e747 delete a log output using printf in AppDelegate.cpp 2011-06-27 17:08:03 +08:00
yangws 3b6265aa58 Compile ok on vs2010 2011-06-27 17:02:58 +08:00
natural-law adfd992616 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-06-27 16:47:36 +08:00
natural-law 6649987955 Add Lua support for the win32 new project template. 2011-06-27 16:45:52 +08:00
minggo 5e15545dbd [Android] fix an error when string is 2011-06-27 16:01:25 +08:00
liswei bb59728543 issue #521 set depthtest value for true ,then set depthtest value for false 2011-06-27 15:34:26 +08:00
minggo 686b9ae179 fix the test title 2011-06-27 15:22:55 +08:00
minggo ad8a545541 Merge pull request #325 from natural-law/master 
fixed #542
 2011-06-27 00:04:47 -07:00
natural-law 739d6d30e5 Modify the vcproj files to build liblua & HelloLua projects with release configuration. 2011-06-27 14:11:29 +08:00
natural-law 72f17ecbdf fixed #542, Record the volume user specified though the background music is not playing. 2011-06-27 11:43:27 +08:00
minggo 7ca759470c Merge pull request #324 from yangws/master 
Wrap glScissor in CCEGLVIew::setScissorInPoints.
 2011-06-26 20:09:43 -07:00
yangws 59f37ddb5d fixed #526 Wrap glScissor in CCEGLVIew::setScissorInPoints. 2011-06-27 10:55:45 +08:00