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

9414 Commits

Author SHA1 Message Date
Ricardo Quesada 98190a21c0 Actions with clone() pattern 1/3 
This is the 1st patch of 3.

1)
Removes the copyWithZone() patterns.
Adds the clone() pattern instead (which is more C++ friendly)
Adds also "const" to getters.
 2013-06-13 17:25:14 -07:00
James Chen fbe4e505fd Update AUTHORS [ci skip] 2013-06-13 15:01:52 +08:00
James Chen b372fc8534 Merge pull request #2872 from maciekczwa/develop 
fixed #2283: Adding Polish language support.
 2013-06-13 00:00:36 -07:00
James Chen b429d1a387 Update AUTHORS [ci skip] 2013-06-13 14:54:22 +08:00
James Chen 1f2f366ef6 Merge pull request #2868 from folecr/develop 
fixed #2281: When user has built with JS Debugger support ScriptingCore will handle necessary runtime changes
 2013-06-12 23:52:53 -07:00
James Chen 0de1a4ebd8 Merge pull request #2877 from pyrasis/tizen_2.1 
Support Tizen device
 2013-06-12 22:56:23 -07:00
minggo 6ef681bfff Merge pull request #2876 from ricardoquesada/chipmunk_6_1_5 
updates chipmunk2d to v6.1.5
 2013-06-12 22:53:35 -07:00
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
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
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
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
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