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

30462 Commits

Author SHA1 Message Date
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
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
子龙山人 76baa96e97 Merge pull request #12233 from Furkanzmc/cmake_file_windows_fix 
Fix C++ template CMakeLists.txt file to prevent include related errors on Windows
 2015-06-16 10:30:32 +08:00
Dale Stammen 8d8e7d6cb9 Merge branch 'v3' into v3-winrt-librecast 2015-06-15 19:27:40 -07:00
子龙山人 0b5c7d74b7 Merge pull request #12160 from namezero111111/patch-3 
Blink::stop() access violation
 2015-06-16 10:27:38 +08:00
Dale Stammen e5dc64f819 ignore .vs dir of VS2015 2015-06-15 19:26:38 -07:00
子龙山人 f6af1713dd Merge pull request #12358 from CocosRobot/update_cocosfiles_1434420355 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-06-16 10:06:48 +08:00
CocosRobot 22ce7e6ee7 [AUTO][ci skip]: updating cocos2dx_files.json 2015-06-16 02:05:57 +00:00
子龙山人 b182f66329 Merge pull request #12346 from natural-law/v3 
Add scripts for framework compiling.
 2015-06-16 10:04:09 +08:00
Hao Wu 8c82e036fb Merge pull request #16 from pandamicro/spritepolygon 
Add js test cases for sprite polygon
 2015-06-16 10:03:02 +08:00
子龙山人 271e3295eb Merge pull request #12349 from WenhaiLin/v3-37-NotificationNode-crashfix 
Fixed NotificationNode might crash program when the program exits.
 2015-06-16 09:53:39 +08:00
Dale Stammen 0781978788 added librecast. Updated build properties 2015-06-15 18:44:14 -07:00
Ricardo Quesada 42ad7e24a8 Merge pull request #12356 from ricardoquesada/gl_error_check 
StateBlock() is public
 2015-06-15 18:29:06 -07:00
Dale Stammen e14fdedf67 added missing NavMeshTest files 2015-06-15 18:19:51 -07:00
Dale Stammen 03fc2eca5e added missing navmesh files 2015-06-15 18:19:28 -07:00
Dale Stammen a73d82990d added librecast 2015-06-15 18:18:54 -07:00
Ricardo Quesada b167ab3e78 StateBlock() is public 2015-06-15 17:43:37 -07:00
Ricardo Quesada 695c2a7137 Merge pull request #12355 from ricardoquesada/minor_fixes_renderstate 
StateBlock::restore() is public
 2015-06-15 15:21:41 -07:00
Dale Stammen 8e4f6afaa1 added missing librecast projects 2015-06-15 14:32:27 -07:00
Ricardo Quesada ca3da86da7 StateBlock::restore() is public 
It is possible to restore to default state
 2015-06-15 14:12:44 -07:00
Ricardo Quesada aeb9642150 Merge pull request #12354 from ricardoquesada/minor_fixes_renderstate 
Removes not-needed draws
 2015-06-15 12:21:20 -07:00
Dale Stammen 9262cc95bf fixed project filters broken by recent additions of files 2015-06-15 11:38:52 -07:00
Ricardo Quesada c17da7e90d Removes not-needed draws 2015-06-15 10:40:47 -07:00
pandamicro ccd15b3da7 Merge branch 'fix_spritepolygon2' of https://github.com/Wu-Hao/cocos2d-x into spritepolygon 2015-06-16 00:56:58 +08:00
pandamicro 4f8bd25a83 Add js test cases for sprite polygon 2015-06-16 00:56:08 +08:00
WenhaiLin 3c8d15f6f8 Fixed NotificationNode might crash program when the program exits. 2015-06-15 17:55:00 +08:00
Bin Zhang fb920acccf Add scripts for framework compiling. 2015-06-15 16:33:24 +08:00
WuHao 27d0f51e9b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	build/cocos2d_tests.xcodeproj/project.pbxproj
	cocos/2d/libcocos2d.vcxproj.filters
	tools/cocos2d-console
	web
 2015-06-15 16:13:36 +08:00
Hao Wu b4ca8c1489 Merge pull request #15 from pandamicro/spritepolygon 
Add SpritePolygon JSB bindingsJSB bindings
 2015-06-15 15:47:02 +08:00
子龙山人 86b6ea702a Merge pull request #12342 from WenhaiLin/v3-37-android-studio-fix 
[ci skip]Android Studio projects:Fixed compile error.
 2015-06-15 14:48:42 +08:00
WenhaiLin 518de1ff57 [ci skip]Android Studio projects:Fixed compile error. 2015-06-15 14:42:45 +08:00
pandamicro bef7e7863e Merge pull request #12339 from pandamicro/v3 
[ci skip] Update html5 engine
 2015-06-15 13:47:56 +08:00
pandamicro b63973ffb8 Merge pull request #12338 from CocosRobot/update_lua_bindings_1434346950 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-06-15 13:47:22 +08:00
CocosRobot 8ec924c206 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-15 05:46:51 +00:00
pandamicro 8b21d5b219 Update html5 engine 2015-06-15 13:45:09 +08:00
pandamicro ce6b3d7e76 Merge pull request #12337 from CocosRobot/update_cocosfiles_1434346866 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-06-15 13:42:56 +08:00
CocosRobot f7ec4b2db5 [AUTO][ci skip]: updating cocos2dx_files.json 2015-06-15 05:41:07 +00:00
pandamicro 0216d05eee Merge pull request #12102 from super626/navigation2 
3D Navigation
 2015-06-15 13:39:05 +08:00