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

26392 Commits

Author SHA1 Message Date
geron-cn 89c39d3f10 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into armaturenodefix 2014-12-31 04:06:11 +08:00
geron-cn b048b65ae3 make current animation name take effect when autoplay is false 2014-12-31 03:59:36 +08:00
minggo bc77d87a8e Merge pull request #9712 from CocosRobot/update_cocosfiles_1419935693 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-12-30 18:36:32 +08:00
CocosRobot cb7a63b413 [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-30 10:34:54 +00:00
minggo c6077bd6fc Merge pull request #9707 from yinjimmy/bugfix_runtime 
Bugfix runtime
 2014-12-30 18:32:38 +08:00
minggo 70a29a8470 Merge pull request #9709 from htlxyz/v3_origin 
modify widget interface for lua
 2014-12-30 18:32:20 +08:00
Huabing.Xu c60c3fb2b1 refresh uniforms and attributes when access uniform or attribute table 2014-12-30 18:32:09 +08:00
minggo d517831e01 Merge pull request #9699 from super626/fixandroid 
fix background/foreground switch
 2014-12-30 17:07:38 +08:00
htl dce4383357 modify widget interface for lua 2014-12-30 16:45:26 +08:00
minggo d0e003836f Merge pull request #9705 from CocosRobot/update_lua_bindings_1419928121 
[AUTO]: updating luabinding automatically
 2014-12-30 16:43:55 +08:00
minggo 4463403be4 Merge pull request #9706 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2014-12-30 16:41:19 +08:00
CocosRobot f4fbf51905 [AUTO]: updating luabinding automatically 2014-12-30 08:30:45 +00:00
zhangbin 98e24b1cdc Update the reference of submodule cocos2d-console. 2014-12-30 16:28:23 +08:00
minggo ef95b1d52d Merge pull request #9700 from minggo/use-const 
fix some coding style
 2014-12-30 16:24:41 +08:00
minggo 816f5d1144 Merge pull request #9703 from CocosRobot/update_lua_bindings_1419925623 
[AUTO]: updating luabinding automatically
 2014-12-30 16:06:36 +08:00
yinjimmy 2652a67040 cleanup 2014-12-30 16:02:05 +08:00
yinjimmy d986c974d7 compatible code 2014-12-30 16:01:47 +08:00
yinjimmy 4c57a29455 fix: init config on all platform & stop runtime when exit 2014-12-30 15:59:52 +08:00
CocosRobot 5b8492770e [AUTO]: updating luabinding automatically 2014-12-30 07:49:45 +00:00
minggo 869a9bb0a9 Merge pull request #9652 from lite3/patch-2 
fix incorrect font path
 2014-12-30 15:43:31 +08:00
Huabing.Xu b92802a770 optimise Renderer::fillQuads() 2014-12-30 15:07:50 +08:00
Huabing.Xu 6576c16fe1 optimise QuadCommand::init() 2014-12-30 14:21:33 +08:00
minggo 538be7d973 Merge pull request #9693 from doomsdayer/v3_version 
Feature of version check.
 2014-12-30 13:56:16 +08:00
minggo 69636dc8f5 Merge pull request #9698 from CocosRobot/update_lua_bindings_1419911433 
[AUTO]: updating luabinding automatically
 2014-12-30 13:51:43 +08:00
minggo ba4ae50868 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into use-const 2014-12-30 13:36:10 +08:00
minggo da8c007932 add const for Sprite::getTextureRect() and do some format 2014-12-30 11:55:54 +08:00
yangxiao 3377c3ee53 fix #9689 2014-12-30 11:54:53 +08:00
CocosRobot ed7823c08b [AUTO]: updating luabinding automatically 2014-12-30 03:52:26 +00:00
yangxiao bfb577e385 fix ##9689 2014-12-30 11:48:39 +08:00
minggo c78bf0f7aa Merge pull request #9668 from pandamicro/v3_origin 
Added restart game feature and getSearchPaths API in Manifest
 2014-12-30 11:47:51 +08:00
Huabing.Xu 485c72651d exextract updateUniformsAndAttributes 2014-12-30 11:13:14 +08:00
yusheng.lu 9a0f302370 revert the layoutComponent codes to prevent the demos crush. 2014-12-30 10:47:00 +08:00
yusheng.lu e5961047aa Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_version 
Conflicts:
	cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp
 2014-12-30 10:42:54 +08:00
yusheng.lu 88f0a1e642 prevent the crush of the cocosstudio demos 2014-12-30 10:33:07 +08:00
pandamicro 5755cc69e9 Fix a small compilation issue 2014-12-30 10:11:30 +08:00
pandamicro ffd7c30c87 Polish restart implementation 2014-12-30 10:09:56 +08:00
minggo 3c1978fcc3 Merge pull request #9611 from super626/quaternion 
Rotation With Quaternion
 2014-12-30 10:09:08 +08:00
minggo 73a39d0966 Merge pull request #9688 from pipu/modify_warning 
Modify warning code.
 2014-12-30 10:07:41 +08:00
minggo f3d91f8b79 Merge pull request #9692 from dabingnn/v3_perf 
optimize rendering code
 2014-12-30 10:07:17 +08:00
yusheng.lu 505a4e8ab0 Feature of version check. When reading a csb file, if the engine's reader version dismatch the version saved in the csb file, an assert will be triggered. User must go to a website to get a reader to match the csb file. 
Removed the version compatible control code before.
 2014-12-29 19:37:53 +08:00
Huabing.Xu 2348e5c247 optimize rendering code 2014-12-29 18:45:55 +08:00
pipu d3783cba95 Modify warning code. 2014-12-29 17:04:23 +08:00
XiaoYang e8c5e74759 Merge pull request #198 from sifenzhu/v3 
Merge pull request #2 from super626/v3
 2014-12-29 15:47:47 +07:00
Thomas Hou cfa9f039ec change light direct for good look. 2014-12-29 16:43:48 +08:00
Thomas Hou 1502d32aac use std math library M_PI instead of pi. 2014-12-29 16:24:31 +08:00
minggo 6cac4dd512 Merge pull request #9685 from CocosRobot/update_lua_bindings_1419832193 
[AUTO]: updating luabinding automatically
 2014-12-29 16:04:35 +08:00
minggo 7db279220c Merge branch 'quaternion' of https://github.com/super626/cocos2d-x into v3 2014-12-29 15:04:43 +08:00
yangxiao 060c6ee0b7 add quaternion test 2014-12-29 14:36:25 +08:00
minggo 3f5c089106 Merge pull request #9684 from CocosRobot/update_cocosfiles_1419832109 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-12-29 14:13:03 +08:00
CocosRobot 75436db583 [AUTO]: updating luabinding automatically 2014-12-29 05:51:45 +00:00