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

15919 Commits

Author SHA1 Message Date
James Chen 25b15d94d4 [Android] Don’t define CC_ENABLE_CHIPMUNK_INTEGRATION in extension project. Define it in `Application.mk` instead. 2014-01-26 17:55:38 +08:00
James Chen 6a302735d8 Removes unused files. 2014-01-26 17:54:13 +08:00
James Chen e89bde4fbe Updates JS test. 2014-01-26 17:53:42 +08:00
James Chen 384f8b9f70 Merge pull request #5239 from CocosRobot/updategeneratedsubmodule_1390727564 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-26 01:18:14 -08:00
CocosRobot 8fa44baa2e [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-26 09:12:47 +00:00
James Chen c0b0383438 Merge pull request #5238 from dumganhar/merge5071 
Merge PR #5071
 2014-01-26 01:07:11 -08:00
James Chen 351ac4a5d7 [LUA] Adds missing cc prefix for lua classes. 2014-01-26 17:05:35 +08:00
James Chen a4a010465c Merge commit 'refs/pull/5071/head' of git://github.com/cocos2d/cocos2d-x into merge5071 2014-01-26 16:41:35 +08:00
James Chen ccf31de3c4 Merge pull request #5236 from CocosRobot/updategeneratedsubmodule_1390725001 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-26 00:31:13 -08:00
minggo b72dfa5461 Merge pull request #5234 from andyque/develop 
issue #3859. improve the prompt of android-build scripts
 2014-01-26 00:30:21 -08:00
CocosRobot 4862bbbd86 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-26 08:30:04 +00:00
andyque 96af336780 issue #3859. update description of android-build.py 2014-01-26 16:22:09 +08:00
James Chen 4b1f61e020 Merge pull request #5235 from dumganhar/develop 
Updates bindings-generator.
 2014-01-26 00:21:40 -08:00
James Chen 25c7c68cd2 Updates bindings-generator. 2014-01-26 16:20:10 +08:00
andyque 7f3a0216c2 issue #3859. improve the prompt of android-build scripts 2014-01-26 16:10:51 +08:00
James Chen 603df24d0e Merge pull request #5231 from samuele3hu/developBug 
issue #3837:Add the debug support for mac and lua template
 2014-01-25 23:40:10 -08:00
samuele3hu cf684bc3f4 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBug 2014-01-26 15:16:02 +08:00
samuele3hu 6a927c3f18 issue #3837:Add debug support for lua template 2014-01-26 15:14:12 +08:00
James Chen 3cf49c2d22 Merge pull request #5230 from CocosRobot/updategeneratedsubmodule_1390719368 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-25 22:56:37 -08:00
CocosRobot 8260a2a5c1 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-26 06:56:11 +00:00
James Chen 2934a09a2e Update CHANGELOG [ci skip] 2014-01-26 14:47:34 +08:00
James Chen d2893c1e1e Merge pull request #5229 from dumganhar/iss3858-jsclass-log-fix 
closed #3858: Pure JS class which is inherited from cc.Class will trigger an irrelevant log.
 2014-01-25 22:46:56 -08:00
James Chen 6ecc8d37c5 Fix a typo, this._is_nativeObj -> this.__nativeObj. 2014-01-26 14:45:45 +08:00
James Chen 243a995dc1 Update CHANGELOG [ci skip] 2014-01-26 14:43:29 +08:00
James Chen 952cd1d836 ComController needs to be `extend`ed. Updates cocos2dx_studio.ini. 2014-01-26 14:42:17 +08:00
James Chen 26125f4e26 closed #3858: Pure JS class which is inherited from cc.Class will trigger an irrelevant log. 
Please refer to http://www.cocos2d-x.org/issues/3858.
 2014-01-26 14:41:27 +08:00
James Chen 79f4accee8 Merge pull request #5228 from dumganhar/iss3857-sp-release 
closed #3857: Mac and iOS Simulator should also use SpiderMonkey which was built in RELEASE mode.
 2014-01-25 22:20:39 -08:00
James Chen 2ff4a44324 closed #3857: Mac and iOS Simulator should also use SpiderMonkey which was built in RELEASE mode. 
For more details why I did this, please refer to http://www.cocos2d-x.org/issues/3857.
 2014-01-26 14:19:42 +08:00
James Chen cb7e2b5ece Update CHANGELOG [ci skip] 2014-01-26 13:58:37 +08:00
James Chen 6f45d9ca27 Merge pull request #5227 from dumganhar/iss3856-remote-debug-crash-mac 
closed #3856: Crash when Firefox connects to JSB application.
 2014-01-25 21:55:34 -08:00
James Chen 04f2cc48a2 closed #3856: Crash when Firefox connects to JSB application. 2014-01-26 13:54:48 +08:00
minggo b7d5d430a4 Merge pull request #5225 from dumganhar/iss3853-jsb-crash-debug-mode 
closed #3853: Some JSB projects(TestJavascript, WatermelonWithMe) crash in DEBUG mode on iOS platform.
 2014-01-25 20:37:31 -08:00
boyu0 682a6819cb issue #3401: change getContactData function return value back to pointer. 2014-01-26 12:02:42 +08:00
samuele3hu 48498f726e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBug 
Conflicts:
	cocos/scripting/lua/bindings/CCLuaStack.cpp
 2014-01-26 11:59:54 +08:00
samuele3hu 9b514927f5 issue #3837:Make `HelloLua` support to debug by the ZeroBrane Studio 2014-01-26 11:55:02 +08:00
James Chen 500a87c9f8 Merge pull request #5226 from Dhilan007/develop_vs 
update template for add socket files[lua]
 2014-01-25 19:47:49 -08:00
Dhilan007 ace3ecb48a update template for add socket files[lua] 2014-01-26 11:28:57 +08:00
James Chen 5b9f1697d3 closed #3853: Some JSB projects(TestJavascript, WatermelonWithMe) crash in DEBUG mode on iOS platform. Don’t define `DEBUG` macro in our projects since all third party libraries(e.g. Spidermonkey) were built in RELEASE mode. 2014-01-26 11:16:25 +08:00
James Chen bad08f4999 Merge pull request #5224 from Dhilan007/develop_crash 
updated vs project[Lua]:
 2014-01-25 18:42:46 -08:00
Dhilan007 c7e9cee835 updated vs project[Lua]: 
1.add files of socket
2.fixed miss include path
3.fixed miss lib for release
 2014-01-26 10:25:49 +08:00
samuele3hu e6b1df3388 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBug 2014-01-26 09:46:41 +08:00
samuele3hu 7a8ecb108c issue #3837:Add the debug support for Mac 2014-01-26 09:42:07 +08:00
James Chen 98215dd4e4 Merge pull request #5221 from Dhilan007/develop_vs 
fix link error on vs.
 2014-01-25 03:43:53 -08:00
Dhilan007 b6cd40521e fix link error on vs. 2014-01-25 19:41:20 +08:00
James Chen 7069a5afa9 Merge pull request #5218 from Dhilan007/develop_crash 
fix get_num_of_cpu on win32.
 2014-01-24 21:26:32 -08:00
James Chen f95a862718 Merge pull request #5220 from dumganhar/develop 
Fixes two mistakes 1) Color4B(const Color3B& color), 2) A comment typo in CCObject.h
 2014-01-24 06:36:44 -08:00
James Chen 8efa186649 Fixes a comment typo in CCObject.h. 2014-01-24 22:34:14 +08:00
James Chen 04d91f7e1d Fix a mistake in Color4B(const Color3B& color). 2014-01-24 22:33:43 +08:00
James Chen 7a8f24a313 Merge pull request #5219 from dabingnn/develop_hotFix 
3.0 Beta2 HotFix: fix shader PositionTextureColorAlphaTest
 2014-01-24 06:20:53 -08:00
Huabing.Xu 52ca254ecf 3.0 Beta2 HotFix: fix shader PositionTextureColorAlphaTest 2014-01-24 18:39:26 +08:00