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

2295 Commits

Author SHA1 Message Date
Walzer c790fba340 avoid a bug in clang, see this post http://www.cocos2d-x.org/boards/7/topics/1638 Thanks to Cem Aslan's contribution! 2011-05-27 16:26:59 +08:00
Walzer 11c401e3ea [ios] setDepthTest(false) for EffectsTest 2011-05-26 21:01:16 +08:00
Walzer a3e6e0d69d Merge remote branch 'origin/master' 2011-05-26 18:33:02 +08:00
Walzer bcfeecb08f [ios] change template's version from 0.8.3 to 0.8.4 2011-05-26 18:32:40 +08:00
Walzer bf95e4e7a5 Merge pull request #286 from natural-law/master 
[android] fixed #510
 2011-05-26 01:39:11 -07:00
Walzer 102b570f8e Merge pull request #285 from yangws/master 
Remove unnecessary code for input digit in Cocos2dxGLSurfaceView.java.
 2011-05-26 01:38:35 -07:00
natural-law 7e716f9d80 [android] fixed #510, Delete the onDestroy method override in TestsDemo.java 2011-05-26 16:34:10 +08:00
yangws 476d86283f Remove unnecessary code for digit in Cocos2dxGLSurfaceView.java. 2011-05-26 14:35:44 +08:00
Walzer 78f87f1207 Merge remote branch 'origin/master' 2011-05-26 10:29:43 +08:00
Walzer 03b1bb6c52 fix a typo in CCTextFieldTTF. add comment for in helloworld/AppDelegate.cpp 2011-05-26 10:08:05 +08:00
minggo e47434e335 Merge pull request #284 from minggo/master 
fixed #509: let UI retate HelloWorld to landscape
 2011-05-24 18:45:48 -07:00
minggo dfbb0096e8 Merge pull request #283 from natural-law/master 
Compile tests OK on wophone.
 2011-05-24 18:45:18 -07:00
minggo 8d76a4103b fixed #509: let UI rotate HelloWorld to landscape 2011-05-24 18:16:05 +08:00
minggo a5c294ed69 fixed #501: let UI rotate HelloWorld to landscape 2011-05-24 18:13:54 +08:00
natural-law 8ab7057fe6 Resolve the memory leak of tests. 2011-05-24 18:00:59 +08:00
natural-law f89a93fcf8 Compile tests OK on wophone. 2011-05-24 17:52:24 +08:00
minggo cfee97bbb0 Merge pull request #282 from yangws/master 
fixed #503 new chipmunk code compiled ok on vs2010.
 2011-05-24 01:21:45 -07:00
yangws c757dd4aeb fixed #503 new chipmunk code compiled ok on vs2010. 2011-05-24 16:18:47 +08:00
minggo 13a26ef4e3 Merge pull request #281 from yangws/508 
fixed #508 Dynamic switch retina display support.
 2011-05-23 18:39:43 -07:00
yangws d93a2f046e android can input number form soft keyboard. 2011-05-23 16:30:45 +08:00
yangws ec23d7ed55 fixed #508 Dynamic switch retina display support. 2011-05-23 16:21:31 +08:00
yangws 533949a736 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-05-23 10:11:13 +08:00
Walzer 6b24b6fb8d issue #503, i forget to add chipmunk_private.h into xcodeproj 2011-05-21 21:35:05 +08:00
Walzer e7a94c6c00 issue #503, add chipmunk 5.3.4 new files into xcode3 template 2011-05-21 21:31:45 +08:00
Walzer e8835ee4c2 issue #503, add chipmunk new files into win32 vcproj 2011-05-21 17:10:29 +08:00
Walzer 335d02a556 issue #503, android version build & run ok. 2011-05-21 16:45:55 +08:00
Walzer a9027574eb issue #503, ChipmunkTest & ios xcodeproject upgraded, run on ios simulator ok 2011-05-21 16:19:01 +08:00
Walzer 2db1f2350c issue #503, new files in chipmunk 5.3.4 2011-05-21 14:58:54 +08:00
Walzer 948c6d750e issue #503, chippmunk library is upgraded from 5.1 to 5.3.4, which is usd in cocos2d-iphone 0.99.5 & 1.0.0-rc 2011-05-21 14:58:22 +08:00
Walzer 57a14e90c9 Merge pull request #279 from yangws/489 
fixed #489 For getting full path from relative path, GetCurrentDirectory instead GetModuleName in CCFileUtils_win32.cpp.
 2011-05-20 19:24:11 -07:00
Walzer 825c76331c Merge pull request #280 from minggo/iss501 
[android] let user input package path when create new android project
 2011-05-20 19:23:05 -07:00
yangws c9f66665ec temp commit. 2011-05-20 17:47:06 +08:00
minggo 2bd72e1793 [android] fixed #501: remove unneedded 2011-05-20 17:43:29 +08:00
minggo 617703a681 [android] fixed #501: PACHAGE_PATH -> PACKAGE_PATH 2011-05-20 17:40:28 +08:00
minggo bcfbccc556 [android] fixed #501: let user input package path 2011-05-20 16:59:19 +08:00
yangws f285dd9709 fixed #489 For getting full path from relative path, GetCurrentDirectory instead GetModuleName in CCFileUtils_win32.cpp.(Need delete old Helloworld.win32.vcproj.XXX.YYY.user and test.win32.vcproj.XXX.YYY.user files for debug HelloWorld and tests on vs2008) 2011-05-20 10:26:46 +08:00
yangws 4c0008cd73 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 489 2011-05-20 10:02:16 +08:00
Walzer 81fcd3553f Merge pull request #277 from yangws/master 
Mofidy SoundPlayer.cpp for last TMediaPlayer for wophone. and fix #499
 2011-05-19 07:25:08 -07:00
unknown 97142d4a59 Use GetCurrentDirectory instead GetModuleName in CCFileUitls_win32.cpp and compile OK on vs2010 2011-05-19 21:11:29 +08:00
unknown b940676cab Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into 489 2011-05-19 20:55:39 +08:00
yangws 02774dd963 fixed #499 Move CCRGBAProtocol implement from CCMenuItemImage to CCMenuItemSprite. 2011-05-19 17:00:13 +08:00
yangws 1993fe5053 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-05-19 14:57:41 +08:00
yangws 6856ffc22c Modify SoundPlayer.cpp for the last TMediaPlayer.so 2011-05-19 14:57:16 +08:00
Walzer fc4681fe60 Merge pull request #276 from minggo/iss496 
[android] fixed #496 fixed #497
 2011-05-18 23:21:24 -07:00
minggo 837f16555d Merge pull request #276 from minggo/iss496 
[android] fixed #496 fixed #497
 2011-05-18 23:19:01 -07:00
minggo ff1017d86f Merge pull request #276 from minggo/iss496 
[android] fixed #496 fixed #497
 2011-05-18 23:18:37 -07:00
minggo 073260e0a9 [android] fixed #496 fixed #497: tests and HelloWorld work ok on Android3.0 2011-05-19 11:26:57 +08:00
Walzer 2dd11490ad Merge pull request #274 from yangws/master 
Fixed some bugs on wophone and modify CClog output utf-8 string on win32 and wophone emulator.
 2011-05-18 18:51:38 -07:00
Walzer 868c5ff0ac Merge pull request #275 from minggo/iss495 
[android] fixed #495: fix a memory leak
 2011-05-18 08:03:09 -07:00
yangws e6c7d9fe63 fixed bug: The background music not stoped when app enter background some time. 2011-05-18 14:34:22 +08:00