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

5763 Commits

Author SHA1 Message Date
minggo f9cfaa1a5d Merge pull request #366 from natural-law/master 
fixed #574
 2011-07-07 20:28:05 -07:00
natural-law 0cb3b0ce06 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-07-08 11:23:03 +08:00
natural-law ca4281904a fixed #574, Add bugs test case. 2011-07-08 11:22:35 +08:00
Walzer b91f046157 Merge pull request #365 from axmx/master 
[airplay] incorrect calculation of the bit depth
 2011-07-07 18:50:44 -07:00
Max Aksenov 90564fac49 [airplay] fix : incorrect calculation of the bit depth 2011-07-07 08:40:29 -07:00
minggo b0416adaf2 Merge pull request #364 from minggo/master 
upgrade to rc3
 2011-07-07 01:06:27 -07:00
minggo 96289b20c4 upgrade to rc3 2011-07-07 16:03:03 +08:00
minggo ae466898b0 Merge pull request #363 from minggo/master 
change the return value of CCSkewBy::reverse() & CCScaleBy::reverse() to CCActionInterval*
 2011-07-07 00:49:31 -07:00
minggo b08788d810 change the return value of CCSkewBy::reverse() & CCScaleBy::reverse() to CCActionInterval* 2011-07-07 15:41:42 +08:00
minggo df7642902a Merge pull request #362 from minggo/master 
fixed #569: change the free sequence to avoid bug
 2011-07-07 00:23:46 -07:00
minggo 8ca8f4d9bc fixed #569: change the free sequence to avoid bug 2011-07-07 15:20:13 +08:00
natural-law 26513d6b7e issue #574, Add DirectorTest for win32. 2011-07-07 14:55:11 +08:00
Walzer 94ac50bad0 fixed #582, use libpng instead of CIwImage in CCImage_airplay.cpp. Thanks to Max Akensov's contribution. 2011-07-07 14:45:59 +08:00
minggo b84d0e62e5 Merge pull request #360 from minggo/master 
fix some compiling warnings
 2011-07-06 20:31:15 -07:00
minggo 8e370eeb10 fix some compiling warnings 2011-07-07 11:27:45 +08:00
minggo a0e10ec8c4 Merge pull request #358 from natural-law/master 
Resolve the bug of some particle test cases can't be shown.
 2011-07-06 20:04:42 -07:00
minggo 7e5c8eb311 Merge pull request #359 from minggo/master 
add animation to a test case of SpriteTest
 2011-07-06 20:04:25 -07:00
natural-law 2bc8427b3c Resolve the bug of some particle test cases can't be shown. 2011-07-07 11:02:47 +08:00
minggo 211878dc44 add animation 2011-07-07 10:24:01 +08:00
Walzer 348a05a329 fix a typo, CCObject::m_uRefrence -> CCObject::m_uReference 2011-07-07 08:23:31 +08:00
Walzer 72dfb3f919 fixed #576, replace std::string to _KeyT in CCMutableDictionary class template 2011-07-07 08:19:29 +08:00
minggo e804b864b5 Merge pull request #357 from minggo/master 
fixed #579: change zorder to int
 2011-07-06 05:52:38 -07:00
minggo 3dc1967f6c fixed #579: change zorder to int 2011-07-06 20:48:56 +08:00
minggo 5fa7577a19 Merge pull request #356 from minggo/master 
fixe #580
 2011-07-06 05:00:37 -07:00
minggo e56547b9f5 fixed #580: use int or it will loop for ever 2011-07-06 19:54:25 +08:00
minggo 4f419f3a61 Merge pull request #355 from minggo/master 
Fix some bugs when upgrading to rc3
 2011-07-06 03:22:21 -07:00
minggo 6cb945a8ca fix bug of particle_node when upgrade to rc3 2011-07-06 18:16:19 +08:00
minggo f894e00f27 fix a bug of CCProgressTimer when upgrade to rc3 2011-07-06 16:29:56 +08:00
minggo 6129e33794 Merge pull request #354 from minggo/iss577 
[android] fixed #577: init member variable to default value
 2011-07-06 00:25:38 -07: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 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