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

30062 Commits

Author SHA1 Message Date
CocosRobot 76b151c281 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-06-03 20:25:32 +00:00
Ricardo Quesada 6a19661a80 Merge pull request #12150 from ricardoquesada/material_custom_uniforms 
Material custom uniforms
 2015-06-03 13:08:04 -07:00
Dale Stammen 808de7b475 removed e option from xcopy 2015-06-03 09:54:43 -07:00
Dale Stammen af69c5e0e8 fixed pch.h file for cocos2d-js 2015-06-03 09:54:32 -07:00
Dale Stammen e1a5d71ad6 removed incorrect pch.h 2015-06-03 09:52:25 -07:00
Dale Stammen 21de1825ac removed e option from xcopy 2015-06-03 09:47:55 -07:00
Dale Stammen 3219a3c2f4 update cpp-template files 2015-06-03 09:47:17 -07:00
Dale Stammen 18ce48dc2a /NODEFAULTLIB:MSVCRT to fix linker warning 2015-06-03 09:26:15 -07:00
Dale Stammen 6f2c7574bf updated cpp template files for Windows 8.1 Universal App 2015-06-03 09:25:50 -07:00
Dale Stammen f778b02aa0 updated js template files for Windows 8.1 Universal App 2015-06-03 09:25:19 -07:00
Dale Stammen 38c9490f4d don't delete rendering thread. SpiderMonkey needs to stay on same thread 2015-06-03 09:19:05 -07:00
yinjimmy b1e40a98b0 fix simulator compile error 2015-06-03 22:58:25 +08:00
gyf19 164e4c8314 HttpClient Android supports gzip 2015-06-03 19:41:14 +08:00
WenhaiLin ffa7dc6b5a Label:Fixed letter spacing may be wrong. 2015-06-03 16:28:44 +08:00
子龙山人 883f250f6a Merge pull request #12137 from WenhaiLin/v3-text-line-height 
Fixed the text line height calculation is wrong with system font on Android.
 2015-06-03 16:24:38 +08:00
zhangcheng a51a32fa9d 1, add onEnter and onExit of components to CCNode's onEnter and onExit function. 2015-06-03 15:10:48 +08:00
Ricardo Quesada b8957b176a fixes win compilation issues 2015-06-02 23:31:57 -07:00
pandamicro 413b22d9f9 Merge pull request #12139 from jianglong0156/webviewandvideo 
webview and videoplayer test case bug fix
 2015-06-03 10:10:08 +08:00
Ricardo Quesada 872e4f5a4f removes logging 2015-06-02 17:50:34 -07:00
Ricardo Quesada ff81078062 fixes bug when calculating the dynamic values 2015-06-02 17:48:50 -07:00
Ricardo Quesada 5f6f38616a Merge remote-tracking branch 'cocos2d/v3' into material_custom_uniforms 2015-06-02 17:05:05 -07:00
Ricardo Quesada 87a3a1844a Adds support for Autobindings in Shader 
...part of Material
 2015-06-02 16:56:59 -07:00
子龙山人 9bde2f5bb6 Merge pull request #12140 from CocosRobot/update_cocosfiles_1433238001 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-06-02 17:43:12 +08:00
jianglong0156 271dd3dbaa Merge branch '2d-xv3' into webviewandvideo 2015-06-02 17:40:27 +08:00
CocosRobot f306edee8b [AUTO][ci skip]: updating cocos2dx_files.json 2015-06-02 09:40:03 +00:00
pandamicro 613e0f73b7 Merge pull request #12095 from jianglong0156/videoplayer 
add videoplayer jsb
 2015-06-02 17:35:56 +08:00
jianglong0156 6eddf97416 fix the platform judge error 2015-06-02 17:29:36 +08:00
jianglong0156 0c821379f8 modify video mp4 formate 2015-06-02 17:07:11 +08:00
WenhaiLin 88697bf136 Remove unused function. 2015-06-02 16:38:06 +08:00
WenhaiLin 67d0088103 Fixed the text line height calculation is wrong with system font on Android. 2015-06-02 16:23:40 +08:00
jianglong0156 4abaa51e12 webview and videoplayer only play in android, ios and web 2015-06-02 15:06:44 +08:00
pandamicro 5cebc704ec Merge pull request #12135 from CocosRobot/update_cocosfiles_1433224063 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-06-02 13:51:38 +08:00
jianglong0156 ac71777e97 add webview and videoplayer protect contidition. 2015-06-02 13:50:55 +08:00
CocosRobot a15766adab [AUTO][ci skip]: updating cocos2dx_files.json 2015-06-02 05:47:44 +00:00
子龙山人 e66195ddfc Merge pull request #12131 from MSOpenTech/v3-winrt-version 
V3: updated external/config.json to version 57
 2015-06-02 13:45:07 +08:00
jianglong0156 c46fea1f7a Merge branch 'v3' into videoplayer 2015-06-02 11:26:48 +08:00
Dale Stammen c4e1805ecb updated to version 57 2015-06-01 19:43:26 -07:00
pandamicro 7e6eed5832 Reverse change in submodules 2015-06-02 10:42:50 +08:00
子龙山人 6030b79c7d Merge pull request #12129 from andyque/update-changelog-v3 
[ci skip]update changelog
 2015-06-02 10:26:47 +08:00
andyque 4af5ba11a6 update changelog 2015-06-02 10:26:09 +08:00
jianglong0156 97d0265e32 gzip test 2015-06-02 10:23:30 +08:00
pandamicro 4c6f67fd7e Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	tools/bindings-generator
	web
 2015-06-02 10:12:22 +08:00
子龙山人 2c611693c6 Merge pull request #12123 from WenhaiLin/v3-UserDefault-robustness 
Improve UserDefault's robustness on Android.
 2015-06-02 10:11:19 +08:00
子龙山人 40ea6e3e41 Merge pull request #12103 from samuele3hu/v3_http_leak 
Fix the memory leak of HttpClient on the iOS/Mac platform.
 2015-06-02 10:11:03 +08:00
子龙山人 9ec7b06045 Merge pull request #12073 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2015-06-02 10:10:47 +08:00
pandamicro fdec552ed7 Fix cocos2d/cocos2d-js#1658: Fix js_load_remote_image issue with multithread and improve Downloader 2015-06-02 10:08:13 +08:00
子龙山人 d671591c5a Merge pull request #12128 from CocosRobot/update_cocosfiles_1433210584 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-06-02 10:07:09 +08:00
CocosRobot bae9082fc7 [AUTO][ci skip]: updating cocos2dx_files.json 2015-06-02 02:03:05 +00:00
子龙山人 0ab6472ee6 Merge pull request #12107 from MSOpenTech/v3-uwp 
V3: Windows 10.0 Universal App (UWP) support
 2015-06-02 10:00:40 +08:00
子龙山人 b971bfb6e6 Merge pull request #12125 from andyque/fixWindowsResourceNotCopyIssue 
fix resource not copy issue on windows
 2015-06-02 09:37:30 +08:00