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

34414 Commits

Author SHA1 Message Date
zilongshanren 1eacab01fb fix windows platform simpleaudioengine include 2016-03-28 20:15:06 +08:00
zilongshanren 58ed6216f1 Merge pull request #15328 from zilongshanren/fixSimpleAudioEngineInclude 
[ci skip]add audio SimpleAudioEngine.h search path back
 2016-03-28 14:39:32 +08:00
zilongshanren b879dce607 add audio SimpleAudioEngine.h search path back 2016-03-28 14:35:59 +08:00
minggo 7e1aa112c0 Merge pull request #15326 from minggo/jsb-template 
[ci skip]fix compiling error in new JSB project
 2016-03-28 10:41:02 +08:00
minggo 488930119d fix compiling error in new JSB project 2016-03-28 10:37:35 +08:00
Wenhai Lin 392d1e858f Merge pull request #15314 from WenhaiLin/v3-0323 
Refine 'CCFontXXXX'
 2016-03-25 21:55:00 +08:00
Wenhai Lin c3a8cabe5d refine 2016-03-25 21:21:09 +08:00
pandamicro 7e87b8b389 Fix Socket IO handshake issue with latest version libwebsocket 2016-03-25 17:13:28 +08:00
pandamicro 446527301b Support llvm 3.5 for latest version idk 2016-03-25 17:12:47 +08:00
minggo ffdfcd4aa9 Merge pull request #15311 from MSOpenTech/v3-winrt 
Win10 UWP and Windows 8.1 fixes for v3.11
 2016-03-25 09:42:13 +08:00
Dale Stammen c326eaf063 Merge pull request #190 from xpol/v3-winrt 
exclude some platform specific files form linter.
 2016-03-24 08:07:29 -07:00
Wenhai Lin a93cbe8a32 Refine 'CCFontXXXX' 2016-03-24 23:05:22 +08:00
Xpol Wan 220e1f8e4b exclude some platform specific files form linter. 2016-03-24 21:35:15 +08:00
Wenhai Lin 66576f19dc Merge pull request #14230 from mogemimi/fix-memory-leak-fontfnt 
Fix memory leak in FontFNT
 2016-03-24 19:59:14 +08:00
Dale Stammen ee05081f3a fixed include paths 2016-03-23 12:14:12 -07:00
Dale Stammen 12e34ca9d4 updated to v3.11 2016-03-23 12:13:44 -07:00
Dale Stammen bd72d7a6de updated chipmunk include path 2016-03-23 12:12:44 -07:00
zilongshanren 1b14eb4237 Merge pull request #15306 from minggo/update-third-party 
update third party lib version
 2016-03-23 17:41:09 +08:00
zilongshanren db00d4944c Merge pull request #15293 from zilongshanren/fixDetachIME 
fix systemFontDirty and lineBreakMode issue
 2016-03-23 16:37:53 +08:00
mogemimi de0582844e Fix memory leak in FontFNT 2016-03-23 15:17:05 +09:00
minggo 247a92ffd3 update third party lib version 2016-03-23 09:52:56 +08:00
minggo 3c676d9712 Merge pull request #15037 from Shulepov/spriteframecache_pixel_format 
SpriteFrameCache: take pixelFormat into account if specified
 2016-03-23 09:48:35 +08:00
Ricardo Quesada 2feddcf95a Merge pull request #15248 from cocos2d/slackmoehrle-patch-1 
added roadmap
 2016-03-22 18:22:59 -07:00
zilongshanren c3ae69aac8 Merge pull request #15302 from CocosRobot/update_cocosfiles_1458651326 
[AUTO][ci skip]: updating cocos2dx_files.json
 2016-03-22 21:04:36 +08:00
zilongshanren 19c013f16e Merge pull request #15303 from CocosRobot/update_lua_bindings_1458651389 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-03-22 21:01:39 +08:00
CocosRobot 6e12d8c98a [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-03-22 12:58:39 +00:00
CocosRobot 970d5f09ff [AUTO][ci skip]: updating cocos2dx_files.json 2016-03-22 12:55:27 +00:00
zilongshanren 9b7ff03442 Merge pull request #15301 from xpol/update-binding-generator 
Update binding generator
 2016-03-22 20:52:46 +08:00
Xpol Wan 8d9cdeae7b Update binding generator 
with fixes for generated include path for headers that not in cocos directory (e.g. extensions ).
 2016-03-22 20:49:54 +08:00
zilongshanren 8eb683310d Merge pull request #15295 from CocosRobot/update_cocosfiles_1458635195 
[AUTO][ci skip]: updating cocos2dx_files.json
 2016-03-22 19:52:22 +08:00
zilongshanren 8f30d01156 Merge pull request #15286 from xpol/remove-uncessary-search-paths 
Removed unnecessary search paths.
 2016-03-22 19:51:59 +08:00
Xpol Wan a225130010 Fixes windows universal build. 2016-03-22 18:51:58 +08:00
CocosRobot c7cbe2dda3 [AUTO][ci skip]: updating cocos2dx_files.json 2016-03-22 08:26:39 +00:00
minggo 4b47750e1f Merge pull request #15171 from xiaofeng11/v3_jsFix 
[ci skip] js-test bug fix
 2016-03-22 16:24:31 +08:00
Xpol Wan ae3fbcce79 Manually fixes include path for generated code. 2016-03-22 16:08:28 +08:00
Xpol Wan 71f0537734 Merge commit '43db5c052d3a8605ebfd9dc2acc23e26129c4265' into remove-uncessary-search-paths 2016-03-22 16:07:02 +08:00
Xpol Wan e7864cdb89 Removed unnecessary search paths. 2016-03-22 16:04:12 +08:00
zilongshanren ff6b7080f5 fix systemFontDirty and lineBreakMode issue 2016-03-22 14:47:33 +08:00
zilongshanren 43db5c052d Merge pull request #15292 from CocosRobot/update_lua_bindings_1458627759 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-03-22 14:28:56 +08:00
CocosRobot 35645d8c26 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-03-22 06:24:54 +00:00
zilongshanren 989a44a23d Merge pull request #15291 from cocos2d/revert-15261-uiedit_programmatically_attachable 
[ci rebuild]Revert "UIEditBox attachWithIME, detachWithIME make working"
 2016-03-22 14:18:58 +08:00
zilongshanren 400e77808c Revert "UIEditBox attachWithIME, detachWithIME make working" 2016-03-22 14:18:39 +08:00
zilongshanren 3a600e3d4a Merge pull request #15287 from zilongshanren/fix-label-issues 
fix system font dirty issue
 2016-03-22 13:08:49 +08:00
zilongshanren a15a39095f fix system font dirty issue 2016-03-21 22:31:23 +08:00
zilongshanren 937ccf51b1 Merge pull request #15285 from CocosRobot/update_lua_bindings_1458564868 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2016-03-21 21:40:26 +08:00
zilongshanren 8389badc9d Merge pull request #15284 from CocosRobot/update_cocosfiles_1458564787 
[AUTO][ci skip]: updating cocos2dx_files.json
 2016-03-21 21:40:16 +08:00
CocosRobot 97130dc084 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2016-03-21 12:56:42 +00:00
CocosRobot a9a9a39ff2 [AUTO][ci skip]: updating cocos2dx_files.json 2016-03-21 12:53:09 +00:00
zilongshanren 5a9a2e9749 Merge pull request #15281 from xpol/single-include-search-path 
Single include search path
 2016-03-21 20:51:02 +08:00
Xpol Wan 32e408487f Fixes import path for m and mm files. 2016-03-21 20:12:58 +08:00