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

386 Commits

Author SHA1 Message Date
mogemimi 44080a04d8 Fix typos in comments and strings 2016-03-29 10:52:17 +09:00
Xpol Wan 931d56bc10 Fixes includes in .m and .mm files. 2016-03-21 11:02:00 +08:00
Xpol Wan 90456d29ba Fixes 1605 include path in 541 files 
using the tools/coding-style/include-linter.py with -f options.
 2016-03-20 21:53:44 +08:00
mogemimi 44d2a161dc Remove unnecessary c_str() calls 2016-02-04 11:52:14 +09:00
zilongshanren 366407ca1c fix win32 compile issue 2016-01-27 20:21:32 +08:00
mogemimi 41dd44c75d Fix some typos in docs 2016-01-11 19:23:05 +09:00
Ricardo Quesada 692c0f8a0e adds tvOS support 
Ported tests:
 - js-tests
 - cpp-tsts
 - lua-tests
 - game-controller tests

all of them working, but most of the tests can't be navigated
since they expect a controller.
 2015-12-28 15:59:36 -08:00
Wenhai Lin 66b0a0e9b1 Adds `std::nothrow` to the `new` statements 2015-12-16 17:06:56 +08:00
lunhao.guo ae980c19d2 fix the link error and compile error in windows and android platform 2015-12-09 20:18:37 +08:00
pandamicro 51acfa8908 Merge pull request #14581 from xiaofeng11/v3_xf 
Add missing lua engine export declaration.
 2015-12-04 17:51:38 +08:00
XiaoFeng 8f9ea8a87e Add missing lua engine export declaration. 2015-12-04 15:23:59 +08:00
XiaoFeng 6fb65b5610 Editing code as comment. 
Move CocosStudioExtension path and update related files.
 2015-12-04 10:43:39 +08:00
XiaoFeng a804c67a12 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_combine_2d 
Conflicts:
	cocos/scripting/lua-bindings/manual/LuaBasicConversions.h
 2015-12-02 15:07:58 +08:00
XiaoFeng ec1d76b15e Fix compile error 2015-11-27 13:08:22 +08:00
XiaoFeng 58dd27efd3 add missing return type 2015-11-26 17:33:45 +08:00
XiaoFeng 108d145bf0 Add missing luaval and color3b conversion function export 2015-11-26 15:08:49 +08:00
XiaoFeng 928dc3ab1f Add lua value conversion function for cocos studio 2015-11-25 23:03:25 +08:00
XiaoFeng 145943068f Add missing function export 2015-11-25 22:35:02 +08:00
XiaoFeng 9811d6efcf Combine studio change for LuaBinding, jsb and simulator 2015-11-25 21:52:44 +08:00
yangxiao e8d853934b terrain lua bindings 2015-11-23 14:33:39 +08:00
mogemimi a31cce9a80 Fix minor grammar and typo in documentation 2015-11-04 17:14:00 +09:00
pandamicro 7d93b419fd Merge pull request #14303 from xiaofeng11/v3_fix 
Fix ComponentTest in la-test can not load lua file under iOS & Android
 2015-11-04 13:52:14 +08:00
XiaoFeng 3223a97b26 Fix ComponentTest in la-test can not load lua file under iOS & Android 2015-11-03 15:49:46 +08:00
mogemimi 8f632365c3 Fix typos in documentation 2015-11-03 04:43:44 +09:00
mogemimi 9df30d2454 Fix typos in documentation 2015-10-23 16:59:51 +09:00
mogemimi 59d7868d4c Fix minor typos 2015-10-14 15:12:22 +09:00
pandamicro 7b85211cfe Remove ScriptComponent 
Because windows platform can't successfully compile in previous architecture
 2015-09-27 22:18:59 +08:00
