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

708 Commits

Author SHA1 Message Date
minggo 8eed0811fa Merge pull request #8717 from MSOpenTech/wp8-dll 
New version of WP8 for cocos2d-x v3.3
 2014-10-16 09:33:43 +08:00
Dale Stammen 5d479a30aa updated wp8 cpp template 2014-10-15 09:49:24 -07:00
minggo 16ad1977b0 Merge pull request #8706 from SunLightJuly/add_ClippingRectangleNode 
Add clipping rectangle node
 2014-10-15 15:09:29 +08:00
CocosRobot 65aefcd5a3 [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-15 05:56:51 +00:00
SunLightJuly f2286eaf94 added ClippingRectangleNode 2014-10-15 13:38:14 +08:00
CocosRobot da3f7ebe23 [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-15 02:37:42 +00:00
Dale Stammen 420a19f222 run app after setting delegates 2014-10-14 18:12:24 -07:00
Dale Stammen 4313ff8cc9 updated wp8 include file 2014-10-14 16:53:56 -07:00
honghui 718b5a3cf8 Windows runtime response uncorrect 2014-10-15 00:20:18 +08:00
honghui 445c9dcde4 copy dll files to win32 runtime 2014-10-14 23:32:25 +08:00
dualface f45d9de8f2 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into update-lua-template-runtime 2014-10-14 23:11:12 +08:00
dualface 963474e43c update lua-template-runtime 2014-10-14 23:08:42 +08:00
minggo dc3997d41c Merge pull request #8691 from minggo/fix-runtime 
[ci skip]fix runtime error
 2014-10-14 21:38:33 +08:00
minggo 39bce5c22f fix runtime error 2014-10-14 21:37:04 +08:00
dualface 23781f7b92 fix coded debugger support 2014-10-14 18:26:56 +08:00
CocosRobot c816ea443d [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-14 09:10:38 +00:00
minggo abd2687cf5 Merge pull request #8683 from dualface/update_lua_template_runtime 
update lua-template
 2014-10-14 17:01:19 +08:00
dualface cee999ebbb update lua-template-default, lua-template-runtime, fix same proj problems. 2014-10-14 16:55:38 +08:00
minggo 3274b6f9df Revert "[AUTO][ci skip]: updating cocos2dx_files.json" 2014-10-14 14:41:45 +08:00
CocosRobot 96954d1188 [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-14 06:34:13 +00:00
Huabing.Xu b3be90bc5e Fix lua cocos console on linux 2014-10-13 17:42:59 +08:00
Huabing.Xu fcc892d90e add missed external module for cocos console on linux 2014-10-13 16:52:14 +08:00
SunLightJuly a36dbf5362 ClippingRegionNode --> ClippingRectangleNode 2014-10-11 11:49:01 +08:00
CocosRobot 7cb2cd8608 [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-11 02:16:23 +00:00
dualface 74ec90f90f remove unused codes 2014-10-11 03:14:06 +08:00
dualface b49d2351ff update lua-template-default 2014-10-11 02:55:04 +08:00
CocosRobot 127b8acd14 [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-10 14:23:42 +00:00
minggo 4d084496a3 Merge pull request #8578 from SunLightJuly/Lua_LoadChunksFromZIP 
added  LuaStack::loadChunksFromZIP()
 2014-10-10 22:14:55 +08:00
SunLightJuly ba064167a8 modified project files and make files 2014-10-10 18:43:40 +08:00
CocosRobot 80a92066c2 [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-10 08:42:41 +00:00
NeoLeeee a5a16eecbf the android library path is wrong 
if you run the following command in your game forder 

cocos run -p android

it will give you the following error since the path is wrong

BUILD FAILED
/Users/lifeng/dev/adt_bundle_mac/sdk/tools/ant/build.xml:459: ../../../cocos/platform/android/java resolve to a path with no project.properties file for project /Users/lifeng/study/cosco2dx/MyFirstGame/proj.android
 2014-10-10 01:33:41 +08:00
CocosRobot 0b5122a11b [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-09 05:49:41 +00:00
CocosRobot 79e641b3ff [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-09 02:06:14 +00:00
SunLightJuly 1062dec335 modified project files and make files 2014-10-08 18:44:58 +08:00
honghui de9a52892c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-10-08 17:11:19 +08:00
honghui 91901c16cb delete tip when reload file is empty(it's normal) 2014-10-08 17:06:58 +08:00
CocosRobot 75f21f9c10 [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-08 01:41:20 +00:00
minggo 3873bbc5f7 Merge pull request #8060 from giuslape/v3 
Update Reference plugin-x
 2014-10-08 09:39:45 +08:00
CocosRobot d090576b94 [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-06 13:11:39 +00:00
minggo bb6ba600a3 Merge pull request #8219 from cocoscodeide/v3 
runtime template support Xcode6
 2014-09-30 17:10:51 +08:00
honghui 62e06d25ed runtime template support Xcode6 2014-09-30 17:08:14 +08:00
honghui 7dbac13993 runtime template support Xcode6 2014-09-30 15:49:58 +08:00
CocosRobot 181ef40285 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-30 07:10:16 +00:00
CocosRobot f834ae8d07 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-30 03:15:35 +00:00
minggo d1e41c771b Merge pull request #8162 from super626/light 
3D Light
 2014-09-30 11:13:59 +08:00
yangxiao d680e58f80 merge cocos resolve conflict 2014-09-30 08:32:37 +08:00
CocosRobot 2f35269bf9 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-29 18:08:55 +00:00
CocosRobot 13b165cf75 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-29 10:31:52 +00:00
minggo 8a5829631d Merge pull request #8171 from huangshiwu/v3_Teivaz 
Enable screen orientation change handling - by Teivaz
 2014-09-29 18:02:03 +08:00
honghui 82eb6eeff9 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-09-29 16:28:18 +08:00