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

29824 Commits

Author SHA1 Message Date
子龙山人 face507bf8 Merge pull request #12032 from CocosRobot/update_lua_bindings_1432635645 
[AUTO]: updating luabinding & jsbinding automatically
 2015-05-27 11:18:13 +08:00
子龙山人 b8fdb152fd Merge pull request #12026 from andyque/fix-android-9-patch-asset-issue 
fix assert failure of NinePatchImageParser and rapidjson
 2015-05-27 11:17:31 +08:00
子龙山人 2cfeed2c49 Merge pull request #12031 from yangws/v3_bugfixTerrain 
Fix bug: terrain can't move to other position except origin point in world coord.
 2015-05-27 10:48:02 +08:00
jianglong0156 406532fdf7 Merge branch 'modifyTestResource' of https://github.com/jianglong0156/cocos2d-x into modifyTestResource 2015-05-27 10:19:32 +08:00
jianglong0156 4bde9e635e add copy recourse path in mac from js-test rests 2015-05-27 10:19:01 +08:00
子龙山人 2975cb9874 Merge pull request #12039 from andyque/update-change-log 
[ci skip]update change log
 2015-05-27 10:15:22 +08:00
andyque 16f0718e9c update change log 2015-05-27 10:14:36 +08:00
jianglong0156 c3aae69fc0 modify proj.android-studio copy resource path 2015-05-27 10:08:03 +08:00
jianglong0156 9cd2b16ad0 modify js resource name 2015-05-27 09:52:44 +08:00
Ricardo Quesada a2129641f5 Merge pull request #12038 from CocosRobot/update_lua_bindings_1432676996 
[AUTO]: updating luabinding & jsbinding automatically
 2015-05-26 14:59:49 -07:00
CocosRobot 824456b073 [AUTO]: updating luabinding & jsbinding automatically 2015-05-26 21:56:01 +00:00
Ricardo Quesada 536ad6fa26 Merge pull request #12037 from MSOpenTech/v3-winrt-rapidjson 
V3 winrt rapidjson fix for ARM builds
 2015-05-26 14:37:47 -07:00
Dale Stammen 06a5f7ed7a moved CCNinePath files to base folder in solution 2015-05-26 09:48:25 -07:00
Dale Stammen d146f26144 define RAPIDJSON_ENDIAN=RAPIDJSON_LITTLEENDIAN to fix broken ARM builds 2015-05-26 09:46:15 -07:00
Namezero 9808f6aa91 Update UITextField.h 2015-05-26 12:55:57 +02:00
子龙山人 b7f244f193 Merge pull request #12033 from andyque/add-jsb-to-daily-build 
[ci skip]add jsb to daily build script
 2015-05-26 18:29:57 +08:00
CocosRobot 0079b8a788 [AUTO]: updating luabinding & jsbinding automatically 2015-05-26 10:26:45 +00:00
andyque 20ba131612 add jsb to daily build script 2015-05-26 18:25:49 +08:00
子龙山人 8459dca259 Merge pull request #12025 from yangws/v3 
Fix bug: skybox can't move to other position except origin point in w…
 2015-05-26 18:16:54 +08:00
Vincent Yang d7ad7221e4 ciskip add doc for camera::getnear/farplane(). 2015-05-26 18:14:37 +08:00
Vincent Yang 8105e9c714 Fix bug: terrain can't move to other position except origin point. 2015-05-26 17:51:26 +08:00
jianglong0156 7820610f13 Merge branch 'modifyTestResource' into jsWebviewTest 
Conflicts:
	cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj
	tests/js-tests/project.json
	tests/js-tests/src/GUITest/UIWebViewTest/UIWebViewTest.js
	tools/tojs/genbindings.py
 2015-05-26 17:49:17 +08:00
andyque 8d78fd31b7 add assert to make program more robust 2015-05-26 17:25:42 +08:00
jianglong0156 4d6b763eb6 rename shader file name 2015-05-26 17:21:35 +08:00
jianglong0156 5b7cf14384 rename shader file name 2015-05-26 17:20:48 +08:00
samuele3hu ea75e222ba issue #10302: Remove duplicated test cases 2015-05-26 17:20:46 +08:00
andyque c668001e73 fix assert failure of NinePatchImageParser and rapidjson 2015-05-26 17:20:10 +08:00
Vincent Yang 246913c092 Fix bug: skybox can't move to other position except origin point in world space. 2015-05-26 17:14:26 +08:00
jianglong0156 fb4d638231 copy resources in linux 2015-05-26 16:34:04 +08:00
jianglong0156 60e3b5390d copy resources in android 2015-05-26 16:33:47 +08:00
jianglong0156 6f67ec1e6c Merge branch '2d-xv3' into modifyTestResource 2015-05-26 16:23:25 +08:00
Namezero 8bc7d08d3f added alignment getters 2015-05-26 09:34:13 +02:00
Namezero 2be136dc8e alignment getters added 2015-05-26 09:33:11 +02:00
jianglong0156 e117d62b13 add js-test resource copy command 2015-05-26 14:47:49 +08:00
jianglong0156 fe677f32dd delete js resource 2015-05-26 14:28:53 +08:00
子龙山人 8c259fddf0 Merge pull request #12004 from andyque/add-jsb-to-jenkins-v3 
Add JSB to CI
 2015-05-26 14:27:53 +08:00
jianglong0156 ae4c8d9798 fix opengl resource error 2015-05-26 14:26:45 +08:00
jianglong0156 95e8212727 add js cocosbuilder resource 2015-05-26 14:08:51 +08:00
andyque 2b1dd89147 add js-tests scheme 2015-05-26 13:48:56 +08:00
Huabing.Xu 83bae15caf Merge branch 'v3FrameBufferObject' of github.com:dabingnn/cocos2d-x into v3FrameBufferObject 
# Conflicts:
#	cocos/2d/libcocos2d.vcxproj.filters
#	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
 2015-05-26 12:06:05 +08:00
minggo 3c7dfe8215 Merge pull request #12018 from CocosRobot/update_cocosfiles_1432604241 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-05-26 09:39:03 +08:00
CocosRobot e6a7d6f150 [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-26 01:37:23 +00:00
minggo 3add3477dd Merge pull request #12013 from natural-law/v3 
Support build & run Android Studio project in console.
 2015-05-26 09:34:42 +08:00
minggo d650140ca3 Merge pull request #12014 from hugohuang1111/add-js-runtime-template-file 
add js runtime ignore template
 2015-05-26 09:34:22 +08:00
minggo 104f11fe4c Merge pull request #12010 from CocosRobot/update_lua_bindings_1432542799 
[AUTO]: updating luabinding & jsbinding automatically
 2015-05-26 09:33:37 +08:00
Namezero 4c380bfaf0 Update UITextField.cpp 2015-05-25 21:06:27 +02:00
Namezero dfb479d480 Update UITextField.h 2015-05-25 21:05:49 +02:00
hugo f2a5418d41 add js runtime ignore template 2015-05-25 22:52:36 +08:00
hugo a65d7ea49a update 3rd part config 2015-05-25 22:48:19 +08:00
andyque a651deb93c remove dos2unix tools in js genbindings 2015-05-25 18:11:19 +08:00