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

22193 Commits

Author SHA1 Message Date
andyque 1f4c289db4 fix scale9Sprite addChild zorder issue 2014-07-22 16:26:40 +08:00
minggo 14ab7f2419 Merge pull request #7543 from chengstory/v3_CocosStudioSurpport 
1. CocosStudio adapt to cocos2d-x v3.2.
 2014-07-22 16:19:45 +08:00
samuele3hu 386b4a2f42 Update bindings-generator submodule 2014-07-22 11:16:40 +08:00
samuele3hu aa0308a7c8 Add more useful tip for error log 2014-07-22 11:16:16 +08:00
zhangcheng 76c12e9029 1. add export to function CocosGUIVersion() 2014-07-22 10:02:00 +08:00
cai wenzhi d14522880d Fixed bug of NodeReader 2014-07-21 22:45:33 +08:00
zhangcheng bc254cab25 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_CocosStudioSurpport 2014-07-21 20:46:55 +08:00
minggo 86cb128646 Merge pull request #7544 from dabingnn/v3_fixmac32bit 
change define macros to avoid run error on mac 32 bit
 2014-07-21 18:19:35 +08:00
Huabing.Xu 3403182f3e change define macros to avoid run error on mac 32 bit 2014-07-21 18:12:46 +08:00
zhangcheng 6cfc5b72dc 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
minggo 8e3220ba9e Merge pull request #7533 from dabingnn/v3_windowsDllCompileError 
fix windows compile error
 2014-07-21 17:17:33 +08:00
minggo 0c0096ba7a Merge pull request #7541 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2014-07-21 17:10:54 +08:00
zhangbin 6c8cd00a53 Update the reference of submodule cocos2d-console. 2014-07-21 17:04:40 +08:00
minggo 58ada4ff38 Merge pull request #7540 from CocosRobot/update_cocosfiles_1405932486 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-07-21 16:59:53 +08:00
CocosRobot eee5934b03 [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-21 08:48:07 +00:00
minggo 9e9eebe084 Merge pull request #7539 from minggo/v3 
igmore fbx-conv
 2014-07-21 16:46:42 +08:00
minggo 60922ae604 igmore fbx-conv 2014-07-21 16:40:34 +08:00
minggo 8cbe33cf99 Merge pull request #7536 from reneklacan/v3 
Name change in AUTHORS
 2014-07-21 16:23:21 +08:00
Rene Klacan f7dacaca63 name change in authors 2014-07-21 10:16:35 +02:00
samuele3hu d9dc6ea2f7 Reset Webscoket 2014-07-21 16:05:10 +08:00
samuele3hu 5e773edb28 Merge branch 'more_details_for_conversion_error_msg' of https://github.com/edwardzhou/cocos2d-x into v3_conversion 2014-07-21 16:01:56 +08:00
minggo 02b18be552 Merge pull request #7522 from Dhilan007/v3-fbx-conv 
Update download-deps.py for download fbx-conv
 2014-07-21 15:38:33 +08:00
Huabing.Xu e666ab88ed fix windows compile error 2014-07-21 14:59:47 +08:00
minggo 42eb69655e [ci skip] 2014-07-21 14:57:06 +08:00
minggo a278642ecc [ci skip] 2014-07-21 13:57:20 +08:00
minggo 7ba4f2ed5e Merge pull request #7526 from chenguangqi/v3 
fixed compile error.
 2014-07-21 13:54:31 +08:00
minggo 4d78dd60c2 Merge pull request #7527 from chenguangqi/v3 
Fixed error for importing project
 2014-07-21 12:03:40 +08:00
Dhilan007 112f973e12 update config.json 2014-07-21 11:58:38 +08:00
minggo 258fbbfae6 Merge pull request #7531 from CocosRobot/update_lua_bindings_1405914966 
[AUTO]: updating luabinding automatically
 2014-07-21 11:58:32 +08:00
minggo 1c80d479eb Merge pull request #7530 from CocosRobot/update_cocosfiles_1405914895 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-07-21 11:58:12 +08:00
CocosRobot 30b00dadd8 [AUTO]: updating luabinding automatically 2014-07-21 03:57:41 +00:00
CocosRobot afe3760aa0 [AUTO][ci skip]: updating cocos2dx_files.json 2014-07-21 03:54:57 +00:00
minggo 45fa2363e8 Merge pull request #7517 from dabingnn/v3_dll 
V3 dll
 2014-07-21 11:53:36 +08:00
edwardzhou bf4143b5a3 show detail class & function name on conversion error 2014-07-21 09:39:41 +08:00
edwardzhou 0f2fde38fa Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-07-21 09:36:18 +08:00
陈广歧 5063ec465b Fixed error for importing project 
fixed error for importing android project to Eclipse

```
The import org.cocos2dx.lib cannot be resolved ...
```
 2014-07-19 19:35:30 +08:00
陈广歧 2d5bab6b86 fixed error for importing android project to Eclipse 
```
The import org.cocos2dx.lib cannot be resolved ...
```
 2014-07-19 19:27:40 +08:00
陈广歧 8b4953bbfc fixed compile error. 
```bash
# compile for android.
$ ./build_native.py
```

Error message as follow:

```
ssize_tjni/../../cocos2d/cocos/./3d/CCBundleReader.cpp:94:23: error: return type of out-of-line
      definition of 'cocos2d::BundleReader::tell' differs from that in the declaration
ssize_t BundleReader::tell()
                      ^
jni/../../cocos2d/cocos/./3d/CCBundleReader.h:90:14: note: previous declaration is here
    long int tell();
             ^
1 error generated.
```
 2014-07-19 18:29:52 +08:00
Dhilan007 612a3e9691 Add fbx-conv in 3rd-party-libs-bin's management. 
Add fbx-conv for creates archive.
 2014-07-18 18:38:57 +08:00
minggo 6fe58b4153 [ci skip] 2014-07-18 18:38:16 +08:00
minggo e128a432c1 Merge pull request #7521 from andyque/fixTextFieldDeleteBug 
fix TextField backspace delete bug
 2014-07-18 18:37:07 +08:00
andyque 73b38fbc6b fix TextField backspace delete bug 2014-07-18 18:13:17 +08:00
minggo b347c93f47 Merge pull request #7520 from andyque/fixListViewInsertAtIndexBug 
fix listview insert child at index bug
 2014-07-18 18:09:49 +08:00
minggo da6b8aae3d [ci skip] 2014-07-18 18:09:20 +08:00
andyque 4fa1af584c fix listview insert child at index bug 2014-07-18 18:02:46 +08:00
minggo aef1e01ce5 Merge pull request #7518 from natural-law/android-dependencies 
Android dependencies
 2014-07-18 17:57:42 +08:00
Huabing.Xu 0be2210724 rename CGSize to NSSize 2014-07-18 16:51:29 +08:00
edwardzhou 6b9e79629f Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-07-18 15:36:54 +08:00
Huabing.Xu 23db16b0bd convert indention to space 2014-07-18 14:53:00 +08:00
Huabing.Xu 1dc3552916 rename product name to $(TARGET_NAME) 2014-07-18 14:41:21 +08:00