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

452 Commits

Author SHA1 Message Date
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 1cc8f94ec7 Crash fix in CCControlColurPickerTest. 2013-06-09 16:37:15 +08:00
James Chen 0a8ae1e79f [BB] Updating project configuration after adding CocoStudio runtime. 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
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
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
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
James Chen 646d0aa1cf [LINUX] Fix a compilation error in spine/extension.cpp. 2013-06-08 17:22:49 +08:00
James Chen ab15cd8c7b [CCArmature] Updating CCDatas.h. Why to name it 'CCDatas.h" ????? 2013-06-08 16:45:25 +08:00
James Chen aec713ac4e [CCArmature] Ignoring a warning of 'delete-non-virtual-dtor' for linux build. 2013-06-08 16:44:37 +08:00
James Chen 93ecfbbf7e Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x into nacl-fix 2013-06-08 15:42:41 +08:00
James Chen d3253dd161 Fixing compilation errors for native client port. 2013-06-08 15:28:58 +08:00
yinkaile f2021982f4 Change CCAnimation to CCArmatureAnimation 2013-06-08 11:16:17 +08:00
James Chen 5c8d4378a6 Fixing compilation errors in TestLua for Win32. 2013-06-07 21:23:15 +08:00
yinkaile a959c621f2 Standardize code 2013-06-07 21:00:45 +08:00
yinkaile 1be7827d03 Standardize code 2013-06-07 20:54:35 +08:00
yinkaile d66a3870d4 Standardize code 2013-06-07 20:07:01 +08:00
yinkaile 718a8e763e Standardize code 2013-06-07 19:57:15 +08:00
yinkaile a10d0734f2 Standardize code 2013-06-07 19:48:31 +08:00
yinkaile ba09c20434 Standardize code 2013-06-07 18:50:35 +08:00
James Chen 43e8573d8b Merge pull request #2807 from dumganhar/master 
[BB] Updating project configuration.
 2013-06-07 03:49:10 -07:00
James Chen 3fc675a6df [BB] Updating project configuration. especially for multi-platform-cpp/lua template. 2013-06-07 18:38:00 +08:00
yinkaile 6a6245eefd Standardize code 2013-06-07 18:29:47 +08:00
James Chen fc2c068a66 [BB] Updating project configuration. 2013-06-07 18:17:07 +08:00
yinkaile 850ea39107 Standardize code 2013-06-07 17:10:53 +08:00
James Chen 9298492384 Updating project configuration for Blackberry port. 2013-06-07 16:52:49 +08:00
yinkaile 2418afc96d conform declare and initialize order 2013-06-07 16:13:08 +08:00
yinkaile e1e41f7124 move const value to CCDataReaderHelper.cpp 2013-06-07 14:47:08 +08:00
yinkaile d4116f8478 1.remove #pragma endregion 
2.change str.compare("")==0 to str.length()==0
 2013-06-07 14:01:03 +08:00
samuele3hu f58d0a04aa Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into test_sample_of_http_bind 2013-06-07 12:57:04 +08:00
James Chen d72e9d10b5 Updating multi-platform-xxx template for win32. 2013-06-07 12:50:02 +08:00
yinkaile 65974f2243 standardize code 2013-06-07 10:52:32 +08:00
samuele3hu 5986d3904d Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into test_sample_of_http_bind 2013-06-07 10:14:12 +08:00
samuele3hu 66d4acc31a issue #2103 add webSocket lua test sample 2013-06-07 10:12:01 +08:00
samuele3hu e4ec801363 issue #2103 add webSocket lua test sample 2013-06-06 22:29:02 +08:00
yinkaile 10ed7ebdf4 merge newest version 2013-06-06 16:22:58 +08:00
James Chen ed4b9b2bb3 Marmalade projects fix. 2013-06-06 14:26:35 +08:00
James Chen 93597a5858 [Spine] Using getContentSize to make spine-runtime supports the strategy of loading resources in cocos2d-x. 2013-06-06 14:22:51 +08:00
James Chen f056757a9f Adding libwebsockets license in WebSocket.h/.cpp. 2013-06-06 14:16:57 +08:00
yinkaile 3cfba7bc9a Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 
Conflicts:
	extensions/Android.mk
	extensions/proj.win32/libExtensions.vcxproj.filters
	samples/Cpp/TestCpp/Android.mk
	samples/Cpp/TestCpp/Classes/ExtensionsTest/ExtensionsTest.cpp
 2013-06-06 12:35:18 +08:00
yinkaile 245b0395b1 1.upload CCArmature 2013-06-06 12:02:54 +08:00
minggo 3713ff5b71 Merge pull request #2770 from samuele3hu/test_bind_cocosbuilder 
add cocosbuilder lua test sample
 2013-06-05 01:38:57 -07:00
minggo a9788a7f9d Merge pull request #2767 from chengstory/master_Components#2 
1.  change “bool isEnabled()”  to "bool isEnabled() const".
 2013-06-05 00:52:32 -07:00
samuele3hu 75b26d9cdf Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into test_bind_cocosbuilder 2013-06-05 15:19:01 +08:00
samuele3hu 6dd077b8bd issue #2103 add cocosbuilder lua test sample 2013-06-05 15:17:00 +08:00