WenhaiLin f4c56e8605 Fixed compile errors 2015-09-26 19:43:36 +08:00
pandamicro 2a3526a3fd Fix lua project 2015-09-26 19:43:36 +08:00
pandamicro ddb636a022 Add ScriptComponent and ComponentJS 2015-09-26 19:43:36 +08:00
pandamicro 7e2b8c71a7 Improve lua script component 2015-09-26 19:43:35 +08:00
WenhaiLin b77d04f593 Fixed link errors 2015-09-19 00:59:28 +08:00
James Chen 0eaf4c6866 [lua] Wrong callback setting for webview:setOnDidFailLoading 2015-09-17 10:52:17 +08:00
pandamicro 89d81bd959 Merge pull request #12281 from lijinlong/v3 
luabinding enumerateChildren bug
 2015-09-14 22:32:56 +08:00
James Chen 6073456f23 [Lua] Life control fix for XMLHttpRequest 2015-09-12 17:49:30 +08:00
minggo 8326ed6535 add physics component 2015-09-08 09:54:01 +08:00
andyque 15156a015a add RadioButton and RadioButtonGroup event type 2015-08-20 22:49:42 +08:00
fusijie a799c99b1a fix setVertexAttribPointer luabinding 2015-08-18 11:46:45 +08:00
jianglong0156 9a257d8136 fix lua pai error 2015-08-05 16:15:22 +08:00
jianglong0156 fac7a78fc8 improve getUTFCharsFromJavaEnv api to getStringUTFCharsJNI and add newStringUTFJNI 
getUTFCharsFromJavaEnv:
getUTFCharsFromJavaEnv:change jstring to utf8 std string
newStringUTFJNI:change utf8 std string to jstring
 2015-08-05 16:10:14 +08:00
jianglong0156 00b7e98c89 improve the getUTFCharsFromJavaEnv logic and fix the httpclient response message memery leak. 2015-08-04 16:24:08 +08:00
jianglong0156 979700e343 there is a bug for getStringUTFChars function. it can't translate the emotion utf8 code. so change the getStringUTFChars to getStringChars. and translate unicode to utf8 in c++ program 2015-08-04 11:30:30 +08:00
pandamicro 3c2e66e425 Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3 
# Conflicts:
#	.travis.yml
#	build/cocos2d_js_tests.xcodeproj/project.pbxproj
#	build/cocos2d_tests.xcodeproj/project.pbxproj
#	cocos/2d/CCFont.h
#	cocos/2d/CCFontAtlas.cpp
#	cocos/2d/CCFontAtlas.h
#	cocos/2d/CCFontFreeType.cpp
#	cocos/2d/CCFontFreeType.h
#	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj
#	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj
#	cocos/2d/libcocos2d_win10/libcocos2d.vcxproj
#	cocos/cocos2d.cpp
#	cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
#	cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp
#	templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
#	templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
#	templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
#	templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
#	tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp
#	tests/cpp-tests/Classes/LabelTest/LabelTestNew.h
#	tools/bindings-generator
#	tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj
#	tools/travis-scripts/generate-bindings.sh
#	tools/travis-scripts/generate-cocosfiles.sh
#	tools/travis-scripts/travis_mac.yml
 2015-08-02 22:28:27 +08:00
dualface bd39247192 Add Luabinding conversions for std::map<std::string, std::string> 2015-07-26 07:40:34 +08:00
Vincent Yang 0a6933cc8c Fixed #12668 : Lua-bindings-manual-network--LuaMinXmlHttpRequest have a memory leak. 2015-07-14 10:46:17 +08:00
Jacky 3c5ab4f518 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon2 
# Conflicts:
#	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
 2015-06-17 13:04:24 +08:00
samuele3hu 1b20e463d8 Update the Lua binding about the Polygon and update the test case. 2015-06-11 14:38:38 +08:00
lijinlong 370845a738 luabinding enumerateChildren bug 
第一次调用enumerateChildren的回调时将lua handler释放了，下次再进入回调时报错，将handler释放提到enumerateChildren调用完成后
 2015-06-10 17:15:01 +08:00
samuele3hu 0cccd6e765 Fix compile error on the Linux and update the test cases 2015-06-03 18:12:21 +08:00
samuele3hu a20681aa21 Add Lua-bindings for NavMesh 2015-06-02 18:37:57 +08:00