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

30550 Commits

Author SHA1 Message Date
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 b0b40cb4d6 Solve the error usage of print in python script. 2015-06-17 10:00:37 +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
Ricardo Quesada 6785369d9a Merge pull request #12357 from MSOpenTech/v3-winrt-librecast 
V3: Added Windows 10 UWP librecast. Fix Windows 8.1 librecast
 2015-06-16 13:05:50 -07:00
Dale Stammen eb2bc78970 Merge branch 'v3' into v3-winrt-librecast 2015-06-16 07:13:53 -07:00
XiaoYang 023b9f5a07 Merge pull request #345 from tangziwen/v3 
Fix camera's incorrect position in chunks' LOD calculating
 2015-06-16 17:48:54 +08:00
tangziwen 60115b1ce1 update 2015-06-16 17:46:21 +08:00
VisualSJ ab34c1de89 Change the path(UIVideoPlayerTest.js) 2015-06-16 17:30:48 +08:00
tangziwen 0eaf9b5acc Fix camera's incorrect position in chunks' LOD calculating. 2015-06-16 17:29:43 +08:00
WuHao 6e138e7b9b add clipper to cmakelist 2015-06-16 17:09:27 +08:00
WuHao d3e0439972 Merge branch 'fix_spritepolygon2' of https://github.com/Wu-Hao/cocos2d-x into fix_spritepolygon 2015-06-16 16:15:57 +08:00
WuHao 3b56d2a66f fix cmake for cmake platforms 2015-06-16 16:15:19 +08:00
Hao Wu 2ddad84c73 Merge pull request #17 from pandamicro/spritepolygon 
Remove jsb_cocos2dx_experimental in projects to fix compilation issue
 2015-06-16 15:11:36 +08:00
pandamicro e4d5db30eb Remove jsb_cocos2dx_experimental in projects to fix compilation issue 2015-06-16 15:09:06 +08:00
pandamicro d51fd2397c Fix js test ES6 usage issue 2015-06-16 15:01:52 +08:00
pandamicro 3f8923648b Merge pull request #12359 from super626/opt_navigation 
remove unused code, and use nullptr for pointer
 2015-06-16 14:58:58 +08:00
Justin Hawkwood 90db6fe5d6 Added check that callback is set 2015-06-15 23:36:04 -07:00
Justin Hawkwood 9378b6704c Moved file check to alternate location 2015-06-15 23:31:52 -07:00
Huabing.Xu 19982aae00 fix android background and foreground bug with VertexAttributeBinding 2015-06-16 14:04:50 +08:00
pandamicro 0866180918 Merge pull request #12162 from namezero111111/patch-4 
JumpTo::clone() results in incorrect end position
 2015-06-16 13:37:04 +08:00
samuele3hu e20a35508a Update the bindings-generator 2015-06-16 11:38:16 +08:00
samuele3hu a547d6aa33 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_navigation 
Conflicts:
	tools/bindings-generator
 2015-06-16 11:36:11 +08:00
WuHao aeeed0f4ab Merge remote-tracking branch 'origin' into fix_spritepolygon 
# Conflicts:
#	external/config.json
 2015-06-16 11:19:20 +08:00
yangxiao 4d1aa56193 remove unused code, and use nullptr for pointer 2015-06-16 11:15:39 +08:00
Dale Stammen 511fe6a773 added missing lib references 2015-06-15 20:10:38 -07:00
Dale Stammen 74f4d29fa9 added missing librecast 2015-06-15 20:06:54 -07:00
Dale Stammen f1c9a592c5 updated version to v3-deps-66 2015-06-15 19:32:00 -07:00