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

4961 Commits

Author SHA1 Message Date
minggo 5623f5fb58 fixed #1020: make vs template support lua 2012-03-07 15:03:35 +08:00
minggo 837da31d59 Merge pull request #752 from minggo/iss721_cocosdenshion 
fixed #721: cocosdenshion can play local  file on android
 2012-03-06 00:58:51 -08:00
minggo 7890333505 fixed #721: cocosdenshion can play local file on android 2012-03-06 16:56:30 +08:00
minggo 36dfec2633 Merge pull request #751 from minggo/iss1017_win32_timing 
fixed #1017: improve win32 timing accuracy
 2012-03-05 22:14:58 -08:00
minggo a0f0971782 fixed #1017: improve win32 timing accuracy 2012-03-06 14:12:57 +08:00
James Chen 74b4b14ee3 Merge pull request #730 from moadib/qnx_eventhandler 
Added CCEGLView::EventHandler class for qnx-platform
Added window group id for qnx-version of CCEGLView
 2012-03-05 18:07:20 -08:00
minggo 65d6af2724 Merge pull request #750 from minggo/iss1014_resource_path 
fixed #1014: correct resources path in build_win32.bat
 2012-03-05 17:46:43 -08:00
minggo ad0fbad405 fixed #1014: correct resources path in build_win32.bat 2012-03-06 09:45:42 +08:00
minggo d4d65bd532 Merge pull request #749 from minggo/iss1009_typo_error 
fixed #1009: fix a typo error
 2012-03-05 17:42:25 -08:00
minggo ed68855e19 fixed #1009: fix a typo error 2012-03-06 09:35:36 +08:00
James Chen 3f08fa368d Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into string_with_file 2012-03-05 11:20:16 +08:00
James Chen fd9dd6c7fe add stringWithContentsOfFile static method in CCString class. 2012-03-05 11:13:45 +08:00
minggo 11f47b8464 Merge pull request #748 from minggo/master 
add a message to changelog and fix some typo error
 2012-03-04 18:53:30 -08:00
minggo 9dc10741b2 add a message to changelog and fix some typo error 2012-03-05 10:52:11 +08:00
James Chen 5597b7ea8b Merge pull request #747 from dumganhar/revert_getFileData 
revert CCFileUtils::getFileData method.
 2012-03-04 17:57:07 -08:00
James Chen cb1f94df47 revert CCFileUtils::getFileData method. 2012-03-05 09:55:50 +08:00
James Chen 3a8fc658f6 Merge pull request #746 from dumganhar/iss1008_miss_ret 
fixed #1008: Missing "return" in SimpleAudioEngine::getEffectsVolume() method on android platform.
 2012-03-03 19:34:55 -08:00
James Chen fa72c65737 fixed #1008: Missing "return" in SimpleAudioEngine::getEffectsVolume() method on android platform. 2012-03-04 11:25:01 +08:00
James Chen ba2303e206 Merge pull request #744 from dumganhar/iss1007_alloc_one_byte 
fixed #1007: Allocate one more byte of '\0' to terminate string in CCFileUtils::getFileData.
 2012-03-02 20:35:18 -08:00
James Chen 347a8294ac fixed #1007: Allocate one more byte of '\0' to terminate string in CCFileUtils::getFileData. 2012-03-03 12:24:02 +08:00
Walzer 80fca3df67 Update HelloWorld/android/jni/helloworld/main.cpp 2012-03-02 17:02:09 +08:00
minggo af7c82ae11 Merge pull request #743 from minggo/master 
update authors, changelog
 2012-03-01 23:42:13 -08:00
minggo e3bc4471ff update authors, changelog 2012-03-02 15:39:03 +08:00
minggo 796ba89e9d Merge pull request #742 from minggo/iss762_label_position 
compute correct text rect and display it on center
 2012-03-01 22:24:04 -08:00
