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

9415 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Ricardo Quesada 428711482e Adds missing config files for CCConfiguration 
...and add functionality on the Director to override the default values
from the config file.

Supported values:

 - cocos2d.x.fps
 - cocos2d.x.display_fps
 - cocos2d.x.gl.projection
 - cocos2d.x.texture.pixel_format_for_png
 - cocos2d.x.texture.pvrv2_has_alpha_premultiplied

If the "config.plist" file is not present, or some keys are not present,
the default values are going to be used

IMPORTANT:
 The folder "samples/Cpp/TestCpp/Resources/configs" needs to be added
 in the Android, Linux, Win32 projects.
 Already added in OS X and iOS Xcode projects.
 2013-06-06 12:23:44 -07:00
minggo 1e9397d490 Merge pull request #2793 from minggo/master 
copy CCBReaderLoad.lua to TestLua Resources
 2013-06-06 08:07:41 -07:00
minggo 4fa069df58 issue #2103:copy CCBReaderLoad.lua to TestLua Resources 2013-06-06 23:04:26 +08:00