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

33037 Commits

Author SHA1 Message Date
minggo 5f9bd06bee support webconsole 2016-01-15 18:05:59 +08:00
minggo e062ade514 make require() returns the value of last statement 2016-01-15 18:02:11 +08:00
minggo 299a56d52e can use new firefox version to debug cocos2d-x jsb projects 2016-01-15 11:39:17 +08:00
xiaofeng11 0682832ed7 Merge pull request #14350 from xiaofeng11/v3_simfix 
Fix when start simulator in CocoStudio to run a scene, can not read the correct config.json on MacOSX
 2015-11-09 23:32:35 +08:00
肖峰 3aeb5e0389 Fix when start simulator in CocoStudio to run a scene, can not read the correct config.json on MacOSX 2015-11-09 23:30:03 +08:00
pandamicro c08b4a0f9d Merge pull request #14343 from super626/v3 
fix cull face for render queue
 2015-11-09 12:51:39 +08:00
pandamicro a37eeb6f67 Merge pull request #14344 from pandamicro/v3 
[ci skip]Web engine important issue fix
 2015-11-09 12:33:42 +08:00
pandamicro eac57ec33e Web engine important issue fix 2015-11-09 12:31:41 +08:00
yangxiao 9d2fca6d34 fix cull face for render queue 2015-11-09 10:42:12 +08:00
pandamicro e6022b2a92 Merge pull request #14337 from xiaofeng11/v3 
Update version number & RELEASE_NOTES.md, prepare 3.9 release
 2015-11-06 21:43:55 +08:00
XiaoFeng 4cf252475b update RELEASE_NOTES.md 2015-11-06 21:41:34 +08:00
XiaoFeng 7a0d014194 update file 2015-11-06 21:08:47 +08:00
XiaoFeng c0c35c603e Update version number & RELEASE_NOTES.md, prepare 3.9 release 2015-11-06 18:38:09 +08:00
pandamicro 101962559e Merge pull request #14331 from chengstory/UpdateWebSubmodule 
[ci skip] Update web submodule to latest.
 2015-11-06 12:56:55 +08:00
zhangcheng 8183d34b68 revert old timelineParser-2.x.js and add "||false" to it. 2015-11-06 12:50:36 +08:00
zhangcheng 76ed15591f Update web submodule to latest. 2015-11-06 11:56:45 +08:00
pandamicro b79957b11f Merge pull request #14330 from xiaofeng11/v3 
Fix when leave "ComponentTest" scene, background music still go on playing in lua-test under Android system
 2015-11-06 11:45:50 +08:00
XiaoFeng 668558b99f Fix when leave "ComponentTest" scene, background music still go on playing in lua-test under Android system 2015-11-06 11:38:41 +08:00
pandamicro 81cb13a159 Merge pull request #14328 from xiaofeng11/v3 
Fix "TextureCache Test" in js-test crash under Android
 2015-11-06 10:56:31 +08:00
XiaoFeng 139d8b5310 Remove unused code 2015-11-06 10:10:09 +08:00
XiaoFeng 1a56668cd3 Fix "TextureCache Test" in js-test crash under Android 2015-11-06 09:49:19 +08:00
pandamicro f0ff71813d Merge pull request #14324 from super626/v3 
fix bug: updateVerticesForLOD always update vertices to vertex buffer
 2015-11-05 18:47:01 +08:00
yangxiao 3016bf696a fix updateVerticesForLOD 2015-11-05 15:18:46 +08:00
pandamicro ac0a0ed3bb Merge pull request #14319 from CocosRobot/update_lua_bindings_1446635086 
[ci skip][AUTO]: updating luabinding & jsbinding automatically
 2015-11-05 10:53:12 +08:00
CocosRobot f7803cba19 [ci skip][AUTO]: updating luabinding & jsbinding automatically 2015-11-04 11:09:49 +00:00
pandamicro 9d9e5370d0 Merge pull request #14314 from yinjimmy/template_bugfix 
Template : fix link libraries for iOS
 2015-11-04 19:01:23 +08:00
