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

2020 Commits

Author SHA1 Message Date
Walzer 409260c002 fix typo in changelog 2011-06-09 17:08:20 +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
Walzer de80caaec5 Merge pull request #289 from liswei/master 
fixed #521
 2011-06-02 19:57:24 -07:00
liswei 49410a2a07 Merge branch 'XXX' 2011-06-03 10:52:19 +08:00
liswei 54780b8cb7 fixed #521, Fix the effect of PageTurn3D. 2011-06-03 10:51:21 +08:00
Walzer 97afafd856 Merge remote branch 'origin/master' 2011-06-02 22:26:53 +08:00
Walzer 3cba64679c add std::string CCString::toStdString() method 2011-06-02 22:26:38 +08:00
Walzer 2759bff33a Merge pull request #288 from minggo/iss518 
fixed #518: fix a bug that use tHashSelectorEntry in wrong way
 2011-06-02 02:03:26 -07:00
minggo 4f20deff30 fixed #518: fix a bug that use tHashSelectorEntry in wrong way 2011-06-02 10:07:17 +08:00
minggo 83e1e0ebd1 tests run ok when it don't enable lua 2011-06-01 20:29:05 +08:00
minggo a8b6b850de use precompile macro to cantrol if enable lua support 2011-06-01 17:51:08 +08:00
minggo dedbd638d3 lua runs ok on Android 2011-06-01 14:35:28 +08:00
minggo 6fe559ad02 remove hello.lua, the file is changed to HelloWorld/Resource 2011-05-31 15:40:59 +08:00
minggo 5f5dc0a04b HelloWorld with lua works ok on ios 2011-05-31 15:39:54 +08:00
minggo fe8fcb0b00 invode lua registerred tick 2011-05-31 14:49:47 +08:00
minggo 0d27381cdd format the file 2011-05-31 14:49:05 +08:00
minggo 697368cf20 support lua 2011-05-31 14:04:14 +08:00
minggo 0b851e5fe8 Merge pull request #287 from yangws/master 
Text input on android OK now.
 2011-05-30 02:43:03 -07:00
yangws de977bc6c2 use 0 replace NULL 2011-05-30 16:49:08 +08:00
yangws 7e2d1d5c48 fixed #490 Text input on android use a different way, TextInputTest OK now. 2011-05-30 16:36:12 +08:00
Walzer a5c9b8631c Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-05-30 14:23:35 +08:00
Walzer 608e6961c8 changelog for 0.8.4 2011-05-30 14:22:49 +08:00
Walzer 58a63f7ec0 [airplay] following MaxAksenov's suggestion, I set HelloWorld & Tests to landscape as default. Users had to rotate the simulator in airplay's surface configuration. 2011-05-30 14:14:19 +08:00
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