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

11614 Commits

Author SHA1 Message Date
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
Grzegorz Kościółek 2083ab0454 Fix for #2892. 
3. Fixed registerScriptObserver method.
 2013-07-26 22:42:00 +02:00
Grzegorz Kościółek 3a1d4e7e28 Fix for #2892. 
1. Updatet the API documentation and parameter name from "object" to "sender" to reflect it's true purpose.
2. Fixed addObserver and observerExisted because it didn't allowed to add observers to notifications that only differs by sender
 2013-07-26 22:20:19 +02: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
James Chen dc7fcce0fe Merge branch 'iss2430-modify_enum' of https://github.com/minggo/cocos2d-x into minggo-iss2430-modify_enum 
Conflicts:
	scripting/javascript/bindings/generated
	scripting/lua/cocos2dx_support/LuaCocos2d.cpp
 2013-07-26 21:22:16 +08:00
James Chen fe3f953493 Merge pull request #3278 from CocosRobot/updategeneratedsubmodule_1374842827 
[ci skip][AUTO] : updating submodule reference to latest autogenerated bindings
 2013-07-26 05:53:04 -07:00
James Chen f144df7f45 Update AUTHORS [ci skip] 2013-07-26 20:49:59 +08:00
James Chen 6c2e6e8cb0 Merge pull request #3253 from metalbass/patch-3 
Added virtual destructors to some interfaces to fix issue 3095
 2013-07-26 05:47:35 -07:00
CocosRobot e9b32f1f0c [AUTO] : updating submodule reference to latest autogenerated bindings 2013-07-26 12:47:22 +00:00
James Chen a73a4b9837 Merge pull request #3276 from dumganhar/constants-refactor 
Enumeration refactoring
 2013-07-26 05:36:16 -07:00
James Chen 0dce6d9cf3 Merge pull request #3227 from azmeuk/file-utils 
Added some guards in file utils
 2013-07-26 05:31:02 -07:00
James Chen c9def73930 Application::Platform::OS_MACOS --> Application::Platform::OS_MAC. 2013-07-26 20:24:33 +08:00
Éloi Rivard 95b826d82a Fixed a bug in emscripten file utils. 2013-07-26 14:19:47 +02:00
Éloi Rivard 3ffc026c6c Added some guards in file utils. 2013-07-26 14:19:20 +02:00
James Chen 9b6d3e6090 ResolutionPolicy::EXACTFIT --> ResolutionPolicy::EXACT_FIT 2013-07-26 20:07:41 +08:00