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

10228 Commits

Author SHA1 Message Date
yinkaile f2021982f4 Change CCAnimation to CCArmatureAnimation 2013-06-08 11:16:17 +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 35e11ae9ff Merge pull request #2814 from CocosRobot/updategeneratedsubmodule_1370659717 
[AUTO] : updating submodule reference to latest autogenerated bindings [ci skip]
 2013-06-07 20:00:56 -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
minggo cdf24ceba1 Merge pull request #2815 from minggo/master 
fix a bug of Cocos2dxETCLoader.java
 2013-06-07 19:58:47 -07:00
minggo 206502dccb fixed #2161: don't close AssetManager 2013-06-08 10:57:19 +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
CocosRobot f036f7b881 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-06-08 02:48:40 +00:00
James Chen 96bcfcbf19 Update AUTHORS [ci skip] 2013-06-08 10:45:57 +08:00
James Chen 6938b27ab5 Merge pull request #2811 from carlomorgantinizynga/finalTTFLabelChanges 
fixed #2265: new CCLabelTTF createWithFontDefinition method, and new test
 2013-06-07 19:44:23 -07:00
James Chen c4b051a885 Update AUTHORS [ci skip] 2013-06-08 10:39:26 +08:00
James Chen 007a33f89a Merge pull request #2809 from edwardzhou/master 
issue #2103: correct the type detecting order for Lua CCBProxy::getNodeTypeName.
 2013-06-07 19:37:19 -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
carlo morgantini b7ffb5b810 new CCLabelTTF (static) create with fontDefinition method, and new CPP test using it 2013-06-07 16:33:01 -07:00
yinkaile 7c924c714f Standardize code 2013-06-07 22:56:54 +08: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 2107fdddf1 Merge pull request #2810 from dumganhar/master 
Fixing compilation errors in TestLua for Win32.
 2013-06-07 06:25:02 -07: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
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
yinkaile d66a3870d4 Standardize code 2013-06-07 20:07:01 +08:00
yinkaile 718a8e763e Standardize code 2013-06-07 19:57:15 +08:00
Edward Zhou 9cc351f47b correct the type detecting order forgetNodeTypeName 2013-06-07 19:49:22 +08:00
yinkaile a10d0734f2 Standardize code 2013-06-07 19:48:31 +08: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
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 7c650d7f28 [BB] Updating project configuration. 2013-06-07 18:45:58 +08: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 47eeed0631 Merge pull request #2805 from samuele3hu/test_sample_of_http_bind 
Add restrictions on the use of edit box
 2013-06-07 03:19:13 -07:00
James Chen fc2c068a66 [BB] Updating project configuration. 2013-06-07 18:17:07 +08:00
James Chen e3e90db71c [BB] Adding extra lua script resource folder for TestLua. 2013-06-07 18:16:10 +08:00
samuele3hu 567d1aa039 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into test_sample_of_http_bind 2013-06-07 17:49:52 +08:00
samuele3hu dda3c34be8 issue #2103 add webSocket lua test sample 2013-06-07 17:48:07 +08:00
yinkaile 850ea39107 Standardize code 2013-06-07 17:10:53 +08:00
James Chen 39a21625ec Merge pull request #2803 from samuele3hu/test_sample_of_http_bind 
fixed #2103: Lua bind of websocket and add a test sample
 2013-06-07 02:05:55 -07:00
samuele3hu 50f44db9a8 issue #2103 add webSocket lua test sample 2013-06-07 17:02:00 +08:00
James Chen 9298492384 Updating project configuration for Blackberry port. 2013-06-07 16:52:49 +08:00
samuele3hu 16a34b0da3 issue #2103 add webSocket lua test sample 2013-06-07 16:51:50 +08:00
yinkaile 2418afc96d conform declare and initialize order 2013-06-07 16:13:08 +08:00
James Chen 942c797749 Removing unused codes. 2013-06-07 15:39:18 +08: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
samuele3hu a2cf4933c4 issue #2103 add webSocket lua test sample 2013-06-07 14:57:36 +08:00