pandamicro b4277e77d5 Merge pull request #14317 from chengstory/UpdateSubmodule 
[ci skip][AUTO]:Update web submodule to latest.
 2015-11-04 19:00:55 +08:00
zhangcheng 08f104079e Update web submodule to latest.(include https://github.com/cocos2d/cocos2d-html5/pull/3172) 2015-11-04 18:53:25 +08:00
pandamicro 78ae7d15ea Merge pull request #14315 from mogemimi/fix-docs-grammar 
Fix minor grammar and typo in documentation
 2015-11-04 18:49:43 +08:00
yinjimmy 7f10d6d894 Template: keep compatibility 2015-11-04 18:26:59 +08:00
mogemimi a31cce9a80 Fix minor grammar and typo in documentation 2015-11-04 17:14:00 +09:00
pandamicro 7d93b419fd Merge pull request #14303 from xiaofeng11/v3_fix 
Fix ComponentTest in la-test can not load lua file under iOS & Android
 2015-11-04 13:52:14 +08:00
pandamicro e13c9a8d8d Merge pull request #14313 from super626/v3 
Function genMaterial keeps old state block
 2015-11-04 13:45:36 +08:00
yinjimmy 517567c56c Template : fix link libraries 
1. GameController.framework in JS template
2. CFNetwork.framework in Lua template
 2015-11-04 12:19:29 +08:00
yangxiao 16a79ed9df function genMaterial keeps old state block 2015-11-04 11:10:28 +08:00
pandamicro 0469379d66 Merge pull request #14308 from MSOpenTech/v3-win10-fix 
V3 win10 fix
 2015-11-04 10:49:25 +08:00
pandamicro 01fdb60b7d Merge pull request #14311 from natural-law/v3 
[ci skip] Update the reference of submodule cocos2d-console.
 2015-11-04 10:45:35 +08:00
zhangbin 47ea0dfb02 Update the reference of submodule cocos2d-console. 2015-11-04 10:43:30 +08:00
Dale Stammen 11b63fb28a cpp template update 2015-11-03 08:05:32 -08:00
Dale Stammen dfe56769a1 added missing Light3DReader files 2015-11-03 08:04:55 -08:00
pandamicro 4d0098c6be Merge pull request #14299 from mogemimi/fix-docs-typo 
Fix typos in documentation
 2015-11-03 18:12:21 +08:00
pandamicro a74c8ccded Merge pull request #14292 from xiaofeng11/v3 
Fix "BillBoard Test->Rotation Test" won't resume after switch back from background.
 2015-11-03 17:46:34 +08:00
pandamicro 0dabb4cfb7 Merge pull request #14295 from xiaofeng11/v3_xf 
Fix CodeIDE  can not start js project with simulator
 2015-11-03 17:37:01 +08:00
pandamicro 6010879ecf Merge pull request #14305 from pandamicro/v3 
[ci skip] Fix SocketIO test on iOS 9
 2015-11-03 17:27:21 +08:00
pandamicro 6a454d3eba Fix SocketIO test on iOS 9 2015-11-03 17:26:37 +08:00
pandamicro ba96714289 Merge pull request #14302 from liamcindy/v3.9_lightReader 
update for light3d reader
 2015-11-03 16:42:50 +08:00
pandamicro 73a1a8808e Merge pull request #14304 from natural-law/v3 
[ci skip] Update the reference of submodule cocos2d-console.
 2015-11-03 16:13:33 +08:00
zhangbin bfa50de768 Update the reference of submodule cocos2d-console. 2015-11-03 16:06:12 +08:00
XiaoFeng 3223a97b26 Fix ComponentTest in la-test can not load lua file under iOS & Android 2015-11-03 15:49:46 +08:00
pandamicro ef6d25ac5f Merge pull request #14300 from hugohuang1111/update_console 
update sdkbox console
 2015-11-03 14:17:02 +08:00