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

23479 Commits

Author SHA1 Message Date
Dhilan007 837e8665b5 remove redundant LOCAL_STATIC_LIBRARIES 2014-08-28 09:46:09 +08:00
samuele3hu 5dfbdc83b2 Merge branch 'v3-androidmk' of https://github.com/Dhilan007/cocos2d-x into v3_test 
Conflicts:
	cocos/Android.mk
	cocos/editor-support/cocosbuilder/Android.mk
	cocos/ui/Android.mk
 2014-08-28 09:27:30 +08:00
Ricardo Quesada 781b0bc478 properties revert back to 10 2014-08-27 16:35:13 -07:00
Ricardo Quesada 3dda35b4ef Adds `std::nothrow` to `new` 
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
 2014-08-27 16:31:57 -07:00
Ricardo Quesada d265cd488a Merge pull request #7894 from ricardoquesada/render_texture_fix 
Adds ClippingNode bug test case
 2014-08-27 10:55:30 -07:00
Ricardo Quesada dbdd2b3e13 Adds ClippingNode bug test case 2014-08-27 10:54:15 -07:00
Slack-Moehrle 1b5413d8b4 comment out [glview release]; and [eaglview release]; 2014-08-27 10:42:27 -07:00
Slack-Moehrle d4d2b8c83e comment out [glview release]; and [eaglview release]; 2014-08-27 10:26:09 -07:00
samuele3hu 928208f480 Adjust android.mk for cocos2d and related module 2014-08-27 23:26:08 +08:00
Dhilan007 bef774a14a Adjust android.mk for cocos2d and related module 2014-08-27 22:54:28 +08:00
samuele3hu ba8bed8ed9 Adjust android.mk for cocos2d and related module 2014-08-27 22:12:07 +08:00
Dhilan007 9135236bb0 Merge branch 'v3_test' of https://github.com/samuele3hu/cocos2d-x into v3-androidmk 2014-08-27 21:15:57 +08:00
samuele3hu 3d5f8de346 Adjust android.mk for cocos2d and related module 2014-08-27 20:58:32 +08:00
lvlong e05f6bc874 modify for compress 2014-08-27 18:44:31 +08:00
Huabing.Xu c627affa5e add triangles command, make quad command inherit from triangles command 2014-08-27 18:39:49 +08:00
Huabing.Xu 91e332c253 dynamic update index for quad command 2014-08-27 16:43:14 +08:00
minggo 491c32b705 Merge pull request #7890 from minggo/compiling-optimize 
Compiling optimize
 2014-08-27 15:39:08 +08:00
minggo 17ab047b7d fix compiling error on windows 2014-08-27 15:13:41 +08:00
Huabing.Xu c4ecff9804 temp backup 2014-08-27 14:54:35 +08:00
minggo 708fa8f114 [ci skip] 2014-08-27 14:09:06 +08:00
andyque 3d97ddc739 Merge branch 'v3' into addWebView 
Conflicts:
	cocos/ui/Android.mk
 2014-08-27 14:08:16 +08:00
minggo dc5c42a1c9 Merge pull request #7889 from minggo/update-release-note 
[ci skip]update release note
 2014-08-27 14:07:55 +08:00
minggo 78c78d315c update release note 2014-08-27 14:06:54 +08:00
minggo 04bfbdd5a1 fix conflict 2014-08-27 13:50:01 +08:00
minggo 2efd7eef6c Merge pull request #7888 from CocosRobot/update_cocosfiles_1409118024 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-08-27 13:45:02 +08:00
CocosRobot f1914f3fa1 [AUTO][ci skip]: updating cocos2dx_files.json 2014-08-27 05:40:25 +00:00
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
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
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
andyque 631e1a70c4 add WebView-inl.h and refactor Android code 2014-08-26 14:26:37 +08:00
yangxiao 7ff75fb397 remove warning 2014-08-26 14:19:08 +08:00