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

9397 Commits

Author SHA1 Message Date
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
minggo f123a5c48d Merge pull request #2873 from ricardoquesada/ios7_xcode5_fixes 
Fixes for iOS7 and Xcode5
 2013-06-12 19:28:22 -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
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
Rene Klacan f31a258c01 Merge pull request from cocos2d/develop 2013-06-11 01:06:12 +02:00
Rene Klacan 83be06bafb check if delegate is not null when dispatching keyboard event 2013-06-10 00:54:31 +02: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
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
James Chen e0000c1a1f Merge pull request #2844 from dumganhar/develop 
Crash fix in CCControlColurPickerTest.
 2013-06-09 01:41:08 -07:00
James Chen 920418c21f Crash fix in CCControlColurPickerTest. 2013-06-09 16:38:37 +08:00
James Chen b1206700f3 Merge pull request #2842 from dumganhar/develop 
[Android] Don't use c++11 feature in OpenSLEngine.cpp. [iOS] Adding i386 arch for MoonWarriors.
 2013-06-09 01:02:22 -07:00
James Chen 6b0c2667fd [iOS] Adding i386 arch for MoonWarriors. 2013-06-09 15:57:06 +08:00
James Chen 3cfa1a9873 [Android] Don't use c++11 feature in OpenSLEngine.cpp. 2013-06-09 15:33:31 +08:00
minggo d1a628f364 Merge pull request #2840 from minggo/develop 
fix some memory leak
 2013-06-09 00:10:55 -07:00
minggo c84a071ae5 issue #2271: fixed memory leak of CCTextureCache::snapshotTextures() 2013-06-09 15:08:26 +08:00
minggo 1a0789cd11 issue #2271: fixed memory leak of WebSocket 2013-06-09 15:08:10 +08:00
minggo c4ab295846 issue #2271: fixed memory leak of CCControlColorPicker 2013-06-09 15:07:58 +08:00
minggo 6eaa1f97ec Merge pull request #2828 from minggo/develop 
fixed #2161: fixed crash of loading ETC file
 2013-06-08 02:02:52 -07:00
minggo d5bfe10379 fixed #2161: fixed crash of loading ETC file 2013-06-08 17:01:45 +08:00
minggo 52f55802b7 Merge pull request #2826 from minggo/develop 
make CCFileUtil::getFileData() get data correctly
 2013-06-07 22:44:01 -07:00
minggo f56c20657b fixed #2266:make CCFileUtil::getFileData() get data correctly 2013-06-08 13:42:52 +08:00
James Chen 4e9cbdf52f Merge pull request #2822 from CocosRobot/updategeneratedsubmodule_1370662398 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-06-07 20:38:01 -07:00
CocosRobot b7fdf5a0a8 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-06-08 03:33:22 +00:00
minggo f2be4c62ee Merge pull request #2820 from minggo/develop 
fixed #2161: don't close AssetManager
 2013-06-07 20:24:27 -07:00
minggo b023158c85 fixed #2161: don't close AssetManager 2013-06-08 11:23:13 +08:00
James Chen d85da8725e Merge pull request #2818 from dumganhar/develop 
[develop] Minor fix for CCSprite::draw(), checking whether texture is valid, if it's invalid, don't set the attribute for it.
 2013-06-07 20:12:19 -07:00
James Chen 2fae3db792 Minor fix for CCSprite::draw(), checking whether texture is valid, if it's invalid, don't set the attribute for it. 2013-06-08 11:10:39 +08:00
James Chen cc1bbd9508 Merge pull request #2816 from dumganhar/develop 
[develop] new CCLabelTTF (static) create with fontDefinition method, and new CPP test using it
 2013-06-07 20:02:22 -07:00
James Chen e1b6832a79 Update AUTHORS [ci skip] 2013-06-08 10:59:32 +08:00
carlo morgantini 494ec43fe8 new CCLabelTTF (static) create with fontDefinition method, and new CPP test using it 2013-06-08 10:59:07 +08:00
James Chen 1a5de55d39 Merge pull request #2813 from dumganhar/ricardoquesada-tests_less_warnings 
Merge https://github.com/cocos2d/cocos2d-x/pull/2812
 2013-06-07 19:49:30 -07:00
James Chen ba5972ef79 [C++ 11] Bug fix for the usage of lambda in testBasic.cpp while using GCC compiler. 2013-06-08 10:25:53 +08:00
Ricardo Quesada 022dfc0acc CPP Tests migrated to the new C++11 API 
Many tests were converted to the C++11 API
and some tests were also simplified by using the "CL" macro
instead of the "CF" macro.
 2013-06-07 17:21:11 -07:00
René Klačan ef6841b532 Merge pull request #5 from mchinen/simpfix 
Merge keyboard support for mac by @mchinen
 2013-06-07 07:12:36 -07:00
James Chen 06fc79ac3b Merge pull request #2808 from pyrasis/tizen_2.1 
[Tizen] Add libwebsockets and support C++11
 2013-06-07 05:30:14 -07:00
Michael Chinen 9471c51201 set up keyboard handling for mac 2013-06-07 20:29:02 +09:00
Lee, Jae-Hong b9f5691706 [Tizen] Add libwebsockets.h, .a and support C++11 2013-06-07 20:14:43 +09:00
James Chen 3405dee0ca Merge pull request #2804 from dumganhar/ricardoquesada-test_base_class 
Merge https://github.com/cocos2d/cocos2d-x/pull/2796
 2013-06-07 00:07:22 -07:00
James Chen 522a091d72 Adding BaseTest in TestCpp for Android, emscripten, linux, nacl and marmalade. 2013-06-07 14:37:06 +08:00
James Chen 8cfe969137 Fixing compilation errors for win32. 2013-06-07 14:31:15 +08:00
Michael Chinen 7e9ba1c468 Merge branch 'develop' of https://github.com/simpliplant/cocos2d-x into simp 2013-06-07 15:16:30 +09:00
James Chen 421f07e8ca Merge branch 'test_base_class' of https://github.com/ricardoquesada/cocos2d-x into ricardoquesada-test_base_class 2013-06-07 14:05:25 +08:00