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

573 Commits

Author SHA1 Message Date
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
James Chen 2c1b26acf8 issue #2397: EGLView::sharedOpenGLView() --> EGLView::getInstance() 2013-07-12 13:11:21 +08:00
James Chen 74339b6d0e issue #2397: Updating cocos2d.ini and CCFIleUtils.pkg. 2013-07-12 12:53:20 +08:00
James Chen a678d12615 issue #2397: FileUtils::sharedFileUtils --> FileUtils::getInstance() for all platforms 2013-07-12 12:03:39 +08:00
James Chen 88a28b041e issue #2397: Director::sharedDirector --> Director::getInstance() for all files. 2013-07-12 11:50:36 +08:00
dumganhar 9b126e79d7 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into remove-copywithzone 
Conflicts:
	scripting/lua/cocos2dx_support/LuaCocos2d.cpp
 2013-07-08 23:09:48 +08:00
dumganhar 8f900d02b8 issue #2300: Removing all 'copyWithZone' pattern. 2013-07-08 23:05:47 +08:00
minggo 87125e4b2a issue #2129:use capital words for static const member variables 2013-07-08 18:11:32 +08:00
minggo cf96ec079e Merge pull request #11 from dumganhar/minggo-iss2129-remove_prefix 
Bug fixes. Please see the commits for details.
 2013-07-08 00:40:23 -07:00
James Chen 962207a48a Adding some logs in travis script. 2013-07-08 15:27:49 +08:00
James Chen 466a64ba05 issue #2129: Updating bindings-generator. 2013-07-08 15:25:04 +08:00
James Chen c07eda8894 issue #2129: Updating cocos2dx.ini. 2013-07-08 15:19:46 +08:00
minggo b39e7e205f issue #2129:modify pkg files 2013-07-08 11:34:31 +08:00
James Chen e03091f934 Updating tojs/cocos2dx.ini, visit needs to be exposed to JS since it's used for RenderTexture. 2013-07-05 15:18:04 +08:00
James Chen 9d2152b513 sudo apt-get update before install new packages 2013-07-05 13:45:37 +08:00
James Chen a67ac821f7 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2371-add-lua-ios-mac 
Conflicts:
	scripting/lua/cocos2dx_support/LuaCocos2d.cpp
 2013-07-04 17:15:09 +08:00
James Chen 62879c3789 issue #2371: Updating CCTexture2D.pkg. 2013-07-04 17:09:23 +08:00
minggo 22e5d12503 Merge pull request #3071 from keirantai/develop 
Regenerated xcode4 templates plist files
 2013-07-03 23:27:50 -07:00
minggo c327bc7906 issue #2373:add const in pkg files 2013-07-04 12:50:17 +08:00
Keiran Tai dde6250159 Regenerated xcode4 templates plist files due to missing few important files and causes compile error 2013-07-04 11:13:15 +08:00
James Chen 28b3028646 Updating bindings-generator. 2013-07-02 18:24:31 +08:00
James Chen d446f90016 close #2285: Updating tools/tojs/cocos2d-x.ini. 2013-07-02 17:48:06 +08:00
James Chen 34871d47af close #2347: Updating tools/tojs/cocos2dx.ini. 2013-07-01 22:34:57 +08:00
James Chen e20356a32d Merge pull request #3037 from boyu0/refactor_2339 
change the useage text
 2013-06-30 23:37:12 -07:00
James Chen c872666650 Merge pull request #3025 from boyu0/refactor_2339 
closed #2339: Refactor checkParams() in create_project.py, use OptionParser to parse the params
 2013-06-30 23:19:08 -07:00
boyu0 1156ae4f60 change the useage text 2013-07-01 14:10:14 +08:00
boyu0 2625847a74 closed #2339 refactor checkParams() in create_project.py, use OptionParser to parse the params 2013-07-01 01:04:01 +08:00
boyu0 2cccadeaab closed #2339 refactor checkParams() in create_project.py, use OptionParser to parse the params 2013-06-28 10:12:55 +08:00
James Chen 5ce150a10c issue #2340: Updating submodule of cocos2d-console. 2013-06-27 17:19:22 +08:00
minggo d2940bf4c7 Merge pull request #3008 from minggo/ccx_filesystem 
remove unneeded codes when using assets manager
 2013-06-26 18:53:34 -07:00
minggo 7e26a86e2e issue #2329:not bind CCFileUtils private function 2013-06-26 17:36:31 +08:00
James Chen cde809951a Fixing travis errors for generating JSB glue codes. 2013-06-26 16:57:08 +08:00
James Chen 14208cfda9 Only skip ^visit$ 2013-06-26 16:35:41 +08:00
James Chen e1b1eee46d issue #2313: Ignores `visit` and exposes ClippingNode to JS. [Not finished] 2013-06-26 16:29:45 +08:00
Sam Clegg f9ae701a4b Fix emscripten build on linux 
Remove the dependacy of the emscripten build on /Library/Fonts
(a darwin-only folder).  On non-darwin platforms we use the
ariel.tff that is part of TestCpp.
 2013-06-25 11:47:52 -07:00
Sam Clegg cb2f42d0c6 Share top level Makefile between emscripten, linux and nacl. 
Remove the custom top level Makefile.emscripten and instead
add build-emscripten.sh which can be used like build-linux.sh
and build-nacl.sh.

Also, use the top level lib folder to store emscripten libs.
This brings it in line with the other make-based builds.
 2013-06-25 11:45:01 -07:00
Sam Clegg 58c3faf209 Cleanup travis build scripts. 
before-install.sh and run-script.sh now both given an error if
no PLATFORM was not specified correctly.

Environment variables are now set as part of run-script.sh.  This
makes the travis output simpler and makes it possible to run
run-script.sh outside of travis.

javascript binding generation will not exit early if GH_USER
etc are not set.  This allows the travis scripts to be run in
cloned repos which were otherwise erroring out trying to go
the JS bindings commit.

When generating javascript bindgings, don't username and email
with '--global'.  It should be sufficient to set this only for
the binding repo.
 2013-06-24 22:55:15 -07:00
James Chen e96c807087 clang+llvm-3.1 --> clang+llvm-3.3 2013-06-21 21:49:23 +08:00
James Chen e69838ff27 [Travis CI] Removing space for before-install.sh. 2013-06-21 21:40:21 +08:00