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

711 Commits

Author SHA1 Message Date
samuele3hu 7f8099ce69 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2433-lua-bindings-generator 
Conflicts:
	cocos2d_libs.xcodeproj/project.pbxproj
	tools/bindings-generator
 2013-08-15 16:21:32 +08:00
samuele3hu 2d5482a0ab issue #2433:Modify cocos2d.ini 2013-08-15 16:14:14 +08:00
samuele3hu f29525bbc6 issue #2433:Modify Testlua sample and add some manual binding functions 2013-08-15 15:51:22 +08:00
samuele3hu 13fd369beb issue #2433:Modify lua binding generator template and releated action test 2013-08-14 21:35:55 +08:00
James Chen 7d3edde8f1 issue #2521: Updating tojs/cocos2dx_extension.ini, bind more CCControls. 2013-08-12 11:23:16 +08:00
samuele3hu 980bea8a97 issue #2433:lua binding generator add hello.lua 2013-08-09 10:07:10 +08:00
성낙호 eda9846e6f DelegateProtocol is weak-referenced again 2013-08-08 18:36:56 +09:00
James Chen 7910581654 Merge pull request #3388 from dumganhar/iss2483-sp-v23 
closed 2483: Upgrading spidermonkey library to v23.
 2013-08-07 18:39:40 -07:00
James Chen 59f5353f89 issue #2483: Updating cocos2d-console. 2013-08-07 18:06:31 +08:00
minggo 910215fa89 Merge pull request #3377 from boyu0/iss2345_refactor_ccimage 
issue #2345 refactor CCImage and CCTexture2D
 2013-08-06 23:29:38 -07:00
James Chen c2c1bb45d8 Updating Bindings-generator. 2013-08-07 14:19:36 +08:00
성낙호 1c91e73a8c added jsb support for AssetsMAnager 2013-08-07 14:07:01 +09:00
samuele3hu 1175f2034a Merge branch 'iss2433-lua-bindings-generator' of git://github.com/dumganhar/cocos2d-x into iss2433-lua-bindings-generator 2013-08-07 10:39:07 +08:00
samuele3hu 200c5de83f issue #2433:lua binding generator 2013-08-07 10:37:20 +08:00
James Chen 0c4910ee95 Adding tools/tolua . 2013-08-07 10:12:45 +08:00
minggo f447398211 Merge pull request #3376 from folecr/android_redesign_update_template 
Update templates to match newer, mostly-NDK Android port
 2013-08-06 19:11:00 -07:00
James Chen 4f740809dd The target needs to be set to 'spidermonkey' when generating jsbindings since we has added 'lua' target yet. 2013-08-07 10:08:00 +08:00
James Chen 710b895aaa Updating bindings-generator to the latest version. 2013-08-07 10:02:20 +08:00
boyu0 dc6503f7d4 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2345_refactor_ccimage 2013-08-06 13:37:38 +08:00
boyu0 94f9921d5e issue #2345: edit linux command to link the libpng12-dev.lib instead of use ourselves. Move ccTexParams into CCTexture2D 2013-08-06 11:34:48 +08:00
folecr 3176dddc83 Update Android JSON config files and project creation script 2013-08-05 19:29:08 -07:00
James Chen 81fc0069cc Updating travis-script/run-script.sh, don't build template projects for android. 2013-08-06 09:54:23 +08:00
James Chen 77a9c91b3d We has to pass the target to bindings-generator since we have add lua target. 2013-08-05 18:33:13 +08:00
James Chen ec49e7568f Updating bindings-generator, adding lua target. It's not finished. 2013-08-05 18:31:20 +08:00
James Chen 904f85e0a8 Adding tools/tolua . 2013-08-05 18:30:36 +08:00
Éloi Rivard 9dcb6fb80e Multi-resolution emscripten html template. 
Default emscripten html template update.
Minor emscripten warnings.
 2013-08-05 09:24:47 +02:00
James Chen e08b319726 issue #2170: [JSB] Label is abstract class now. 2013-08-05 12:49:57 +08:00
James Chen 85661c976c Merge pull request #3346 from nakosung/develop 
closed 2465: Wrong logic when pass an empty std::vector to WebSocket::init.
 2013-08-01 19:41:11 -07:00
성낙호 0883723c71 added cc.RemoveSelf 2013-08-02 10:59:16 +09:00
James Chen f61f4e58fd Merge pull request #3094 from sergey-shambir/linux_sdl 
closed 2458: Linux: added SDL backend as alternative to GLFW.
 2013-07-31 01:55:37 -07:00
