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

597 Commits

Author SHA1 Message Date
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
James Chen 3cf482bebd Updating bindings-generator. 2013-06-21 21:27:59 +08:00
James Chen 992ea78f53 Using llvm 3.3 and android cxx-stl 4.7. 2013-06-21 21:27:45 +08:00
James Chen 9a7bb8fa84 Removing unused files [tools/lua_project_generator]. [ci skip]. 2013-06-21 11:17:14 +08:00
Sam Clegg 40766006bd [NaCl] Fix NaCl build which had been disabled. 
Since switching to C++11 the NaCL build was disabled.
This re-enables the ARM configuration which uses a
more recent version of gcc.  This means that that NaCl
code paths will at least be test until we can find a way
to re-enable the X86 build.
 2013-06-20 12:56:12 -07:00
James Chen 1b66a98390 Bug fixes for the tool to generate luabindings. 2013-06-20 19:00:23 +08:00
James Chen b37fbfdcc8 Merge pull request #2939 from growingdever/patch-3 
Update create_project.py
 2013-06-20 01:45:23 -07:00
James Chen 150394d648 issue #2129: Compatible with old class name exported to LUA, I mean keeping CC prefix for luabinding. 2013-06-20 15:10:14 +08:00
James Chen 14b07af56c issue #2129: CC_Reader --> _Reader. 2013-06-20 15:08:22 +08:00
James Chen da6af26cd8 issue #2129: Updating cocos2dx.ini. 2013-06-20 14:58:01 +08:00
James Chen 73c167d1b2 issue #2129: Updating submodule of bindings-generator. 2013-06-20 14:56:33 +08:00
James Chen c7456af00e issue #2129: Updating tojs/cocos2d.ini and tojs/cocos2dx_extension.ini. 2013-06-20 14:24:36 +08:00
growingdever 60c84a50a1 Update create_project.py 
'Sample 1' way is not okay. If not input language, script doesn't generate project. (Must input language, but 'Sample 1' way said that you don't need to input language.)
 2013-06-20 13:14:27 +09:00
James Chen fa21674f6c issue #2301: Updating travis-scripts for emscripten. 2013-06-19 13:15:29 +08:00
James Chen 504a9e714e issue #2300: copy --> clone for luabinding. 2013-06-19 12:08:26 +08:00
James Chen 2c0cc603d1 Merge branch 'master' into develop 
Conflicts:
	extensions/cocos-ext.h
 2013-06-18 10:46:25 +08:00
