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

11467 Commits

Author SHA1 Message Date
samuele3hu 3d60019eb1 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DrawNode 2013-07-27 21:58:24 +08:00
samuele3hu 5e37e53e14 issue #2404:Add more deprecated function 2013-07-27 21:57:22 +08:00
James Chen e66e429bb2 issue #2430: Moving enum type to class for CCBReader. 2013-07-27 21:44:49 +08:00
minggo 4dde992b70 Merge pull request #3298 from minggo/develop 
make iOS template work ok on armv7s devices
 2013-07-27 06:40:33 -07:00
minggo b6b56a252c make iOS template work ok on armv7s devices 
build only active architecture only
 2013-07-27 21:20:25 +08:00
samuele3hu af9f6fbe3a issue #2404:Add more deprecated function and modify some test sample 2013-07-27 17:20:22 +08:00
James Chen cf7aed8789 Merge pull request #3297 from dumganhar/develop 
More warning fixes and Lua Template Fix.
 2013-07-27 00:17:28 -07:00
James Chen 8721951cee Lua Template Fix. 2013-07-27 15:16:09 +08:00
James Chen 324607c32c More warning fixes. 2013-07-27 15:15:54 +08:00
James Chen e534ec1802 Merge pull request #3296 from dumganhar/develop 
Updating JS-Tests. Fixed a bug of PerformanceSpriteTest that mgr is undefined when it runs on the JSB.
 2013-07-26 23:06:03 -07:00
