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

29664 Commits

Author SHA1 Message Date
子龙山人 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
子龙山人 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
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
子龙山人 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
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
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
子龙山人 8c259fddf0 Merge pull request #12004 from andyque/add-jsb-to-jenkins-v3 
Add JSB to CI
 2015-05-26 14:27:53 +08:00
andyque 2b1dd89147 add js-tests scheme 2015-05-26 13:48:56 +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
hugo f2a5418d41 add js runtime ignore template 2015-05-25 22:52:36 +08:00
andyque a651deb93c remove dos2unix tools in js genbindings 2015-05-25 18:11:19 +08:00
Bin Zhang c491b6a5c1 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-05-25 17:01:29 +08:00
Bin Zhang 3298145eb5 Support build & run Android Studio project in console. 2015-05-25 16:53:36 +08:00
minggo 35533abec0 [ci skip]update CHANGELOG 2015-05-25 16:51:46 +08:00
minggo 41f84c9f11 [ci skip]update CHANGELOG 2015-05-25 16:50:25 +08:00
minggo bcc1bf8d32 Merge pull request #11983 from dabingnn/v3_SpriteWithTrianglesCommand 
use trianglescommand for sprite
 2015-05-25 16:48:22 +08:00
CocosRobot 7fa68d9b3a [AUTO]: updating luabinding & jsbinding automatically 2015-05-25 08:37:59 +00:00
andyque c7d698362f add JSB to jenkins 2015-05-25 16:37:08 +08:00
minggo 6f9ab33995 Merge pull request #12009 from CocosRobot/update_cocosfiles_1432542713 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-05-25 16:34:00 +08:00
minggo 999de9072a Merge pull request #12003 from minggo/remove-unneeded-function 
remove uneeded function
 2015-05-25 16:33:38 +08:00
minggo 42fba34d62 [ci skip]update CHANGELOG 2015-05-25 16:32:52 +08:00
CocosRobot eea661a5c2 [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-25 08:31:54 +00:00
minggo 273ac5d00a Merge pull request #12002 from WenhaiLin/v3-texturecache-unbindfix 
Fixed TextureCache::unbindImageAsync fails to unbind all asynchronous callback for a specified bound image.
 2015-05-25 16:29:43 +08:00
andyque a6a5318e13 add js win32 test 2015-05-25 16:22:43 +08:00
minggo dae2ca14d3 Merge pull request #12005 from CocosRobot/update_cocosfiles_1432538172 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-05-25 15:20:46 +08:00
minggo ca3c42362b [ci skip]update CHANGELOG 2015-05-25 15:20:13 +08:00
minggo 203203a92d Merge pull request #12001 from andyque/upgrade-rapidjson-to-1.0.2 
upgrade rapidjson to 1.0.2
 2015-05-25 15:18:15 +08:00
CocosRobot 88c4ed664b [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-25 07:16:13 +00:00
minggo 4000797ee7 Merge pull request #11854 from samuele3hu/v3_physics3d 
Add Lua bindings for Physics3D and related test case,then update template project
 2015-05-25 15:14:35 +08:00
andyque 81070a5299 fix lua project compile error 2015-05-25 13:42:54 +08:00
WenhaiLin 234ad668ec Fixed TextureCache::unbindImageAsync fails to unbind all asynchronous callback for a specified bound image. 2015-05-25 11:47:37 +08:00
andyque 81d562803b upgrade rapidjson to 1.0.2 2015-05-25 11:43:03 +08:00
minggo db0caf68c6 remove uneeded function 2015-05-25 09:50:48 +08:00
samuele3hu 0492323ec8 Update the Lua template 2015-05-24 23:14:23 +08:00
samuele3hu 074216bef9 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_physics3d 
Conflicts:
	templates/lua-template-default/frameworks/runtime-src/Classes/lua_module_register.h
	tests/lua-tests/src/mainMenu.lua
 2015-05-24 22:46:05 +08:00
子龙山人 49c0b44252 Merge pull request #11988 from andyque/add-vs2015-to-simulator 
fix simulator vs2015 support
 2015-05-23 09:48:32 +08:00
andyque 07eb116fb6 fix lua tests release mode linker issue 2015-05-23 08:48:53 +08:00
minggo 00b15fc3db Merge pull request #11992 from CocosRobot/update_cocosfiles_1432339043 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-05-23 08:06:13 +08:00