minggo 0530109a9f Merge pull request #3178 from boyu0/2345 
Refactor CCImage and CCTexture2D
 2013-07-31 01:21:18 -07:00
Sergey Shambir 7385db5a34 Linux: added SDL2 to travis scripts and install-deps-linux.sh 2013-07-30 23:20:18 +04:00
samuele3hu 3499aafd27 issue #2435:Lua template supports mac port 2013-07-30 09:51:15 +08:00
boyu0 41cac18ae2 edit for lua 2013-07-29 14:04:51 +08:00
boyu0 304d636deb Closed #2345 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345 2013-07-29 11:40:18 +08:00
James Chen bb3ee262b8 Updating README.mdown for the reason of bindings-generator doesn't support windows. 2013-07-29 08:33:10 +08:00
James Chen d4dcf44380 [Win32] Removing bindings-generator support, since the clang3.3 of windows can't work with c++11 well, I don't know why, so disable win32 support temporary. 2013-07-29 08:27:59 +08:00
Timothy Qiu d9020ae80c Use absolute path for json config files. 2013-07-28 22:59:37 +08:00
boyu0 cecfc13bc4 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345 2013-07-27 22:06:30 +08: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
samuele3hu faa0b46f57 issue #2426:Add Drawprimitives and DrawNode lua binding and modify releated test sample 2013-07-27 10:42:22 +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 19d9c08c79 issue #2430: Fixing compilation errors for lua and js bindings. 2013-07-26 22:15:30 +08:00
James Chen 3bc45e665c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into constants-refactor 
Conflicts:
	scripting/lua/cocos2dx_support/LuaCocos2d.cpp
 2013-07-26 19:56:04 +08:00
James Chen ad1d8b667d enum class for LanguageType, Application::Platform 2013-07-26 17:29:06 +08:00
samuele3hu 6b9c7d4ade issue #2404:modify a function name to isSwallowsTouches() 2013-07-26 15:21:19 +08:00
James Chen 7839f769f2 Merge pull request #3265 from dumganhar/constants_fixes 
Merge PR https://github.com/cocos2d/cocos2d-x/pull/3261 and updating bindings-generator. It supports 'enum class' type now.
 2013-07-25 23:21:29 -07:00
James Chen 241cf022a4 Fixing Luabinding errors. 2013-07-26 13:50:10 +08:00
James Chen cda727843a Updating bindings-generator. It supports 'enum class' type now. 2013-07-26 11:14:48 +08:00
minggo 5479dbe0b9 remove xcode template 2013-07-26 10:54:20 +08:00
minggo c79f4b8595 add creating project script in root 2013-07-26 10:50:37 +08:00
minggo 10a8c3f23b tools/project-creator -> tools/project_creator 2013-07-26 10:46:18 +08:00
samuele3hu 456a26d7ab issue #2404:Modify tab to spaces 2013-07-25 20:03:58 +08:00
samuele3hu 11d7c9c653 issue #2404:Add more functions to Deprecated.lua and modify some .pkg files 2013-07-25 19:58:59 +08:00
James Chen 653c1f7f8f Merge branch 'releasing' of https://github.com/minggo/cocos2d-x into minggo-releasing 2013-07-25 16:00:45 +08:00
Éloi Rivard 682a1238fa Use of a single emscripten HTML template file. 2013-07-24 17:59:21 +02:00
minggo a76863dd7f add execution permission 2013-07-24 17:50:39 +08:00
minggo 99949331b1 fix error and compilings error in templates 2013-07-24 17:27:29 +08:00
minggo 019246fd51 travis build template too 2013-07-24 17:26:45 +08:00
Jerry Zhang 749e8f96eb typo; more Pythonic 2013-07-23 13:37:17 +08:00
minggo 8660543d77 Merge pull request #3198 from samuele3hu/deprecatedfunc 
issue #2404:Move deprecated functions in Lua
 2013-07-22 00:27:06 -07:00
