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

20909 Commits

Author SHA1 Message Date
lvlong c1fd9adebf Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-06-17 13:59:25 +08:00
minggo b88edf4058 Merge pull request #7093 from CocosRobot/update_cocosfiles_1402984224 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-06-17 13:59:07 +08:00
lvlong ef32bffceb modify bundle3D load() 2014-06-17 13:59:03 +08:00
minggo a640557f88 Merge pull request #7095 from CocosRobot/update_cocosfiles_1402984705 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-06-17 13:58:58 +08:00
CocosRobot 7f9c86ab44 [AUTO][ci skip]: updating cocos2dx_files.json 2014-06-17 05:58:26 +00:00
minggo f79561c135 Merge pull request #7094 from CocosRobot/update_lua_bindings_1402984310 
[AUTO]: updating luabinding automatically
 2014-06-17 13:57:09 +08:00
CocosRobot 657b90422d [AUTO]: updating luabinding automatically 2014-06-17 05:53:04 +00:00
minggo 7ebb639763 [ci skip] 2014-06-17 13:51:11 +08:00
yangxiao fd02a914f4 remove unused code 2014-06-17 13:50:58 +08:00
CocosRobot c4d98f43b0 [AUTO][ci skip]: updating cocos2dx_files.json 2014-06-17 05:50:25 +00:00
minggo a2a6a4e70a Merge pull request #7087 from MSOpenTech/wp8-v3-template 
Wp8 v3 template and missing texture after app switch fixes
 2014-06-17 13:49:24 +08:00
yangxiao ad5d270099 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-06-17 13:47:44 +08:00
yangxiao 17854cd922 change speed 2014-06-17 13:45:58 +08:00
yangxiao b9824e1778 remove external from include path 2014-06-17 21:16:32 +08:00
minggo 418a1f77d9 Merge pull request #7092 from CocosRobot/update_cocosfiles_1402983515 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-06-17 13:39:21 +08:00
CocosRobot 0bbce49012 [AUTO][ci skip]: updating cocos2dx_files.json 2014-06-17 05:38:36 +00:00
minggo 5a91b4040c Merge pull request #7091 from Dhilan007/v3 
fixed can't move app to SD card after installed on android.
 2014-06-17 13:37:06 +08:00
Huabing.Xu 7b1cf57914 Merge branch 'v3' of github.com:super626/cocos2d-x into v3Animation 2014-06-17 13:26:12 +08:00
Huabing.Xu f0fd7897be update template 2014-06-17 13:25:05 +08:00
Dhilan007 648e7767d4 fixed can't move app to SD card after installed on android. 2014-06-17 12:03:20 +08:00
2youyou2 d2a6782a9e fixed start frame not right 2014-06-17 11:45:57 +08:00
minggo 53963a2441 issue #4693:enumerateChildren() support regular expression 2014-06-17 11:43:03 +08:00
yangxiao bed1e3dc0d Merge branch 'newcode' into v3 2014-06-17 11:18:24 +08:00
2youyou2 7ee90b4114 add performance test 2014-06-17 11:13:46 +08:00
yangxiao ae180d8326 merge 2014-06-17 11:02:05 +08:00
lvlong 020d6da43c Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-06-17 10:53:47 +08:00
lvlong ae5965f05f test new version and modify vs2012 project 2014-06-17 10:52:55 +08:00
yangxiao 189fbb7071 resolve conflict 2014-06-17 10:52:48 +08:00
yangxiao fb7fc23ee9 refactor code 2014-06-17 10:49:52 +08:00
minggo d6dae3281e [ci skip] 2014-06-17 10:33:00 +08:00
Huabing.Xu 07ec5970fb 1. using external/json folder for rapidjson 
2. linux works now
 2014-06-16 19:18:02 -07:00
Dale Stammen 5d85d93ef3 added script to copy angle dlls for testing new versions of angle 2014-06-16 10:36:50 -07:00
Dale Stammen 1a5d148d8e updated template code 2014-06-16 10:29:40 -07:00
Dale Stammen 753167b5f2 updated xaml resources 2014-06-16 09:25:35 -07:00
Dale Stammen b66269d85d Merge branch 'v3' into wp8-v3-template 2014-06-16 09:11:27 -07:00
yangxiao 10a49523b9 fix cache, android work 2014-06-16 23:43:07 +08:00
yangxiao 452fdc047a Merge branch 'newcode' into v3 2014-06-16 22:36:01 +08:00
yangxiao 7ae06d44a6 cache work 2014-06-16 20:58:13 +08:00
yangxiao 9acd373a0e make girl up 2014-06-16 19:41:10 +08:00
lvlong d587971c09 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-06-16 19:35:35 +08:00
lvlong 32cc5b12d6 ready 2014-06-16 19:30:45 +08:00
yangxiao 36808abb72 simplify shader 2014-06-16 19:23:51 +08:00
yangxiao 531f8998a1 skincache 2014-06-16 19:17:07 +08:00
lvlong 4b7f6a6185 static Sprite3D is ok 2014-06-16 19:08:43 +08:00
yangxiao 2c6f7b63d1 avoid reopen file 2014-06-16 18:46:58 +08:00
yangxiao 0c07b05e1d remove unused code 2014-06-16 18:36:30 +08:00
yangxiao c00cdd0ae3 use bone dirtyflag 2014-06-16 18:22:32 +08:00
yangxiao 927d29f334 bug on Repeat when diff bigger than duration 2014-06-16 18:21:47 +08:00
2youyou2 02363c2ae4 read visible property 2014-06-16 17:20:59 +08:00
yangxiao bc31d6b082 merge lv 2014-06-16 16:45:43 +08:00