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

9899 Commits

Author SHA1 Message Date
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
yinkaile e1e41f7124 move const value to CCDataReaderHelper.cpp 2013-06-07 14:47:08 +08: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
yinkaile d4116f8478 1.remove #pragma endregion 
2.change str.compare("")==0 to str.length()==0
 2013-06-07 14:01:03 +08:00
samuele3hu cdbf8b7250 issue #2103 add webSocket lua test sample 2013-06-07 13:55:36 +08:00
James Chen 9f47c80e5f Merge pull request #2802 from dumganhar/develop 
Updating multi-platform-xxx template for win32. And some warning fixes.
 2013-06-06 21:58:39 -07:00
James Chen ec8ab8bd8b Updating multi-platform-xxx template for win32. 2013-06-07 12:57:28 +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
samuele3hu c021f700d3 issue #2103 add webSocket lua test sample 2013-06-07 12:54:39 +08:00
James Chen 302106a8a9 Merge pull request #2801 from dumganhar/master 
Updating multi-platform-xxx template for win32.. And some warning fixes.
 2013-06-06 21:52:23 -07:00
James Chen d72e9d10b5 Updating multi-platform-xxx template for win32. 2013-06-07 12:50:02 +08:00
James Chen 945b41d147 Merge pull request #2799 from dumganhar/master 
[master] Fix flags for debugger server socket, works on iOS and Android.
 2013-06-06 19:57:35 -07:00
James Chen 4f13ac2ea6 Update AUTHORS [ci skip] 2013-06-07 10:55:56 +08:00
folecr 4a9504717b Fix flags for debugger server socket 
* Works on iOS and Android
 2013-06-07 10:55:44 +08:00
yinkaile 65974f2243 standardize code 2013-06-07 10:52:32 +08:00
minggo cf674ce5ba Merge pull request #2795 from flaming0/sd-func-fix-win-build 
Fix VS build (nullptr instead of NULL when assigning to std function)
 2013-06-06 19:48:24 -07:00
James Chen 991daa8b65 Update AUTHORS [ci skip] 2013-06-07 10:47:03 +08:00
James Chen 736fe3c63a Merge pull request #2792 from folecr/jsdb 
Fix flags for debugger server socket
 2013-06-06 19:45:33 -07: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
James Chen 6784533212 Merge pull request #2798 from CocosRobot/updategeneratedsubmodule_1370569307 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-06-06 19:00:26 -07:00
CocosRobot 919d24d5b2 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-06-07 01:41:52 +00:00
minggo 16b4400c7b Merge pull request #2794 from ricardoquesada/missing_config_files 
Missing config files
 2013-06-06 18:36:42 -07:00