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

20760 Commits

Author SHA1 Message Date
minggo ec632a54b2 [ci skip] 2014-06-17 18:50:47 +08:00
minggo 552c3cbb2f [ci skip] 2014-06-17 18:42:10 +08:00
minggo caafc0ebc5 [ci skip] 2014-06-17 18:38:33 +08:00
minggo 5668674cc0 Merge pull request #7097 from andyque/fixDoxygenProblem 
fix doxygen
 2014-06-17 17:29:12 +08:00
andyque 62c4c9a69f fix doxygen 2014-06-17 17:31:54 +08:00
Huabing.Xu 605b3517f0 roll back submodule plugin 2014-06-17 16:41:10 +08:00
Huabing.Xu 77091cad8b Merge branch 'v3' of github.com:super626/cocos2d-x into v3Animation 2014-06-17 16:37:03 +08:00
Huabing.Xu 8efaf11a85 roll back submodule of bindings-generator and cocos2d-console 2014-06-17 16:35:25 +08:00
minggo 4da24dfade issue #4693: correct comment 2014-06-17 16:21:24 +08:00
kyokomi b6ed783b0b fix use raw char* to represent string. 2014-06-17 17:05:44 +09:00
kyokomi 3f7cecaf8b fix move this enum class to private part and change `Type` to `FontType`. 2014-06-17 16:34:54 +09:00
yangxiao e1fb8c82f0 missing include 2014-06-17 15:31:45 +08:00
yangxiao 6c39dc0e18 adjust includes 2014-06-17 15:28:14 +08:00
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
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
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