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

382 Commits

Author SHA1 Message Date
James Chen db943ddb90 Deleting all files in 'scripting/javascript/bindings/generated' except '.git' and 'README'. 2013-03-10 16:10:16 +08:00
James Chen fc5f7547a3 fixed #1808: Adding config section 'script_control_cpp' and set it to 'no'. 2013-03-10 14:00:30 +08:00
James Chen 1a42e85219 fixed #1808: Updated the submodule of cxx-generator and fixed some compilation errors after that. 2013-03-10 13:55:29 +08:00
Sam Clegg c0b150c859 Cleanup the tolua++ bindings build system. 
Update basic.lua to do all the required patching of
the output file without helper scripts such as
build.xml or build.php.

Update README file with current instructions.

Re-generate output file using new build system.

Add build.sh and build.bat for building on POSIX and
win32 respectively.
 2013-03-08 11:09:10 -08:00
minggo dd8681b18b Merge pull request #2113 from minggo/refactor-ccuserdefault 
Refactor ccuserdefault
 2013-03-06 23:05:50 -08:00
wangshuai d5cdba484e Merge branch 'master' into feature_1802 
Conflicts:
	scripting/lua/cocos2dx_support/LuaCocos2d.cpp
 2013-03-07 14:32:31 +08:00
wangshuai 6914c9d902 feature #1802:add touches lua test 2013-03-07 11:55:57 +08:00
minggo 3cb4ab8f31 issue #1529:update xcode template 2013-03-07 10:41:45 +08:00
wangshuai 3aaa18f7f4 Merge branch 'master' into iss1425-lua 
Conflicts:
	scripting/lua/cocos2dx_support/LuaCocos2d.cpp
 2013-03-06 20:39:01 +08:00
wangshuai bdbdbc27f5 issue #1425:exist lua test case is ok! 
1.add some lua test case
2.add ccset.pkg
3.fixed ParticleSystem error in lua test case
 2013-03-05 14:46:18 +08:00
Sam Clegg dcb591eadb Add missing ccGLServerState to CCNode.pkg. 
Without this missing enum the resuling cpp file would generate
an unused function warning.

Also, remove the duplication between build_macosx.xml and build.xml.
They only differed in single property.  Instead use build.sh, which
should work on all UNIXs, no just maxosx.
 2013-03-02 11:28:04 -08:00
minggo f7802a0794 Merge pull request #2072 from yuezang/iss1425-luatest 
issue #1425: exist lua test case is ok.
 2013-03-01 01:17:15 -08:00
wangshuai 8867766241 issue #1425: exist lua test case is ok. 
1.fixed some bugs in some lua test case;
2.modify touch event and node event type;
3.fixed some bugs in CCParticleSystem.pkg
 2013-03-01 17:09:42 +08:00
James Chen e4b5ee97b0 Updated cocos2dx.ini. 2013-03-01 10:58:16 +08:00
James Chen 501a2612cb tab ~> 4 spaces . 2013-03-01 10:45:07 +08:00
James Chen 7093807f3f CCNodeRGA isn't a pure abstract class anymore. Updated tools/tojs/cocos2d.ini. 2013-03-01 10:41:06 +08:00
wangshuai b4e13af460 issue #1425: 
1.fixed some bugs in .lua file. like this:local b = a:copy():autorelease() 
2.fixed bug of CCShakyTiles3D's create() in CCActionTilesGrid.pkg
3.delete method copyWithZone in .pkg files
 2013-02-28 10:23:30 +08:00
James Chen 8f58f082f3 Updated the submodule reference of cxx-generator. 2013-02-27 15:17:19 +08:00
minggo 32c9e0379a fixed #1731:change struct to class 2013-02-25 10:22:03 +08:00
James Chen 634a98d19a Merge pull request #2030 from giginet/cocos2dx-pull-request 
fixed #1745: Fix CCRepeat#create is recieved bad argument on Lua binding.
 2013-02-22 18:33:14 -08:00
