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

9901 Commits

Author SHA1 Message Date
minggo 31e7456af5 update changelog [ti ignore] 2013-06-10 23:58:21 +08:00
minggo 48d5dafe09 Merge pull request #2865 from minggo/master 
add description of path that custom font can put in
 2013-06-10 08:04:41 -07:00
minggo 29607bd741 fixed #2259:add description of path that custom font can put in 2013-06-10 23:01:48 +08:00
minggo 845585a294 Merge pull request #2864 from minggo/master 
make create-android-project.sh work ok
 2013-06-10 07:36:30 -07:00
minggo e8fb1f4da0 copy lua script when creating a project by create-android-project.sh 2013-06-10 22:35:05 +08:00
James Chen a03da1b2d2 Merge pull request #2863 from dumganhar/master 
Adding travis-ci build for emscripten port.
 2013-06-10 07:20:42 -07:00
minggo bb583996d0 define and export LCC_ENABLE_CHIPMUNK_INTEGRATION for extensions anroid project 2013-06-10 22:19:59 +08:00
James Chen 4cf1946142 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2013-06-10 21:58:14 +08:00
James Chen 15f5538835 Adding travis-ci build for emscripten port. 2013-06-10 21:57:26 +08:00
James Chen 9ede4f17b2 Merge pull request #2862 from dumganhar/master 
Fixing a bug that vs express can't work.
 2013-06-10 06:25:00 -07:00
James Chen 94d3517ac1 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2013-06-10 21:22:06 +08:00
James Chen 835520da66 Fixing a bug that vs express can't work. Reported at https://github.com/cocos2d/cocos2d-x/issues/2859 2013-06-10 21:20:44 +08:00
James Chen 5da7a7692e Fixing a logic error in CCDirector.cpp. 2013-06-10 21:19:22 +08:00
James Chen 3dcb8b4d1d Merge pull request #2861 from dumganhar/master 
[emscripten] Updating extension makefile.
 2013-06-10 05:57:32 -07:00
James Chen 6f01085a01 [emscripten] Updating extension makefile. 2013-06-10 20:53:33 +08:00
James Chen 8632db08a4 Merge pull request #2855 from dumganhar/master 
[Template] Updating multi-platform template.
 2013-06-10 00:00:57 -07:00
James Chen be0efac2d7 [Mac] Updating multi-platform-cpp/proj.mac/HelloCpp.xcodeproj. 2013-06-10 14:57:18 +08:00
James Chen 88b67c7961 [Marmalade] Updating scripting/lua/proj.marmalde/lua.mkf. 2013-06-10 14:56:24 +08:00
James Chen b9e0be8d10 [Template] Updating multi-platform-lua/proj.marmalade/HelloLua.mkb. 2013-06-10 14:55:26 +08:00
James Chen 1e527c1d52 [Template] Updating iOS template project of multi-platform-lua. Using AudioEngine module. 2013-06-10 14:20:53 +08:00
James Chen 47b2a65faf [Template] Updating iOS template project of multi-platform-cpp. 2013-06-10 14:18:24 +08:00
James Chen cbcc2022cf [Extension] RENDER_H --> CC_ARMATURE_GLES_RENDER_H 2013-06-10 14:17:16 +08:00
James Chen e62b67689c Merge pull request #2854 from dumganhar/master 
[Android] Updating multi-platform-lua/proj.android/.project
 2013-06-09 22:21:48 -07:00
James Chen cd40b42761 [Android] Updating multi-platform-lua/proj.android/.project 2013-06-10 13:19:16 +08:00
James Chen 975852a06f Merge pull request #2853 from dumganhar/master 
[Win32] Deleting vs template, please use 'tools/project-creator' to create multi-platform project instead.
 2013-06-09 21:32:08 -07:00
James Chen 6986acf8a4 [Win32] Deleting vs template, please use 'tools/project-creator' to create multi-platform project instead. 2013-06-10 12:26:54 +08:00
James Chen e22fe96823 Merge pull request #2852 from dumganhar/master 
Updating JS-Test.
 2013-06-09 21:22:03 -07:00
James Chen d51c03da7e Updating JS-Test. 2013-06-10 12:12:31 +08:00
James Chen e9f3913766 Merge pull request #2851 from dumganhar/master 
issue #2271: Fixing some memory leaks. [VS2012] Updating project dependence and warning fixes.
 2013-06-09 21:01:37 -07:00
James Chen 328282f88f CCScriptEngineManager::sharedManager()->purgeSharedManager(); --> CCScriptEngineManager::purgeSharedManager(); 2013-06-10 11:54:23 +08:00
James Chen 4948de6462 [VS2012] Warning fixes. 2013-06-10 11:44:16 +08:00
James Chen a14df8d28d issue #2271: Fixing some memory leaks. 2013-06-10 11:43:43 +08:00
Rene Klacan 83be06bafb check if delegate is not null when dispatching keyboard event 2013-06-10 00:54:31 +02:00
James Chen 5092755e73 [Win32] Updating project dependence. 2013-06-09 20:12:56 +08:00
James Chen 331208f164 Merge pull request #2849 from dumganhar/master 
[Tizen] Updating project configurations.
 2013-06-09 03:59:03 -07:00
James Chen b0669b4f7d [Tizen] Updating project configurations. 2013-06-09 18:56:22 +08:00
James Chen 6dcaca78d0 [jsoncpp] Value::null -> Value::jsonNull to avoid conflict when compiling with clang++ or high version of gcc since null is defined as a key word. 2013-06-09 18:56:22 +08:00
James Chen 785728fbf8 Merge pull request #2848 from dumganhar/master 
[win32] Updating TestLua.
 2013-06-09 03:40:09 -07:00
James Chen b388e7e45e [win32] Updating TestLua. 2013-06-09 18:34:02 +08:00
James Chen 7e36755010 Merge pull request #2847 from natural-law/develop 
Add twitter plugin for iOS
 2013-06-09 03:23:00 -07:00
James Chen 1e7361db6e Merge pull request #2846 from natural-law/master 
Add twitter plugin for iOS
 2013-06-09 03:20:41 -07:00
zhangbin 3795175812 Delete the developer ID in project config. 2013-06-09 18:17:37 +08:00
zhangbin 484f51fbbc Modify the license of plugin twitter. 2013-06-09 18:01:11 +08:00
zhangbin a2c059f0ed Resolve the bug in the reflection of plugin. 2013-06-09 18:00:56 +08:00
zhangbin 2a241ad517 Add C++ 11 support for iOS projects. 2013-06-09 17:57:27 +08:00
zhangbin e994321a61 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 
Conflicts:
	plugin/samples/HelloSocial/proj.ios/HelloSocial.xcodeproj/project.pbxproj
 2013-06-09 17:30:37 +08:00
zhangbin e2ac14a235 Add plugin twitter for iOS. 2013-06-09 17:27:47 +08:00
zhangbin 4a290ab699 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2013-06-09 17:21:30 +08:00
zhangbin 107cf66039 Resolve the bug in the reflection of plugin. 2013-06-09 17:20:05 +08:00
James Chen 72f701de99 Merge pull request #2845 from dumganhar/master 
[master] Crash fix in CCControlColurPickerTest.
 2013-06-09 01:41:49 -07:00