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

10532 Commits

Author SHA1 Message Date
minggo 5996e99b74 Merge pull request #2875 from ricardoquesada/CALLBACK_macro_for_callbacks 
Adds CALLBACK_0, CALLBACK_1 and CALLBACK_2
 2013-06-12 22:51:21 -07:00
Ricardo Quesada c1d519aac2 LabelTTF vertical alignment fixed on OS X 
vertical alignment was broken on OS X.
top and bottom were switched.
 2013-06-13 10:46:28 +08:00
minggo 92ce25371a Merge pull request #2874 from ricardoquesada/labelttf_mac_fix 
LabelTTF vertical alignment fixed on OS X
 2013-06-12 19:45:31 -07:00
Ricardo Quesada 1780643c63 merge pull reqeust fixing for iOS7 and Xcode5 into master 2013-06-13 10:43:41 +08:00
minggo f123a5c48d Merge pull request #2873 from ricardoquesada/ios7_xcode5_fixes 
Fixes for iOS7 and Xcode5
 2013-06-12 19:28:22 -07:00
James Gregory 872be8e964 Initial commit of browser accelerated async image-loading code for Emscripten. 2013-06-12 14:46:32 -07:00
James Gregory cdb63898d9 Simplify AsyncStruct slightly -- make it a class, add a constructor. 2013-06-12 10:03:12 -07:00
Lee, Jae-Hong 1bd3f10601 Support Tizen device. 2013-06-12 10:20:18 +09:00
Ricardo Quesada e770121711 updates chipmunk2d to v6.1.5 2013-06-11 17:03:20 -07:00
Ricardo Quesada 83b43ab93e Adds CALLBACK_0, CALLBACK_1 and CALLBACK_2 
Handy macros for callbacks.
Instead of:
	std::bind(func_ptr, instnace, std::placeholder::_1)
you use:
	CALLBACK_1(func_ptr, instance)

And also removes more warnings from the tests
 2013-06-11 16:30:05 -07:00
Ricardo Quesada 75b9913c92 LabelTTF vertical alignment fixed on OS X 
vertical alignment was broken on OS X.
top and bottom were switched.
 2013-06-11 14:59:40 -07:00
Ricardo Quesada af49023741 Fixes for iOS7 and Xcode5 2013-06-11 12:11:05 -07:00
folecr bab8eff915 enableDebugger() will be called inside ScriptingCore when JSB_ENABLE_DEBUGGER is #defined 2013-06-11 08:18:22 -07:00
Maciej Czerniak 1e71ea85f3 add Polish language support 2013-06-11 16:46:38 +02:00
Maciej Czerniak dddb487639 fix formatting 2013-06-11 16:43:35 +02:00
Maciej Czerniak c9b88e1c0c add missing Norwegian language for marmelade platform 2013-06-11 16:41:54 +02:00
Maciej Czerniak eb79c01003 add missing Norwegian language for linux platform 2013-06-11 16:39:33 +02:00
minggo ef319da264 Update AUTHORS 
[ti ignore]
 2013-06-11 21:50:02 +08:00
minggo 9404f3e0ce Merge pull request #2704 from simpliplant/develop 
Hardware keyboard support
 2013-06-11 06:48:33 -07:00
Rene Klacan 44851e36e9 removed forgotten debug printf 2013-06-11 15:37:51 +02:00
James Chen 71e038a869 Merge pull request #2870 from dumganhar/master 
[travis-ci] Speed up android build. [master]
 2013-06-10 20:51:24 -07:00
James Chen 0d7b7819c2 [travis-ci] Speed up android build. 2013-06-11 11:31:24 +08:00
xyhl515 9ea4f7ea8e fix Jsb function getCPBody return type bug 2013-06-11 11:04:29 +08:00
Rene Klacan f31a258c01 Merge pull request from cocos2d/develop 2013-06-11 01:06:12 +02:00
folecr 99266d19c5 If user has enabled debugger support, call enableDebugger() to setup the debug context, start the debugger thread, etc. 2013-06-10 11:38:31 -07:00
minggo 7cccf1db03 Merge pull request #2866 from minggo/master 
update changelog
 2013-06-10 09:04:57 -07:00
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