James Chen c154d66bf0 Updating Bindings-generator. 2013-07-22 13:44:30 +08:00
samuele3hu 510a5912fd issue #2404:Add many functions to Deprecated.lua 2013-07-22 13:42:58 +08:00
samuele3hu eed0297c59 Merge branch 'deprecatedfunc' of https://github.com/samuele3hu/cocos2d-x; branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprecatedfunc 2013-07-22 09:39:57 +08:00
samuele3hu 4eb6d7aea4 issue #2404:Modify a comment 2013-07-19 15:38:17 +08:00
samuele3hu 18fa6f2fbd issue #2404:Modify a comment 2013-07-19 15:29:36 +08:00
James Chen 7c7d21dd03 issue #2407: more best practices fixes, more getter and const.. 2013-07-19 14:57:54 +08:00
samuele3hu 90af254fac Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprecatedfunc 2013-07-19 14:57:38 +08:00
samuele3hu 3b97353e14 issue #2404:Modify Deprecated.lua and set platform config 2013-07-19 14:57:02 +08:00
James Chen 6ffac07a81 More getter functions: e.g. MenuItemFont::fontSize --> MenuItemFont::getFontSize 2013-07-19 11:08:47 +08:00
samuele3hu 236b675e21 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into deprecatedfunc 2013-07-18 23:29:41 +08:00
samuele3hu 78cd3e561e issue #2404:Move deprecated functions to Deprecated.lua 2013-07-18 23:27:07 +08:00
boyu0 76e05ee802 Merge https://github.com/cocos2d/cocos2d-x into 2345 2013-07-18 17:47:43 +08:00
James Chen d58a7fcce2 closed #2414: Bindings-generator could bind std::function argument now. 2013-07-17 18:09:49 +08:00
James Chen a9eea0a887 issue #2407: Updating jsb_deprecated.js and cocos2dx.ini. 2013-07-17 17:38:03 +08:00
boyu0 70140bb4cb refactor CCImage and CCTexture2D 2013-07-17 17:12:04 +08:00
James Chen 7e4e34d992 [ci skip]Update cocos2dx.ini, don't genergate bindings for DrawNode::listenBackToForeground. 2013-07-17 14:36:10 +08:00
samuele3hu 596eb9df3e issue #2377:Modify tojs/cocos2dx.ini and a function name 2013-07-16 16:45:57 +08:00
samuele3hu 1761669832 issue #2377:Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandlerMgr 2013-07-16 12:47:40 +08:00
James Chen 72d1a074df Updating travis-script/before-install.sh, install gcc4.7 when build linux port. 2013-07-16 11:58:08 +08:00
James Chen de4b231264 closed #2405: Updating bindings-generator, Bindings-generator should not bind deprecated methods. 2013-07-16 10:04:03 +08:00
James Chen ebf382b02f issue #2405: Removing deprecated methods in 'skip' section in cocos2dx.ini since bindings-generator will not bind deprecated methods now. 2013-07-16 10:03:25 +08:00
samuele3hu c955a559bf issue #2377:Del register/unregister function in .cpp and .h files 2013-07-16 09:55:06 +08:00
James Chen 759831c1d8 issue #2397: Application::sharedApplication --> Application::getInstance. 2013-07-15 16:24:42 +08:00
samuele3hu 80a6811f9f Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ScriptHandler 2013-07-15 10:39:08 +08:00
samuele3hu 51c3ced4ba issue #2377:Modify the ScripthandlerMgr struct and modify some lua test samples 2013-07-15 10:38:16 +08:00
minggo 34b60e99f1 Merge pull request #3140 from minggo/iss2393-mark_deprecated 
Use Point, Rect and Size member functions instead of global functions
 2013-07-12 08:59:27 -07:00
minggo 98fffdf7fc closed #2393:revert some wrong modification when fix conflicts 2013-07-12 23:58:31 +08:00
minggo 6abe6fce78 closed #2393: fix conflicts 2013-07-12 18:04:32 +08:00
James Chen dda40ce9ab Updating cocos2dx.ini, ignore "FileUtils::purgeFileUtils" for JSB. 2013-07-12 16:49:13 +08:00
James Chen c6b0882766 issue #2397: Updating Lua bindings. 2013-07-12 15:42:14 +08:00
James Chen 33c37f5f9d issue #2397: CCTextureCache:sharedTextureCache --> CCTextureCache:getInstance. 2013-07-12 14:44:24 +08:00
James Chen 4a7e884de8 issue #2397: UserDefault::sharedUserDefault() --> UserDefault::getInstance(), UserDefault::purgeSharedUserDefault() --> UserDefault::destroyInstance(); 2013-07-12 14:34:57 +08:00
James Chen f8cd252c5c issue #2397: sharedNotificationCenter --> getInstance 2013-07-12 14:17:42 +08:00
James Chen 6038d69183 issue #2397: sharedSpriteFrameCache --> getInstance, purgeSharedSpriteFrameCache --> destroyInstance. 2013-07-12 14:12:58 +08:00
James Chen f30ae2ef31 issue #2397: Updating CCAnimationCache.pkg 2013-07-12 13:57:05 +08:00
James Chen 41957f06c9 issue #2397: sharedAnimationCache --> getInstance. 2013-07-12 13:54:56 +08:00
James Chen 853a503d2f issue #2397: Updating bindings configuration. [Lua and JS]. 2013-07-12 13:48:31 +08:00