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

29824 Commits

Author SHA1 Message Date
jianglong0156 fd05998b5f fix the bug: shader in jsb can not run correctly. 2015-05-25 17:48:34 +08:00
jianglong0156 f1145139ac fix js resource path in code 2015-05-25 17:02:26 +08:00
Bin Zhang c491b6a5c1 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-05-25 17:01:29 +08:00
Huabing.Xu c22a8e81ce Merge branch 'v3' into v3FrameBufferObject 2015-05-25 16:56:22 +08:00
Bin Zhang 3298145eb5 Support build & run Android Studio project in console. 2015-05-25 16:53:36 +08:00
jianglong0156 6e27825dec add web shader resource 2015-05-25 16:51:58 +08:00
minggo 35533abec0 [ci skip]update CHANGELOG 2015-05-25 16:51:46 +08:00
jianglong0156 82c5fbbc76 add js resource for web tests 2015-05-25 16:50:27 +08:00
minggo 41f84c9f11 [ci skip]update CHANGELOG 2015-05-25 16:50:25 +08:00
minggo bcc1bf8d32 Merge pull request #11983 from dabingnn/v3_SpriteWithTrianglesCommand 
use trianglescommand for sprite
 2015-05-25 16:48:22 +08:00
CocosRobot 7fa68d9b3a [AUTO]: updating luabinding & jsbinding automatically 2015-05-25 08:37:59 +00:00
andyque c7d698362f add JSB to jenkins 2015-05-25 16:37:08 +08:00
minggo 6f9ab33995 Merge pull request #12009 from CocosRobot/update_cocosfiles_1432542713 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-05-25 16:34:00 +08:00
minggo 999de9072a Merge pull request #12003 from minggo/remove-unneeded-function 
remove uneeded function
 2015-05-25 16:33:38 +08:00
minggo 42fba34d62 [ci skip]update CHANGELOG 2015-05-25 16:32:52 +08:00
CocosRobot eea661a5c2 [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-25 08:31:54 +00:00
minggo 273ac5d00a Merge pull request #12002 from WenhaiLin/v3-texturecache-unbindfix 
Fixed TextureCache::unbindImageAsync fails to unbind all asynchronous callback for a specified bound image.
 2015-05-25 16:29:43 +08:00
andyque a6a5318e13 add js win32 test 2015-05-25 16:22:43 +08:00
Felix J d5a7163b29 don't update content size if not necessary 
refactor a little so we don't need to update the content size if bmfont is used, but still updating the _fontSize.
 2015-05-25 14:45:26 +07:00
minggo dae2ca14d3 Merge pull request #12005 from CocosRobot/update_cocosfiles_1432538172 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-05-25 15:20:46 +08:00
minggo ca3c42362b [ci skip]update CHANGELOG 2015-05-25 15:20:13 +08:00
minggo 203203a92d Merge pull request #12001 from andyque/upgrade-rapidjson-to-1.0.2 
upgrade rapidjson to 1.0.2
 2015-05-25 15:18:15 +08:00
CocosRobot 88c4ed664b [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-25 07:16:13 +00:00
minggo 4000797ee7 Merge pull request #11854 from samuele3hu/v3_physics3d 
Add Lua bindings for Physics3D and related test case,then update template project
 2015-05-25 15:14:35 +08:00
Felix J 219d8193c4 remove else clause 
Removing the else clause cause BMFont cannot set its font size
 2015-05-25 12:48:56 +07:00
andyque 81070a5299 fix lua project compile error 2015-05-25 13:42:54 +08:00
WenhaiLin 234ad668ec Fixed TextureCache::unbindImageAsync fails to unbind all asynchronous callback for a specified bound image. 2015-05-25 11:47:37 +08:00
andyque 81d562803b upgrade rapidjson to 1.0.2 2015-05-25 11:43:03 +08:00
minggo db0caf68c6 remove uneeded function 2015-05-25 09:50:48 +08:00
samuele3hu 0492323ec8 Update the Lua template 2015-05-24 23:14:23 +08:00
samuele3hu 074216bef9 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_physics3d 
Conflicts:
	templates/lua-template-default/frameworks/runtime-src/Classes/lua_module_register.h
	tests/lua-tests/src/mainMenu.lua
 2015-05-24 22:46:05 +08:00
anniruddh.koppal b2eb946c14 Added MP3 support 2015-05-23 19:13:12 -07:00
子龙山人 49c0b44252 Merge pull request #11988 from andyque/add-vs2015-to-simulator 
fix simulator vs2015 support
 2015-05-23 09:48:32 +08:00
andyque 07eb116fb6 fix lua tests release mode linker issue 2015-05-23 08:48:53 +08:00
minggo 00b15fc3db Merge pull request #11992 from CocosRobot/update_cocosfiles_1432339043 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-05-23 08:06:13 +08:00
minggo cad1b911c4 Merge pull request #11990 from xiaofeng11/v3 
Remove missing resource notice label from all UI widget
 2015-05-23 08:05:45 +08:00
CocosRobot 7879b25cdc [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-22 23:57:26 +00:00
minggo fa6896e2db Merge pull request #11991 from hugohuang1111/v3_gen_fw_libs 
[A] add generate libs and binary template
 2015-05-23 07:54:34 +08:00
hugo 9a9fa7957f [A] add generate libs and binary template 2015-05-22 19:47:16 +08:00
XiaoFeng e94bcbd28c Remove missing resource label from all UI widget 2015-05-22 18:21:59 +08:00
minggo fc252f8e05 Merge pull request #11984 from CocosRobot/update_cocosfiles_1432283191 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-05-22 18:07:14 +08:00
子龙山人 6f72a39eaf Merge pull request #11985 from CocosRobot/update_cocosfiles_1432286362 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-05-22 17:57:18 +08:00
andyque 73902a4063 fix simulator vs2015 support 2015-05-22 17:47:48 +08:00
CocosRobot b9ffada9cc [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-22 09:19:24 +00:00
minggo 311f453ea0 Merge pull request #11973 from dabingnn/v3_fixCameraVisitError 
Fix visiting scene error with multiple camera
 2015-05-22 17:16:30 +08:00
CocosRobot 28e1ac7e14 [AUTO][ci skip]: updating cocos2dx_files.json 2015-05-22 08:26:33 +00:00
minggo 0fa89b94d5 Merge pull request #11979 from CocosRobot/update_lua_bindings_1432277469 
[AUTO]: updating luabinding & jsbinding automatically
 2015-05-22 16:24:19 +08:00
Huabing.Xu 6d9f850e2c use trianglescommand for sprite 2015-05-22 15:54:56 +08:00
Bin Zhang 3d0c716ee9 Add script in build.gradle for sign the release apk. 2015-05-22 15:52:41 +08:00
CocosRobot f18b8bfd95 [AUTO]: updating luabinding & jsbinding automatically 2015-05-22 06:55:54 +00:00