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

30319 Commits

Author SHA1 Message Date
pandamicro bb275351f0 Merge pull request #12363 from super626/v3 
Fix terrain lod computing bugs
 2015-06-17 17:49:39 +08:00
yangxiao 12a352a1db add comment 2015-06-17 16:32:08 +08:00
XiaoYang 5dd2aa2884 Merge pull request #349 from tangziwen/v3 
fix camera position
 2015-06-17 16:01:02 +08:00
tangziwen e9c95229e0 fix camera position 2015-06-17 15:58:17 +08:00
pandamicro b534f85679 Merge pull request #12394 from CocosRobot/update_lua_bindings_1434525200 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-06-17 15:38:17 +08:00
CocosRobot 22f04da582 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-17 07:18:18 +00:00
pandamicro 6f6c317f87 Merge pull request #12386 from WenhaiLin/v3-label-spacefix 
Label:Fixed wrong letter spacing with outline enabled
 2015-06-17 15:16:49 +08:00
pandamicro 5ee22c4142 Merge pull request #12174 from pajeroquan/v3 
Fix JNI object memory leak!
 2015-06-17 15:14:36 +08:00
子龙山人 f4eb82d5b1 Merge pull request #12393 from CocosRobot/update_cocosfiles_1434525074 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-06-17 15:14:11 +08:00
CocosRobot c7ad47908e [AUTO][ci skip]: updating cocos2dx_files.json 2015-06-17 07:11:15 +00:00
子龙山人 fd508a0198 Merge pull request #12381 from VisualSJ/v3-aa 
[ci skip]Fix some simple bug
 2015-06-17 15:11:08 +08:00
pandamicro b1831ea5fb Merge pull request #12384 from chengstory/GBKToUTF8_v3 
GBKToUTF8
 2015-06-17 15:09:15 +08:00
子龙山人 dd86da0545 Merge pull request #12392 from CocosRobot/update_lua_bindings_1434524084 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-06-17 15:02:28 +08:00
CocosRobot ab1530168b [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-17 06:59:51 +00:00
子龙山人 041f7c7e54 Merge pull request #12390 from CocosRobot/update_cocosfiles_1434523357 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-06-17 14:50:28 +08:00
子龙山人 31eabf4294 Merge pull request #12391 from CocosRobot/update_lua_bindings_1434523444 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-06-17 14:50:08 +08:00
子龙山人 9deaa9bcc9 Merge pull request #12374 from natural-law/framework 
Optimize framework-compile.
 2015-06-17 14:49:43 +08:00
CocosRobot 55c7de75e9 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-17 06:48:41 +00:00
VisualSJ 0a223adf7c After exiting should restore settings 2015-06-17 14:43:41 +08:00
CocosRobot 734382026a [AUTO][ci skip]: updating cocos2dx_files.json 2015-06-17 06:42:39 +00:00
子龙山人 dc33a8d66e Merge pull request #12243 from Wu-Hao/fix_spritepolygon2 
Fix spritepolygon
 2015-06-17 14:40:30 +08:00
VisualSJ fba76b11cd Fixed path bug 2015-06-17 14:07:07 +08:00
pandamicro 3a076b6508 Merge pull request #12387 from samuele3hu/v3_navigation 
[ci skip]Update the Physics3DTest for js and Lua by synchronizing the API.
 2015-06-17 14:01:21 +08:00
samuele3hu 9c550e0a11 Update the Physics3DTest for js and Lua by synchronizing the API. 2015-06-17 13:58:05 +08:00
Wenhai Lin cbd428f6ac Label:Fixed wrong letter spacing with outline enabled 2015-06-17 13:57:23 +08:00
pandamicro 6a50ef0267 Merge pull request #12382 from tangziwen/v3_cocos 
add librecast to cpp template
 2015-06-17 13:46:30 +08:00
tangziwen b84531ea04 add librecast to js and lua templates 2015-06-17 13:39:28 +08:00
Hao Wu e2178c30a0 Merge pull request #19 from fusijie/fix_spritepolygon2 
fix conflicts.
 2015-06-17 13:19:22 +08:00
zhangcheng 1c983f1f39 GBKToUTF8 2015-06-17 13:16:06 +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
tangziwen cc2481403c fix the sln version 2015-06-17 12:41:18 +08:00
tangziwen f77f94bf43 add librecast to cpp template 2015-06-17 12:37:22 +08:00
子龙山人 9e937759c1 Merge pull request #12379 from CocosRobot/update_cocosfiles_1434512347 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-06-17 11:58:33 +08:00
子龙山人 2eafe82570 Merge pull request #12380 from CocosRobot/update_lua_bindings_1434512493 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-06-17 11:58:13 +08:00
VisualSJ 6669f1df5e Fixed widgetFromJsonFile bug(#20035) 2015-06-17 11:49:27 +08:00
CocosRobot 6bed988354 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-17 03:47:36 +00:00
Hao Wu 60cb852788 Merge pull request #18 from fusijie/fix_spritepolygon2 
fix compile on linux platform.
 2015-06-17 11:40:56 +08:00
CocosRobot 4ae7489e28 [AUTO][ci skip]: updating cocos2dx_files.json 2015-06-17 03:39:08 +00:00
子龙山人 0915565b8d Merge pull request #12373 from samuele3hu/v3_navigation 
Add the Lua bindings for NavMesh and the related test case.
 2015-06-17 11:36:52 +08:00
Jacky 13e0fb22f5 fix compile on linux platform. 2015-06-17 11:34:19 +08:00
XiaoYang 2951b3e679 Merge pull request #347 from songchengjiang/v3 
fix the bug of light
 2015-06-17 11:23:46 +08:00
VisualSJ d855066472 Fixed a bug that control's default resource error #20037 2015-06-17 11:19:06 +08:00
songchengjiang c08a355a06 fix the bug of light 
replace atanf with atan2f
 2015-06-17 11:17:46 +08:00
VisualSJ 164fb3a058 If json have the back button, then use this button 2015-06-17 11:16:44 +08:00
Bin Zhang 13e8cbf6d7 Add ignore for files generated by framework-compile. 2015-06-17 09:53:32 +08:00
Bin Zhang 088cc76b9f Replace tab with spaces. 2015-06-17 09:53:03 +08:00
samuele3hu 2da760b655 Update the NavMesh test case 2015-06-17 09:49:31 +08:00
pandamicro a2deddcf59 Merge pull request #12361 from dabingnn/v3_androidBugForVertexAttrib 
fix android background and foreground bug with VertexAttributeBinding
 2015-06-17 09:34:47 +08:00
Ricardo Quesada 3df4c1fc6c Merge pull request #12371 from CocosRobot/update_cocosfiles_1434486389 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-06-16 13:30:11 -07:00
CocosRobot 0b73b53d3a [AUTO][ci skip]: updating cocos2dx_files.json 2015-06-16 20:26:30 +00:00