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

9441 Commits

Author SHA1 Message Date
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 1e7361db6e Merge pull request #2846 from natural-law/master 
Add twitter plugin for iOS
 2013-06-09 03:20:41 -07: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
James Chen 1cc8f94ec7 Crash fix in CCControlColurPickerTest. 2013-06-09 16:37:15 +08:00
James Chen dea01875cb Merge pull request #2843 from dumganhar/master 
Reverting TestCpp/AppDelegate.cpp to use config file. But modify its values to suitable ones.
 2013-06-09 01:12:06 -07:00
James Chen 3632693cd9 Reverting TestCpp/AppDelegate.cpp to use config file. But modify it to a suitable value. 2013-06-09 16:09:56 +08:00
James Chen d089348d91 Merge pull request #2841 from dumganhar/master 
Some fixes for Android, BB and iOS when testing. Please refer to commit for details.
 2013-06-09 00:32:19 -07:00
James Chen 50de9b7af5 [iOS] Adding i386 arch for MoonWarriors. 2013-06-09 15:29:51 +08:00
James Chen 0a8ae1e79f [BB] Updating project configuration after adding CocoStudio runtime. 2013-06-09 15:29:51 +08:00
James Chen 132fd591c1 [TestCpp] Commenting the line of loading configuration file in TestCpp. 2013-06-09 15:29:51 +08:00
James Chen 13dd26c85b [BB] Fixing compilation errors for CocoStudio runtime. 2013-06-09 15:29:51 +08:00
James Chen 49b4ec42f3 [Android] Don't use c++11 feature in OpenSLEngine.cpp. 2013-06-09 15:18:17 +08:00
minggo caaf2137d8 Merge pull request #2839 from minggo/master 
fix some memory leak
 2013-06-09 00:06:13 -07:00
minggo ec7bf7a9d6 issue #2271: fixed memory leak of CCTextureCache::snapshotTextures() 2013-06-09 15:03:38 +08:00
minggo 7a1175601e Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2013-06-09 14:51:57 +08:00
minggo 81b579c032 issue #2271: fixed memory leak of WebSocket 2013-06-09 14:50:51 +08:00
minggo f00baac00d issue #2271: fixed memory leak of CCControlColorPicker 2013-06-09 14:36:16 +08:00
zhangbin a931f2230e Modify the license of plugin twitter. 2013-06-09 14:09:46 +08:00
James Chen 40b41fd804 Merge pull request #2838 from dumganhar/master 
[Android] SimpleGame doesn't depend on extension now.
 2013-06-08 23:09:42 -07:00
James Chen fd37cdf8df SimpleGame doesn't depend on extension now. 2013-06-09 14:02:49 +08:00
zhangbin 16d8cc9ec0 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 
Conflicts:
	plugin/samples/HelloSocial/proj.ios/HelloSocial.xcodeproj/project.pbxproj
 2013-06-09 13:58:09 +08:00
zhangbin d9b42ccc67 Add plugin twitter for iOS. 2013-06-09 13:44:03 +08:00
James Chen 7eb883ebd5 Merge pull request #2837 from samuele3hu/test_sample_of_http_bind 
fixed #2103: set AudioEngine module read-only
 2013-06-08 20:51:05 -07:00
samuele3hu 6022bb368e Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into test_sample_of_http_bind 2013-06-09 11:45:58 +08:00
minggo 40682cdcae Merge pull request #2836 from minggo/master 
make project created by multi-project creator copy lua script
 2013-06-08 20:42:27 -07:00
minggo bd660e708d issue #2103: copy lua script in lua multi-platform project 2013-06-09 11:39:18 +08:00
samuele3hu ad0ade46ce fix issue #2103: modify AudioEngine module read-only 2013-06-09 11:38:18 +08:00
James Chen 2025e7257f Merge pull request #2835 from dumganhar/2youyouo2-master 
fixed #2270: Adding Armature(CocoStudio runtime) support.
 2013-06-08 20:20:30 -07:00
James Chen 67441deb03 fixed #2270: Adding licenses of jsoncpp and sigslot. 2013-06-09 11:13:45 +08:00
James Chen 676efef738 Merge pull request #2834 from samuele3hu/test_sample_of_http_bind 
fixed #2103: modify AudioEngine framework and CocosDenshionTest lua sample.
 2013-06-08 20:10:09 -07:00
minggo 0e66dc8712 issue #2103: add lua files for lua multi-template project 2013-06-09 11:06:30 +08:00
James Chen 3067b71ea2 fixed #2270: Adding Armature(CocoStudio runtime) support. Enabling exceptions for marmalade. 2013-06-09 10:54:55 +08:00
James Chen 56f5e9ca32 Changing namespace Json to CSJson to avoid conflicts. 2013-06-09 10:50:03 +08:00
James Chen 44c6043a3f Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x into 2youyouo2-master 2013-06-09 10:40:44 +08:00
samuele3hu bc699c1c1e issue #2103 modify AudioEngine framework and CocosDenshionTest sample 2013-06-09 10:32:23 +08:00
yinkaile af819c6db5 Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x 2013-06-08 22:09:34 +08:00
yinkaile d29931dc4f 1.add hd resource 
2.remove zobie resource
3.support frame event
 2013-06-08 22:08:22 +08:00
chengstory 86f4b96f05 Merge branch 'master111' 
Conflicts:
	samples/Cpp/TestCpp/proj.ios/TestCpp.xcodeproj/project.pbxproj
	samples/Cpp/TestCpp/proj.mac/TestCpp.xcodeproj/project.pbxproj
 2013-06-08 20:01:25 +08:00
James Chen 4edd35e2b1 Merge pull request #2829 from dumganhar/nacl-fix 
Fixing some issues in https://github.com/cocos2d/cocos2d-x/pull/2788
 2013-06-08 03:00:04 -07:00
James Chen 8e29638435 Merge pull request #2821 from samuele3hu/audioEngine 
Encapsulating SimpleAudioEngine to AudioEngine in lua and updating CocosDenshionTest.lua
 2013-06-08 02:59:30 -07:00
James Chen 3550244399 Merge branches 'nacl-fix' and 'nacl-fix' of https://github.com/dumganhar/cocos2d-x into nacl-fix 2013-06-08 17:28:40 +08:00
James Chen aee8e829ca [Android] Updating Application.mk for HelloLua and TestLua. 2013-06-08 17:28:03 +08:00
James Chen 646d0aa1cf [LINUX] Fix a compilation error in spine/extension.cpp. 2013-06-08 17:22:49 +08:00