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

31287 Commits

Author SHA1 Message Date
Wenhai Lin 70628c9dec Fixed link errors on iOS/Mac 2015-07-29 13:59:58 +08:00
Wenhai Lin c4112e1ce5 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3.8-label-gb2312 2015-07-28 17:02:30 +08:00
WenhaiLin 9edd66d4a7 Label:support font that contains GB2312 char map. 2015-07-28 16:28:32 +08:00
子龙山人 3a58668d71 Merge pull request #12744 from fusijie/fix_pageturndown 
Fix PageTurn3D
 2015-07-28 11:35:15 +08:00
子龙山人 96007b2793 Merge pull request #13044 from fusijie/fix_10763 
set minimum display length to 1.
 2015-07-28 09:52:45 +08:00
pandamicro b9968a9dca Merge pull request #13038 from ZhangMenghe/shaderTestCase 
Fix OpenGL testcase 'center' uniform error
 2015-07-28 09:34:09 +08:00
fusijie 651d877e28 set minimum display length to 1. 2015-07-27 17:55:32 +08:00
Zhang Menghe a96ea2342a Update OpenGLTest.js 2015-07-27 15:53:48 +08:00
pandamicro 3cc039b063 Merge pull request #13036 from fusijie/fix_12505 
fix shader-basic testcase 'center' uniform error.
 2015-07-27 15:40:44 +08:00
ZhangMenghe 232f738bf7 Fix OpenGL testcase 'center' uniform error 2015-07-27 15:08:07 +08:00
fusijie f8de67a0c4 fix shader-basic testcase 'center' uniform error. 2015-07-27 14:18:17 +08:00
pandamicro 3fb45f28f5 Merge pull request #13033 from CocosRobot/update_cocosfiles_1437975533 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-07-27 13:41:41 +08:00
CocosRobot f751234b7f [AUTO][ci skip]: updating cocos2dx_files.json 2015-07-27 05:38:54 +00:00
子龙山人 7f383f961a Merge pull request #13026 from fusijie/fix_13025 
fix 13025 wild pointer.
 2015-07-27 13:38:38 +08:00
子龙山人 ce06f148a5 Merge pull request #13031 from natural-law/remove-unused-files 
Remove the unused files in tools/gen-prebuilt.
 2015-07-27 13:37:07 +08:00
pandamicro bb15225ff7 Merge pull request #13028 from CocosRobot/update_lua_bindings_1437966796 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-07-27 12:04:22 +08:00
zhangbin e73fc94345 Remove the unused files in tools/gen-prebuilt. 2015-07-27 11:38:41 +08:00
CocosRobot d9b5ce8d28 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-07-27 03:17:29 +00:00
子龙山人 bd0bdae530 Merge pull request #12993 from WenhaiLin/v3.8-label-layout-refine 
Label:refine the implementation about text layout and support debug draw.
 2015-07-27 11:10:31 +08:00
fusijie f2f425d19c fix 13025 wild pointer. 2015-07-27 10:39:31 +08:00
pandamicro 9615545e11 Merge pull request #12890 from jianglong0156/FileUtilsJSB 
[ci skip]add fileUtils writeString,writeValueMap,writeValueVector in jsb
 2015-07-25 14:16:14 +08:00
jianglong0156 c14ca98203 set file name to label.change the file dir 2015-07-25 14:04:41 +08:00
pandamicro 7ae3dd12a1 Merge pull request #12995 from fusijie/fix_12505 
fix blur shader compliant on win8 universal.
 2015-07-25 12:42:35 +08:00
Ricardo Quesada 2d04e995d7 Merge pull request #13007 from ricardoquesada/cocos2d_version 
updates cocos2d version
 2015-07-24 15:53:51 -07:00
Ricardo Quesada 76982dac89 updates cocos2d version 2015-07-24 15:53:18 -07:00
WenhaiLin a1e682ca65 Improves the test to reproduce issue 12996 2015-07-24 21:34:59 +08:00
WenhaiLin b1bd8338aa Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3.8-label-gb2312 2015-07-24 21:30:28 +08:00
fusijie 647848e843 fix blur sprite shader on win8 universal. 2015-07-24 21:04:44 +08:00
pandamicro a256df68c1 Merge pull request #13000 from yangws/v3 
Fix bug: app will crash if move mouse over window when launching.
 2015-07-24 20:11:25 +08:00
WenhaiLin 37a174ee4a Label:refine the implementation about text layout and support debug draw 2015-07-24 18:38:45 +08:00
Vincent Yang 20fe1fb1a8 Fix bug: app will crash if move mouse over window when launching. 2015-07-24 16:41:03 +08:00
fusijie bd0a57242b refine blur shader test case. 2015-07-24 13:52:40 +08:00
fusijie d550dace35 fix blur shader compliant on win8 universal. 2015-07-24 12:47:38 +08:00
Ricardo Quesada 1ea690893a Merge pull request #12990 from ricardoquesada/xcode7_compiles_and_run 
compiles and runs on Xcode 7
 2015-07-23 16:04:48 -07:00
Ricardo Quesada 2deb492d36 compiles and runs on Xcode 7 2015-07-23 14:28:23 -07:00
Ricardo Quesada 292987d393 Merge pull request #12987 from MSOpenTech/v3-win10-fix 
V3 win10 fix
 2015-07-23 13:54:03 -07:00
Dale Stammen 72427a0a64 updated version to 3.8 2015-07-23 12:46:47 -07:00
Dale Stammen f91e812924 updated version to 3.8 2015-07-23 12:40:36 -07:00
Dale Stammen 6669fec648 added missing bug test 2015-07-23 12:34:37 -07:00
pandamicro a78d55a897 Merge pull request #12980 from CocosRobot/update_cocosfiles_1437646359 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-07-23 18:48:42 +08:00
CocosRobot cbf830196b [AUTO][ci skip]: updating cocos2dx_files.json 2015-07-23 10:12:40 +00:00
pandamicro 5f57fa942f Merge pull request #12802 from ZhangMenghe/pageTurnDown 
Page turn down
 2015-07-23 18:10:53 +08:00
pandamicro 8be726211c Merge pull request #12974 from pandamicro/autoExtend 
Auto add extend to jsb need to extend classes
 2015-07-23 18:04:03 +08:00
pandamicro f96d26c46a Merge pull request #12975 from CocosRobot/update_cocosfiles_1437636951 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-07-23 15:39:34 +08:00
pandamicro bd1f5b4a39 Merge pull request #12911 from natural-law/portrait-support 
Fixed #12252 : Support new portrait projects from templates.
 2015-07-23 15:38:32 +08:00
CocosRobot 7241f72f47 [AUTO][ci skip]: updating cocos2dx_files.json 2015-07-23 07:35:52 +00:00
pandamicro 88df2137a5 Merge pull request #12959 from martell/makepkg 
fix building with system prebuilt libs
 2015-07-23 15:33:58 +08:00
pandamicro 6110700615 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into autoExtend 2015-07-23 15:25:33 +08:00
pandamicro 3c3a5a6057 Merge pull request #12971 from yangws/issue_12918 
[ci skip] Fixed #12918 : TMXXMLParser.cpp -- In the function getRectForGID have…
 2015-07-23 11:22:57 +08:00
Vincent Yang 19c8f337da Fixed #12918 : TMXXMLParser.cpp -- In the function getRectForGID have small errors 2015-07-23 11:01:51 +08:00