giginet 750918d058 Fix CCRepeat#create argument 2013-02-23 09:03:28 +09:00
walzer 79be62a932 issue #1733, fix a typo in dumping usage. 2013-02-22 22:24:05 +08:00
walzer b534ff16e7 issue #1733, don't remove projects if it exists. 2013-02-22 16:33:24 +08:00
walzer 3dcee98cb8 issue #1733, use json config files instead of python modules for multi-platforms. 2013-02-22 16:32:12 +08:00
walzer 3eab5d509b issue #1733, project-creator for lua works. 2013-02-21 17:11:11 +08:00
walzer d736f38fac issue #1733, project-creator for cpp project seems ok 2013-02-21 16:51:22 +08:00
James Chen c70412d890 Merge pull request #2015 from dumganhar/iss1730-bind-scrollview 
fixed #1730: Exposed CCScrollView and CCTableView to js.
 2013-02-20 18:23:13 -08:00
James Chen cf33a4538d fixed #1730: Binds CCScrollView and CCTableView to js. 2013-02-21 10:06:22 +08:00
walzer e81c841ad6 issue #1733, improve the help description of create_project.py 2013-02-20 23:42:48 +08:00
walzer ef697781a7 issue #1733, unify package name to org.cocos2dx.hello* lower case on both android & ios. 2013-02-20 23:15:48 +08:00
walzer 4f81e704ae Merge branch 'refs/heads/master' into project-creator 2013-02-20 13:41:53 +08:00
walzer 8915b4787d fixed #1733, the python script perfectly works, tested on both osx and windows 
This pull request fixed:
- Handling the difference of line ending between osx and windows
- remove os.popen("rm -rf" + …) usage which can not cross desktop platforms, uses shutil.rmtree instead
 2013-02-20 13:26:41 +08:00
James Chen 24767349b4 Merge pull request #2008 from dumganhar/master 
fixed a bug of respond touch events in hello.lua. The event type is string now.
 2013-02-19 20:07:02 -08:00
James Chen ab00de629a Removed the definition of the touch event type . 2013-02-20 12:06:12 +08:00
James Chen 72b830ef49 fixed the failure of auto generating js binding. 2013-02-20 11:07:42 +08:00
James Chen 13ab9c0196 Merge pull request #1999 from walzer/project-creator 
issue #1733: python scripts for generating JSB projects.
 2013-02-18 22:11:37 -08:00
minggo 599f22f1e2 Merge pull request #1997 from minggo/iss1731-lua-declaration 
issue #1731:change CCSize, CCPoint and CCRect to struct in pkg files
 2013-02-18 18:19:00 -08:00
minggo 1b743b37c9 issue #1731:change CCSize, CCPoint and CCRect to struct in pkg files 2013-02-19 10:08:25 +08:00
James Chen ed49029744 Updated the submodule of cxx-generator. 2013-02-19 09:48:16 +08:00
walzer 6ebc9b7410 issue #1725, project-creator, HelloJavascript on win32 works ok 2013-02-19 00:02:42 +08:00
walzer dc7fe1af25 issue #1725, improve the project creator on android 2013-02-18 23:34:31 +08:00
walzer 0a4700e59b issue #1725 project creator script works ok for iOS and Android on Mac OSX env 2013-02-18 22:09:42 +08:00
minggo 0c5bcb3f7b issue #1702:fix a typo error 2013-02-06 18:04:40 +08:00
dualface 5904512ac6 add CCFileUtils Lua support 2013-02-04 12:41:24 +08:00
James Chen 23acb3eacd issue #1687: Updating iOS template after refactoring CCFileUtils. 2013-02-03 13:56:44 +08:00
James Chen 3a9346e6ff issue #1687: Refactoring CCFileUtils, abstracting the same implementations for all platforms. 2013-02-01 11:20:46 +08:00
minggo c071620951 set build option to -O1 for js xcode project when building with debug option 2013-01-29 20:58:34 +08:00
James Chen 31681e005e CCFileUtils::fullPathFromRelativePath -> fullPathForFilename. 2013-01-29 10:40:44 +08:00
James Chen 2694cb150b CCFileUtils::s|gSearchPath -> CCFileUtils::s\gSearchPaths. 2013-01-29 09:56:38 +08:00
James Chen c80d438110 issue #1683: Exporting `fullPathForFilename` to Lua. 2013-01-27 20:26:04 +08:00