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

24595 Commits

Author SHA1 Message Date
minggo d0ca9a4da5 remove unneeded include header files 2014-08-27 13:39:50 +08:00
minggo ac029c3d0d Merge pull request #7887 from super626/v3 
2d cull only for default camera
 2014-08-27 13:39:13 +08:00
yangxiao 26f7345693 2d cull only for default camera 2014-08-27 12:09:23 +08:00
minggo 0d5b792dce Merge pull request #7885 from samuele3hu/v3_test 
Module integration on the win32 platform and remove some useless projects
 2014-08-27 12:04:06 +08:00
samuele3hu 7a9a16d6aa Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_test 2014-08-27 11:11:21 +08:00
samuele3hu 106cb2e110 Update external config.json 2014-08-27 11:07:41 +08:00
yangxiao c5515874d5 merge cocos 2014-08-27 11:00:14 +08:00
samuele3hu 471820568f Update android.mk of cocos and lua-templates 2014-08-27 10:28:04 +08:00
samuele3hu 3759648d3a Remove the useless aneroid.mk files 2014-08-27 10:21:47 +08:00
samuele3hu a5a706aa05 Remove the useless win32 project 2014-08-27 10:20:15 +08:00
samuele3hu 33fd605a16 Adjust libcocos2d and libluacocos2d on the win32 platform and adjust related test cases. 2014-08-27 10:18:44 +08:00
minggo 31f406bbdd Merge pull request #7884 from minggo/cocos2dxrendererjava-onpause-fix 
invoke nativeOnPause after onSurfaceCreated is invoked
 2014-08-27 10:17:42 +08:00
minggo d290076917 invoke nativeOnPause after onSurfaceCreated is invoked 2014-08-27 10:13:03 +08:00
andyque 4597de069d improve test case and make program more robust 2014-08-27 08:02:22 +08:00
giginet d07903827d Add the feature that CCSSceneReader can load name properties as node names. 
When name property of objects on CocosStudio Scene are set.
They will be loaded and set as Node::name property.

Thanks to this commit. We are enable to access to each nodes on scene via its names.

```cpp
auto scene = cocos2d::cocostudio::SceneReader::getInstance()->createNodeWithSceneFile("Scene.json");
auto object = scene->getChildByName<cocos2d::Sprite *>("objectName");
```
 2014-08-27 03:49:07 +09:00
andyque fc3a30b9ca modify cmakeList.txt 2014-08-26 23:25:07 +08:00
andyque 84c5542a0e Merge branch 'v3' into addWebView 2014-08-26 22:11:35 +08:00
andyque 9449152caf finish WebView Tests 2014-08-26 22:03:55 +08:00
minggo b9c51e6994 remove unneeded codes 2014-08-26 18:19:28 +08:00
andyque 15815118a2 finish android version 2014-08-26 16:53:37 +08:00
minggo 3d4f22ca74 add cocos2d.h into pre-compiled header 2014-08-26 16:45:24 +08:00
songchengjiang 0bfa76b375 Merge branch 'billboard' of https://github.com/super626/cocos2d-x into billboard 2014-08-26 15:09:56 +08:00
yangxiao 8a38ce10be first version billboard 2014-08-26 15:07:37 +08:00
yangxiao 7d6b8ea706 merge cocos 2014-08-26 14:58:58 +08:00
minggo c935a39090 Merge pull request #7879 from dabingnn/v3_fixLabelStatus 
fix LabelStatus string error when labelStatus is recreated
 2014-08-26 14:51:08 +08:00
minggo ec9980b0b0 Merge pull request #7878 from super626/v3 
Remove animation3D warning
 2014-08-26 14:50:50 +08:00
yangxiao 65b0cca132 Merge branch 'light' of https://github.com/super626/cocos2d-x into light 2014-08-26 14:37:56 +08:00
XiaoYang 605a7935ab Merge pull request #115 from songchengjiang/light 
Light Shader Optimization
 2014-08-26 14:37:34 +08:00
andyque 631e1a70c4 add WebView-inl.h and refactor Android code 2014-08-26 14:26:37 +08:00
songchengjiang 3369bb7e51 Replaced Tab Format 2014-08-26 14:25:01 +08:00
yangxiao 7ff75fb397 remove warning 2014-08-26 14:19:08 +08:00
songchengjiang cf964d62de Light Shader optimization 2014-08-26 14:18:22 +08:00
yangxiao 03390a4f46 merge cocos 2014-08-26 14:05:59 +08:00
minggo e09d705280 Merge pull request #7875 from super626/v3 
name of Reskin Model modified to english
 2014-08-26 13:36:33 +08:00
andyque e12db46866 fix style 2014-08-26 12:08:26 +08:00
andyque 2226d4b420 change WebView namespace and add WebViewTest 2014-08-26 11:39:56 +08:00
yangxiao 2c6c89e0e9 add .vert to project 2014-08-26 11:19:38 +08:00
andyque 736b83acb1 Merge branch 'add_webview' of https://github.com/gin0606/cocos2d-x into addWebView 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-08-26 10:56:10 +08:00
XiaoYang 545047e886 Merge pull request #114 from songchengjiang/light 
repaired Action BUG
 2014-08-26 09:44:52 +08:00
songchengjiang 3d59aaf86e Replaced Tab Format 2014-08-26 09:43:11 +08:00
yangxiao 28376ff6aa reset 2014-08-25 21:50:34 +08:00
yangxiao cff5b65314 Merge branch 'newcode' into v3 2014-08-25 21:20:49 +08:00
yangxiao dd93439c4b replace model 2014-08-25 19:25:51 +08:00
Huabing.Xu ef472d6250 fix LabelStatus string error when labelStatus is recreated 2014-08-25 17:19:45 +08:00
songchengjiang 00085c157f Added skeleton Model 
Light On/Off
 2014-08-25 16:32:15 +08:00
minggo dad69ae62a Merge pull request #7874 from CocosRobot/update_cocosfiles_1408949829 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-08-25 14:58:13 +08:00
CocosRobot 8d88109db7 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-25 06:57:10 +00:00
minggo 37aeb5b114 Merge pull request #7872 from samuele3hu/v3_3_new_module 
Integrate all modules into cocos2d and related luacocos2d and adjust the related test cases
 2014-08-25 14:55:46 +08:00
samuele3hu 07cf4d3526 Fix the win32 and android compile error 2014-08-25 14:10:13 +08:00
gin0606 41011824c1 Add WebView to libui Android 2014-08-25 15:01:37 +09:00