James Chen ccb67cbcb4 Template fix for iOS Template. 2013-06-17 15:54:12 +08:00
James Chen c0d44cb2e4 fixed #2129: Rename m_iVar to _var, remove CC prefixes. 2013-06-15 14:03:30 +08:00
James Chen c7c7189d90 Fix emscripten bugs. 2013-06-15 12:07:19 +08:00
James Chen 8c671bd0e9 Adding EMCC_DEBUG=1 to debug 2013-06-15 11:52:46 +08:00
James Chen cec360df38 Reverting run-script.sh 2013-06-15 11:43:43 +08:00
James Chen aeb331d3c4 issue #2284: Don't use multiple process to build emscripten since it'll generate errors. 2013-06-15 11:28:31 +08:00
James Chen 82cd7bb01f Merge branch 'iss2284-merge-master' of https://github.com/minggo/cocos2d-x into minggo-iss2284-merge-master 2013-06-14 15:41:01 +08:00
James Chen 6e8b390094 Updating submodule of bindings-generator(Don't generate jsbinding glue codes for copy constructor.). 2013-06-14 14:15:04 +08:00
minggo cd5bcb87af issue #2284: merge master and fixed some conflicts 2013-06-13 17:54:05 +08:00
James Chen 0d7b7819c2 [travis-ci] Speed up android build. 2013-06-11 11:31:24 +08:00
James Chen 15f5538835 Adding travis-ci build for emscripten port. 2013-06-10 21:57:26 +08:00
James Chen 5d5a5be71c Don't generate js binding glue code for CCMenuItem.*::initWithCallback. 2013-06-06 16:21:27 +08:00
James Chen cda02af1e7 Using CC_DEPRECATED_ATTRIBUTE to mark functions as deprecated. Don't bind CCMenuItem::setCallback automatically. 2013-06-05 17:35:19 +08:00
James Chen e4a8cad3c2 Updating cocos2dx_extension.ini 2013-06-05 14:56:06 +08:00
James Chen 418354df76 Update cocos2dx_extension.ini 2013-06-05 14:53:53 +08:00
minggo d71e07db4e fixed conflict 2013-06-05 13:48:31 +08:00
minggo 6491ff75cf issue #2257: make ios template work 2013-06-05 11:21:04 +08:00
James Chen 13308b492e Update generate-jsbindings.sh [ci skip], push to an unique branch. 2013-06-04 14:17:28 +08:00
James Chen 43791a5e2a Update generate-jsbindings.sh [ci skip], push to an unique branch. 2013-06-04 15:15:50 +09:00
James Chen 64dec0df56 fixed #2247: Using functions instead of macros to speeding up building for JSB project. 2013-06-04 13:01:50 +08:00
James Chen 0587631926 Merge pull request #2725 from dumganhar/iss2247-refactor-jsb-proxy-develop 
fixed #2247: Using functions instead of macros to speeding up building for JSB project.
 2013-06-03 19:49:31 -07:00
James Chen de6a531115 Update cocos2dx.ini, don't genergate bindings for CCCallFunc::initWithFunction 2013-06-04 10:13:27 +08:00
Ricardo Quesada fb566426b9 enable C++11 in tojs 2013-06-03 13:09:49 -07:00
James Chen bba2d2bbdc fixed #2247: Using functions instead of macros to speeding up building for JSB project. 2013-06-03 22:31:24 +08:00
James Chen 86af06c909 fixed #2244: cc.Camera.getEyeXYZ, cc.Camera.getCenterXYZ, cc.Camera.getUpXYZ return bad values. 2013-06-03 15:32:07 +08:00
James Chen 7cf2f88c3b fixed #2244: cc.Camera.getEyeXYZ, cc.Camera.getCenterXYZ, cc.Camera.getUpXYZ return bad values. 2013-06-03 15:22:28 +08:00
James Chen c7fd3a3483 Adding submodule of cocos2d-console to 'tools' folder. 2013-06-02 10:53:46 +08:00
James Chen 89b397f1d1 Delete tools/jsbcc since it was moved to https://github.com/cocos2d/cocos2d-console. 2013-06-02 10:53:34 +08:00
James Chen 1b455e452e Adding submodule of cocos2d-console to 'tools' folder. 2013-06-02 10:51:19 +08:00
James Chen 8b9e198372 Delete tools/jsbcc since it was moved to https://github.com/cocos2d/cocos2d-console. 2013-06-02 10:46:27 +08:00
Jaroslaw Lewandowski 3f7c506638 Ability to save/retrieve CCData into/from CCUserDefault 2013-05-29 01:06:41 +01:00
James Chen 74a39d9bf3 Merge pull request #2634 from samuele3hu/issue2103_testlua 
modify some skip function name to tools/tojs/cocos2dx_extenson.ini
 2013-05-24 02:26:15 -07:00
James Chen ca050cc084 Update generate-jsbindings.sh [ci skip], send pull request to the branch which is being built. 2013-05-24 16:54:18 +08:00
James Chen 3bb1fe0cc7 Update generate-jsbindings.sh [ci skip], send pull request to the branch which is being built. 2013-05-24 16:53:42 +08:00
samuele3hu 26267aee56 issue #2103 modify some skip function name to tools/tojs/cocos2dx_extension.ini 2013-05-24 16:27:03 +08:00
samuele3hu a1ef0db7b7 issue #2103 add some skip function name to tools/tojs/cocos2dx_extension.ini 2013-05-24 15:40:02 +08:00
samuele3hu 0a1c12a2d3 issue #2103 add some overlapping file and delete some comment line 2013-05-24 13:45:06 +08:00
samuele3hu 01399f9d5e issue #2103 add more test lua 2013-05-24 11:46:07 +08:00
samuele3hu 338c7c8d67 issue #2103 add more test lua 2013-05-24 11:42:27 +08:00
samuele3 93dd778e08 issue #2103 add a newline to CCInterger.pkg 2013-05-23 15:49:06 +08:00
samuele3 24a34e50bf Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into MenuTest 2013-05-23 15:40:48 +08:00
samuele3 5da5407efe issue #2103 add menu test lua sample 2013-05-23 15:39:41 +08:00
James Chen 12ee71545b Update run-script.sh, adding travis-ci build of TestCpp,AssetsMangerTest and Testlua for android. 2013-05-23 09:48:11 +08:00
James Chen ff616a1d29 Updating cocos2dx.ini. CCTMXLayer::positionAt --> getPositionAt 2013-05-21 18:20:49 +08:00
James Chen 21f435fdd6 [Travis] Adding Real email info for git. [ci skip] 2013-05-21 18:03:17 +08:00
James Chen 13f50b2072 [Travis CI] Using linux by default. [ci skip] 2013-05-21 17:29:23 +08:00
James Chen 0891e0bde9 Updating generate-jsbindings.sh, android is built on linux host. 2013-05-21 16:48:49 +08:00
James Chen aa49b7555d Android is built on Ubuntu host. 2013-05-21 16:39:26 +08:00
James Chen 8d2dcfe4be Android build uses linux as host. And a fix in generate-jsbindings.sh. 2013-05-21 16:25:54 +08:00
James Chen 6ac72da487 Updating file mode. +x 2013-05-21 16:17:58 +08:00
James Chen 19ede723f2 Adding iOS travis support, not finished. 2013-05-21 16:13:47 +08:00
James Chen 1128f9dfc6 Merge pull request #2564 from folecr/jsdb 
fixed #2187: JavaScript debugger improved and bugfixed.
 2013-05-21 00:31:51 -07:00
James Chen 361004d4d3 Update cocos2dx.ini, don't generate binding for CCSet::acceptVisitor. 2013-05-21 14:52:54 +08:00
James Chen f3b4182b9e Update generate-jsbindings.sh 2013-05-21 14:23:34 +08:00
James Chen 71512ae491 Update generate-jsbindings.sh 2013-05-21 13:45:56 +08:00
folecr b727f36995 Update to latest bindings-generator with updated documentation for using the debugger. 2013-05-20 15:24:55 -07:00
James Chen e57fdf87f0 Update generate-jsbindings.sh [ci skip] 2013-05-20 23:27:40 +08:00
James Chen 78000c70fc [iOS] Template fix. 2013-05-19 18:12:14 +08:00
carlo morgantini 315999edad new "manual" conversion for ccFontDefinition in JS and also updated LabelTest.js using this new way of passing parameters to CCLabelTTF through ccFontDefinition 2013-05-15 16:37:08 -07:00
carlo morgantini ef1a123b42 no more bingins for ccTextDefinition 2013-05-15 16:37:08 -07:00
carlo morgantini 934c8f5115 bindings for CCTextDefinition 2013-05-15 16:35:24 -07:00