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

22781 Commits

Author SHA1 Message Date
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
Jialong Zhai 012f5403d9 protected -> CC_CONSTRUCTOR_ACCESS 2014-07-21 11:17:58 +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
pandamicro b614854cf9 Refactor #5580: Improve createDirectories 2014-07-18 15:09:00 +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
Huabing.Xu 8afd7614d1 Merge branch 'v3' into v3_dll 2014-07-18 14:01:17 +08:00
Huabing.Xu dbb3e0ac2e copy dylib to *.app bundle 2014-07-18 14:00:14 +08:00
minggo 21647839b6 Merge pull request #7515 from Dhilan007/v3-320final 
fixed warn and replace 'printf' with 'log';
 2014-07-18 13:56:54 +08:00
LinWenhai c10e49201d fixed compil 2014-07-18 13:44:07 +08:00
minggo 9409a73a06 Merge pull request #7511 from Mazyod/const-data-copy 
[FIX]: copied data should be const
 2014-07-18 11:35:09 +08:00
Dhilan007 5d22bca240 fixed warn and replace 'printf' with 'log'; 2014-07-18 10:20:37 +08:00
minggo 2210d1fe87 Merge pull request #7512 from dulangci/v3 
fixed error for setup.py
 2014-07-18 10:05:15 +08:00
minggo 405ea3b7b9 Merge pull request #7510 from MSOpenTech/wp8-v3-fix 
Wp8 v3 shader update
 2014-07-18 10:03:48 +08:00
minggo 935bbdfd22 Merge pull request #7513 from minggo/v3 
[ci skip]update document
 2014-07-18 09:39:53 +08:00
minggo 0879d2b726 update document 2014-07-18 09:35:49 +08:00
minggo e44cd58c8e Merge pull request #7508 from samuele3hu/v3_hot_fix 
Use relative path in the cocos2dxLuaLoader for showing useful msg when lua script trigger errors
 2014-07-18 09:27:43 +08:00
minggo f6b5f8e6ce Merge pull request #7509 from chuanweizhang2013/v3luaruntime 
runtime 1.3.1 fixed log bug
 2014-07-18 09:25:41 +08:00
dulangci 7ada094e1f fixed as follow error 
fixed as follow error:
TypeError: cannot concatenate 'str' and 'NoneType' objects
 2014-07-18 09:18:33 +08:00
Mazyad Alabduljaleel a4b4efff1b [FIX]: copied data should be const 2014-07-18 03:44:39 +04:00
Dale Stammen 24462e1ded updated wp8 precompiled shaders 2014-07-17 09:41:07 -07:00
chuanweizhang2013 3e6dd0b8d2 1.3.1 2014-07-17 09:30:56 -07:00
samuele3hu b482a5e971 Use relative path in the cocos2dxLuaLoader for showing useless msg when lua script trigger errors 2014-07-17 23:53:36 +08:00
Dale Stammen 88da5d5fdb disabled custom shader tests for WP8 2014-07-17 08:13:49 -07:00
minggo ea2165e6ba Merge pull request #7507 from CocosRobot/update_lua_bindings_1405606669 
[AUTO]: updating luabinding automatically
 2014-07-17 22:21:02 +08:00
CocosRobot 8ea5083e32 [AUTO]: updating luabinding automatically 2014-07-17 14:20:04 +00:00
minggo e2aedc05d3 [ci skip] 2014-07-17 22:16:46 +08:00
minggo b92fc24cc4 [ci skip] 2014-07-17 22:13:41 +08:00
minggo ae11f7820a Merge pull request #7506 from samuele3hu/v3_hot_fix 
Update bindings-generator submodule
 2014-07-17 22:09:05 +08:00
minggo f3e106c7ad [ci skip] 2014-07-17 22:08:02 +08:00
minggo 10dc7cc563 [ci skip] 2014-07-17 22:06:24 +08:00
minggo 867fb18c5d Merge pull request #7503 from CaiCQ/v3 
修正Linux下中文显示问题
 2014-07-17 22:05:15 +08:00
samuele3hu d7d1bf037b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix 2014-07-17 21:44:25 +08:00
samuele3hu 059ecffd9c Update bindings-generator submodule 2014-07-17 21:43:10 +08:00
minggo b4c75bb7f5 Merge pull request #7504 from CocosRobot/update_lua_bindings_1405603442 
[AUTO]: updating luabinding automatically
 2014-07-17 21:41:45 +08:00