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

1119 Commits

Author SHA1 Message Date
qiaofeng00oo f2e9ae97e2 modify autotest.py in tools/jenkins-scripts 2014-03-03 17:47:55 +08:00
James Chen 7e9a120e25 Fix travis build fails. 2014-02-27 16:23:38 +08:00
minggo 8eea655ae3 remove unneeded tools 2014-02-27 15:29:12 +08:00
CocosRobot 4ff894e9e0 [AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json 2014-02-27 02:29:12 +00:00
James Chen e49b7572e3 issue #4116: Updates jenkins scripts. 2014-02-26 21:47:23 +08:00
James Chen e4837e7f94 issue #4116: Removes script-bindings codes. 2014-02-26 21:34:06 +08:00
James Chen c2acfea633 issue #4116: Delete non-scripting files. 2014-02-26 21:17:17 +08:00
andyque f92301a872 fix jsb munaul bindings error 2014-02-25 10:18:45 +08:00
andyque 6b6f71b043 change script bindings code 2014-02-25 10:18:45 +08:00
CocosRobot 5c0f0ebef6 [AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json 2014-02-24 07:30:47 +00:00
CocosRobot 6ab2547028 [AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json 2014-02-21 04:08:27 +00:00
CocosRobot b88ade5534 [AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json 2014-02-20 12:33:34 +00:00
CocosRobot d70f9f2e7e [AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json 2014-02-20 10:21:26 +00:00
James Chen 50bdbe09b9 Merge pull request #5409 from lmskater/fix_trigger_url 
[Jenkins] fix pending url
 2014-02-20 17:29:45 +08:00
samuele3hu e2596bce8b Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger 
Conflicts:
	tools/tojs/cocos2dx.ini
	tools/tolua/cocos2dx.ini
 2014-02-20 17:20:51 +08:00
lm 98566d193f [Jenkins] fix pending url 2014-02-20 17:08:53 +08:00
CocosRobot 3e86d74a02 [AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json 2014-02-20 08:50:05 +00:00
minggo dd65379066 Merge pull request #5406 from minggo/develop 
update cocos2d-console to latest code
 2014-02-20 16:46:30 +08:00
minggo db8ff41dbb update cocos2d-console to latest code 2014-02-20 15:50:57 +08:00
CocosRobot 2c9a9c0df7 [AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json 2014-02-20 07:34:52 +00:00
samuele3hu 75e1ccf84c close #4094:Modify EGLViewProtocol —> GLViewProtocol and EGLView—> GLView in the cocos2d.ini for js binding-generator 2014-02-20 15:24:06 +08:00
samuele3hu 514112921f close #4094:Add deprected support for EGLView and EGLViewProtocol on the lua binding 2014-02-20 15:10:34 +08:00
James Chen 8fcf172235 issue #4058: Reverts cocos2dx.ini. 2014-02-20 11:13:05 +08:00
James Chen 5164f2bb19 issue #4058: Removes cpp_namespace section in cocos2dx.ini. 2014-02-20 11:09:40 +08:00
James Chen 0ea27d8543 issue #4058: CCObject.cpp -> CCRef.cpp for all platform projects. 2014-02-20 10:56:25 +08:00
James Chen 5e6130c92c issue #4058: Get rid of Object ,rename it to Ref. 2014-02-20 10:53:49 +08:00
samuele3hu ce1656fa8d fix: The lua binding of getPropertiesForGID would lead to compile error 2014-02-19 15:47:45 +08:00
James Chen e1a256d6f1 Merge pull request #5319 from samuele3hu/developDynamic 
issue #3956:Add the conversional functions which are used in the templates of lua binding-generator
 2014-02-19 13:52:08 +08:00
CocosRobot d35f7626a6 [AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json 2014-02-18 08:00:39 +00:00
andyque 143f5975a6 fix cross-platform comiple error 
details:
remove CCActionEaseEx dependency
fix compile errors on android platform
fix a few inproper decalare
fix linux compile error
fix win32 compile error
 2014-02-18 14:22:15 +08:00
James Chen c7b1ab4525 Merge pull request #5362 from ucchen/develop 
closed #4037: fix copy-paste error, all spxxx_to_jsval use lower case;
 2014-02-14 14:17:33 +08:00
ucchen 185ed86214 fix copy-paste error, all spxxx_to_jsval use lower case and add missing data structs getAttachment; 2014-02-14 13:24:56 +08:00
CocosRobot e5ff9e1290 [AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json 2014-02-14 03:19:46 +00:00
James Chen acefa4e237 Merge commit 'refs/pull/5343/head' of git://github.com/cocos2d/cocos2d-x into merge5343 2014-02-14 09:33:42 +08:00
CocosRobot 15dbef99d3 [AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json 2014-02-14 01:26:06 +00:00
James Chen 24c15b6b21 Updates project-creator/config-create/create_config.py. 
Don't print paths to terminal, it is only useful when debugging.
 2014-02-14 09:13:52 +08:00
James Chen c8ec90781c Merge pull request #5351 from heliclei/xcode-scheme 
share xcode build schemes to support xcodebuild command line build
 2014-02-14 09:09:07 +08:00
heliclei 37b372d21e fix build scheme name 2014-02-13 22:42:59 +08:00
James Chen 1cd5ad3626 Updates COMMITTAG 
Skips to build the Pull Request of updating cocos_files.json.
 2014-02-13 13:58:55 +08:00
CocosRobot 14adb36002 [AUTO] : updating tools/project-creator/module/cocos_files.json 2014-02-13 05:48:38 +00:00
James Chen 3ac6f01742 issue #4020: Sorts the elements in cocos_files. 2014-02-13 13:45:50 +08:00
CocosRobot 8b0ed16205 [AUTO] : updating tools/project-creator/module/cocos_files.json 2014-02-13 03:56:58 +00:00
James Chen b5710e04ba issue #4020: Adds execute permission for generate-cocosfile.sh. 2014-02-13 11:52:16 +08:00
James Chen 2fef642300 issue #4020: Typo fix, elif -> if. 2014-02-13 11:42:23 +08:00
James Chen 772cdf5739 issue #4020: Updates before-install.sh. and comment fix in generate-cocosfiles.sh. 2014-02-13 11:38:28 +08:00
James Chen a56b7e4f3f closed #4020: cocos_files.json should be auto-generated by CocosRobot. 2014-02-13 11:33:11 +08:00
ucchen 2c961bdfbf add spine manual binding; 2014-02-13 11:01:54 +08:00
Éloi Rivard 8adca38efa Linux javascript bindings support. 
- Adds Linux javascript test.
- Adds Linux javascript template.
- Adds Travis CI test.
 2014-02-13 01:42:14 +01:00
Éloi Rivard 79e3c05ef1 Minor debugging messages and guards. 
Dependencies installation is skipped on linux distributions that does not use .deb package format.
 2014-02-13 01:25:23 +01:00
Éloi Rivard fa2481bb24 Linux Spidermonkey 27 support. 2014-02-13 01:25:18 +01:00