minggo 2360a9a04e fixed #762: let zfont display on center 2012-03-02 14:22:01 +08:00
minggo 5485eb19d9 fixed #762: compute correct text rect and display it on center 2012-03-02 14:17:22 +08:00
minggo 79495fd743 Merge pull request #741 from minggo/master 
remove libiconv.a
 2012-03-01 19:28:35 -08:00
minggo c196f2dff2 issue #983: remove libiconv.a 2012-03-02 11:25:35 +08:00
minggo 30e952b093 Merge pull request #740 from minggo/iss762_label_position 
fixed #762: make label display on center on iOS
 2012-03-01 19:19:12 -08:00
minggo 528a769cf6 fixed #762: make label display on center on iOS 2012-03-02 11:15:44 +08:00
James Chen d6d75b844d Merge pull request #739 from dumganhar/iss995_marmalade 
fixed #995: Modify project configure for marmalade port after adding extension support and renaming resource folders.
 2012-03-01 01:41:27 -08:00
James Chen d3dedd19f2 fixed #995: Modify project configure for marmalade port after adding extension support and refactor resource folder. 2012-03-01 17:38:31 +08:00
James Chen c74006c5fd Merge pull request #738 from dumganhar/iss994_bbndk2.0 
fixed #994: add support for bbndk2.0 on blackberry platform.
 2012-03-01 01:09:01 -08:00
Walzer 2acd80bb73 fixed #982, copy resources as recursively (-r), and let sed works on mac 2012-03-01 16:57:59 +08:00
James Chen dfd5adb3bd fixed #994: add support for bbndk2.0 on blackberry platform. 2012-03-01 16:52:17 +08:00
minggo a8a82ec7ec Merge pull request #737 from minggo/iss982_box2d_template 
Iss982 android template
 2012-02-29 19:26:12 -08:00
minggo 8e0d0304b7 fixed #982: modify create-linux-eclipse-project.sh to support lua box2d and chipmunk 2012-03-01 03:13:33 +08:00
minggo a87e76c399 fixed #982: android template works ok on linux 2012-03-01 02:51:58 +08:00
minggo c0d2118aac issue #982: android template support lua box2d and chipmunk 2012-02-29 17:48:45 +08:00
James Chen d753646bcc Merge pull request #736 from dumganhar/iss986_add_init_CCMenu 
fixed #986: Add init() member funciton of CCMenu class.
 2012-02-28 18:14:53 -08:00
James Chen 6c01009a18 fixed #986: Add init() member funciton of CCMenu class. 2012-02-29 10:07:18 +08:00
James Chen f166ee2611 Merge pull request #735 from dumganhar/iss984_bada_qnx_static_lib 
fixed #984: Use static library for cocos2dx project on platforms(bada and qnx) that use gcc compiler. Because dynamic_cast may fail when using a gcc compiler.
 2012-02-27 23:10:15 -08:00
James Chen 05bf647ec3 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss984_bada_qnx_static_lib 2012-02-28 15:00:18 +08:00
James Chen 7daeb5cd86 fixed #984: Use static library for cocos2dx project on platforms(bada and qnx) that use gcc compiler. Because dynamic_cast may fail if you use a gcc compiler. 2012-02-28 14:59:46 +08:00
minggo de0388d53a Merge pull request #734 from minggo/iss985_remove_xcode3_template 
fixed #985: remove xcode3 template
 2012-02-27 18:31:44 -08:00
minggo bb2ca44c24 fixed #985: remove xcode3 template 2012-02-28 10:21:59 +08:00
James Chen 2bc48219f8 remove libjpeg, libpng, libz project, use them as sources in cocos2dx project. 2012-02-27 18:18:40 +08:00
minggo be66bec269 Merge pull request #727 from minggo/iss946_retina 
fixed #946: HD image for both retina and normal
 2012-02-27 00:10:17 -08:00
Walzer a4cdbcea5f Merge branch 'master' of http://github.com/cocos2d/cocos2d-x 2012-02-25 10:15:43 +08:00
Walzer 9d37b214d5 fix "Resource" to "Resources" in template/android/copy_files.sh 2012-02-25 10:14:06 +08:00