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

30202 Commits

Author SHA1 Message Date
Huabing.Xu ad1f7c472c add render buffer render target for color attachment 2015-06-04 11:18:35 +08:00
子龙山人 831ca47b13 Merge pull request #12158 from WenhaiLin/v3-letter-space 
Label:Fixed letter spacing may be wrong.
 2015-06-04 10:51:25 +08:00
anniruddh.koppal b294dffaa1 Added ogg support to audio engine. Fixed issues #150 and #151 2015-06-03 19:50:57 -07:00
zhangcheng 55995ece1a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v2_addOnEnterAndOnExitToCCNode 2015-06-04 10:38:39 +08:00
XiaoYang d406efcdda Merge pull request #340 from zhukaixy/Branch_navigation2_mru 
configure navi for winodow phone
 2015-06-04 10:06:32 +08:00
zhukaixy f891a0b124 configure navi for winodow phone 2015-06-04 10:00:15 +08:00
子龙山人 111420ebd7 Merge pull request #12167 from yinjimmy/simulator_fix 
fix simulator compile error
 2015-06-04 10:00:07 +08:00
子龙山人 f97cc0e780 Merge pull request #12171 from CocosRobot/update_cocosfiles_1433381103 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-06-04 09:35:47 +08:00
CocosRobot 7607b81bfd [AUTO][ci skip]: updating cocos2dx_files.json 2015-06-04 01:25:04 +00:00
子龙山人 95934bf310 Merge pull request #12168 from MSOpenTech/v3-winrt-js-fix 
V3: Fixes for Windows 8.1 Universal App JavaScript
 2015-06-04 09:22:21 +08:00
Ricardo Quesada 19d3a13285 Merge pull request #12169 from CocosRobot/update_lua_bindings_1433362818 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-06-03 13:33:24 -07:00
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
Namezero c09e280b58 JumpTo::clone() results in incorrect end position 
JumpTo::clone() passes incorrect value to (_delta) to create() rather than _endPosition
 2015-06-03 13:14:11 +02:00
Namezero 89915a084c Blink::stop() access violation 
Blink::stop() is calles twice when inside a Repeat action. This results in an access violation
 2015-06-03 12:39:16 +02:00
yangxiao 17b53efcb8 wrong quotation 2015-06-03 17:31:50 +08:00
yangxiao ebf1180b04 Merge branch 'navigation2' of https://github.com/super626/cocos2d-x into navigation2 2015-06-03 17:02:33 +08:00
yangxiao 8afbefec15 to depency59 2015-06-03 17:01:36 +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
XiaoYang eec48078d0 Merge pull request #339 from zhukaixy/Branch_navigation2_mru 
configure recast project for win8.1 project
 2015-06-03 14:47:29 +08:00
zhukaixy cf24623e26 configure recast project for win8.1 project(js) 2015-06-03 14:42:37 +08:00
Ricardo Quesada b8957b176a fixes win compilation issues 2015-06-02 23:31:57 -07:00
zhukaixy 76ad42bb0b configure recast project for win8.1 project 2015-06-03 14:31:12 +08:00
yangxiao 2c0e7a04ed Merge branch 'navigation2' of https://github.com/super626/cocos2d-x into navigation2 2015-06-03 11:48:23 +08:00
XiaoYang 249997ef7a Merge pull request #338 from super626/revert-337-navigation2 
Revert "configure project for navigation on win8.1"
 2015-06-03 11:47:14 +08:00
XiaoYang 6be4ab502a Revert "configure project for navigation on win8.1" 2015-06-03 11:46:28 +08:00
yangxiao 06fd083d07 add recast to js project 2015-06-03 11:45:49 +08: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
XiaoYang ea57c9ac66 Merge pull request #337 from zhukaixy/navigation2 
configure project for navigation on win8.1
 2015-06-02 18:17:08 +08: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