James Chen 9a56cd80bf Updating JS-Tests. Fixed a bug of PerformanceSpriteTest that mgr is undefined when it runs on the JSB. 2013-07-27 14:02:23 +08:00
James Chen 58362ec8cd Merge pull request #3295 from CocosRobot/updategeneratedsubmodule_1374899871 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2013-07-26 21:53:49 -07:00
CocosRobot 0e50b7663e [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-27 04:37:54 +00:00
James Chen 2a65fdf2f4 Merge pull request #3294 from dumganhar/develop 
Updating bindings-generator reference.Supports the default argument whos...
 2013-07-26 21:33:07 -07:00
James Chen 732c2ee49d Updating bindings-generator reference.Supports the default argument whose value is a reference, for example: 
class AAA
{
public:
static const BBBB = 100;
void foo(int arg1 = BBBB); // Support this default argument which is not integer argument like 'int arg1 = 100; '
}
 2013-07-27 12:32:08 +08:00
James Chen 32b823f301 Merge pull request #3291 from dumganhar/develop 
Updating JS-Test to the latest version.
 2013-07-26 21:17:01 -07:00
James Chen 301f5218ff Merge pull request #3290 from samuele3hu/DrawNode 
issue #2426:Add Drawprimitives and DrawNode lua binding and modify releated test sample
 2013-07-26 20:44:59 -07:00
James Chen 83afffe5b1 Updating JS-Test to the latest version. 2013-07-27 11:37:07 +08:00
samuele3hu ab4aec0dd3 issue #2426:Replace table with spaces 2013-07-27 11:12:12 +08:00
samuele3hu f12db807a0 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DrawNode 2013-07-27 11:04:36 +08:00
samuele3hu faa0b46f57 issue #2426:Add Drawprimitives and DrawNode lua binding and modify releated test sample 2013-07-27 10:42:22 +08:00
James Chen 123351a050 Merge pull request #3289 from dumganhar/develop 
[Mac] Adding resources for SimpleGame.
 2013-07-26 19:29:45 -07:00
James Chen ea9988fde6 [Mac] Adding resources for SimpleGame. 2013-07-27 10:28:40 +08:00
James Chen 02fc1749ca Merge pull request #3286 from ricardoquesada/http_warnings 
fixes warnigns when using HttpRequest
 2013-07-26 19:20:14 -07:00
minggo 5e8c3a54c1 Merge pull request #3288 from minggo/ndk-r9-fixes 
Fix build with -Werror=format-security (default in Android NDK r9)
 2013-07-26 16:59:28 -07:00
minggo 295a23e535 Fix build with -Werror=format-security (default in Android NDK r9) 2013-07-27 07:57:28 +08:00
carlo morgantini 6e4aafdacf fix a problem with the new Label and colors 2013-07-26 16:30:36 -07:00
carlo morgantini 23575f0a68 New Label stuff merged and Label::Alignment replaced with TextVAlignment and TextHAlignment 2013-07-26 16:04:21 -07:00
carlo morgantini 8416e7cf6d Merge remote-tracking branch 'cocos2d/develop' into developNewLabelMergeDevelop 
Conflicts:
	cocos2d_libs.xcodeproj/project.pbxproj
	scripting/javascript/bindings/generated
	tools/bindings-generator
 2013-07-26 15:54:50 -07:00
Sergii Rudchenko 3ea77ec933 Fix build with -Werror=format-security (default in Android NDK r9) 2013-07-27 01:17:13 +03:00
Ricardo Quesada 0da367e05e fixes warnigns when using HttpRequest 
fixes warnigns when using HttpRequest
 2013-07-26 14:34:17 -07:00
carlo morgantini be47a6da52 Merge remote-tracking branch 'ricorigin/label_merge' into developNewLabelForRiq 
Conflicts:
	cocos2dx/label_nodes/CCFontAtlasFactory.cpp
	samples/Cpp/TestCpp/Classes/LabelTest/LabelTest.cpp
 2013-07-26 11:58:18 -07:00
carlo morgantini e34a0affa8 more cleaning 2013-07-26 10:43:17 -07:00
carlo morgantini 76ebeb0676 some more clean up for CCLabel 2013-07-26 10:29:29 -07:00
James Chen 21da43a2ae Merge pull request #3283 from dumganhar/iss2430-more-deprecated-fix 
issue #2430: Moved constant to header file to avoid errors in 'switch case', the error is 'case value is not a constant expression'.
 2013-07-26 10:25:47 -07:00
James Chen 825dd5927f issue #2430: Fixing conflicts. 2013-07-27 01:11:21 +08:00
James Chen feadd2b2dd issue #2430: Moved constant to header file to avoid errors in 'switch case', the error is 'case value is not a constant expression'. 
Also added more deprecated constants.
 2013-07-27 00:55:41 +08:00
samuele3hu a6e514f3d5 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into DrawNode 2013-07-27 00:36:20 +08:00
samuele3hu 016593bd0e issue #2426:Add Drawprimitives.lua and Drawprimitives lua test sample 2013-07-27 00:28:06 +08:00
James Chen db61ebef0f Merge pull request #3281 from CocosRobot/updategeneratedsubmodule_1374852122 
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
 2013-07-26 08:24:55 -07:00
CocosRobot 7a0e765a39 [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-26 15:22:06 +00:00
James Chen b313ec43fc Merge pull request #3239 from samuele3hu/TestSample 
issue #2429:LuaWebSocket supports sending binary string passed by lua
 2013-07-26 08:00:52 -07:00
James Chen 04077e312e Merge pull request #3280 from dumganhar/minggo-iss2430-modify_enum 
Merge PR https://github.com/cocos2d/cocos2d-x/pull/3270, move enum into class and using enum class
 2013-07-26 07:58:39 -07:00
James Chen 387ae822b1 issue #2430: Compilation error fix for CCEditBox/CCEditBoxImplWin.cpp 2013-07-26 22:57:15 +08:00
samuele3hu 18819c00ec issue #2429:Replace table with spaces 2013-07-26 22:56:42 +08:00
James Chen 58a3560bca More enum class: ScrollView::Direction, TableView::VerticalFillOrder 2013-07-26 22:55:41 +08:00
samuele3hu bc83304e23 issue #2429:Replace LuaWebSocket sendTextMsg function and sendBinaryMsg function with sendString function 2013-07-26 22:50:45 +08:00
James Chen 19d9c08c79 issue #2430: Fixing compilation errors for lua and js bindings. 2013-07-26 22:15:30 +08:00
samuele3hu 70fcf47a3e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into TestSample 2013-07-26 21:39:34 +08:00
James Chen 2bfccb4a43 A typo fix: EditBox::EditBox::KeyboardReturnType --> EditBox::KeyboardReturnType 2013-07-26 21:36:32 +08:00