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

26519 Commits

Author SHA1 Message Date
minggo fcfd33947f [ci skip] 2014-12-04 15:36:09 +08:00
kaile.yin 3f1cb4338a Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3 2014-12-04 15:33:38 +08:00
kaile.yin 743166f50b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
 2014-12-04 15:32:25 +08:00
minggo 10aa9ade99 Merge pull request #9371 from samuele3hu/v3_cocostudio 
[ci skip]Update CocoStudioActionTimelineTest for Lua
 2014-12-04 15:24:17 +08:00
minggo dbf299bec7 [ci skip] Update CHANGELOG 2014-12-04 15:23:38 +08:00
tangziwen 8605595a5b let billboard can rotate in the Z axis 2014-12-04 15:19:41 +08:00
minggo 0d89b9b742 Merge pull request #9368 from huangshiwu/v3_wincpu 
fix win32 high cpu occupancy rate
 2014-12-04 15:17:26 +08:00
samuele3hu 9bf706aef5 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_cocostudio 2014-12-04 15:16:20 +08:00
samuele3hu 781afbec3f Update CocoStudioActionTimelineTest 2014-12-04 15:14:19 +08:00
minggo c217040f61 Merge pull request #9326 from samuele3hu/v3_fi_bindings 
Add support to clang3.4 because of using the ndk-r10c and update bindings-generator submodule
 2014-12-04 15:14:02 +08:00
minggo 71d91e787b Merge pull request #9370 from CocosRobot/update_cocosfiles_1417677182 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-12-04 15:13:40 +08:00
minggo c1866adf4e [ci skip] Update CHANGELOG 2014-12-04 15:13:07 +08:00
CocosRobot b7d553f5db [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-04 07:13:03 +00:00
minggo 0badda268a Merge pull request #9366 from Dhilan007/v3-33rc1 
Fixed label may show nothing when using system font on Mac
 2014-12-04 15:11:50 +08:00
minggo 8cd8a6d7b9 Merge pull request #9365 from andyque/updateExternalConfig 
update external config to v3-deps-28.zip
 2014-12-04 15:09:02 +08:00
huangshiwu 1212b4a6e9 fix win32 high cpu occupancy rate 2014-12-04 14:33:17 +08:00
andyque 8a5c78b213 update external config to v3-deps-28.zip and update cocos2d-x version to rc2 2014-12-04 14:23:44 +08:00
minggo 3faeee66e3 Merge pull request #9358 from cocoscodeide/v3 
merge runtime to v3
 2014-12-04 14:00:17 +08:00
honghui 2aa05bff39 revert file commit by mistake 2014-12-04 13:53:55 +08:00
minggo 7fd037c416 Merge pull request #9359 from super626/v3 
Initialize variable when defined
 2014-12-04 13:40:21 +08:00
minggo de07aafbb6 Merge pull request #9361 from CocosRobot/update_lua_bindings_1417659000 
[AUTO]: updating luabinding automatically
 2014-12-04 13:35:14 +08:00
minggo b319f87c79 Merge pull request #9360 from CocosRobot/update_cocosfiles_1417658898 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-12-04 13:34:59 +08:00
yusheng.lu 51220a200f Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-12-04 13:12:19 +08:00
CocosRobot 0c54f8f7a0 [AUTO]: updating luabinding automatically 2014-12-04 02:11:58 +00:00
minggo d179ced1b4 [ci skip] Update CHANGELOG 2014-12-04 10:08:43 +08:00
CocosRobot 918372556b [AUTO][ci skip]: updating cocos2dx_files.json 2014-12-04 02:08:20 +00:00
minggo a86bfbf6b0 Merge pull request #9330 from pipu/v3_flatbuffers 
newest V3 flatbuffers
 2014-12-04 10:06:42 +08:00
XiaoYang 71077e6f65 Merge pull request #170 from tangziwen/v3 
avoid the case that "hasAmbient" use before assign
 2014-12-04 09:51:22 +08:00
Ricardo Quesada 803d0a268e By default, use "dwarf with dSYM file" in cpp-tests 2014-12-03 15:07:34 -08:00
youyou 4af869fdeb update make file 2014-12-03 18:47:41 +08:00
pipu deda1a8f43 Modify external/config.json 2014-12-03 18:09:04 +08:00
yangxiao f17df4b0bc add createAsync 2014-12-03 17:40:27 +08:00
Wenhai Lin ed86f65270 Fixed label may show nothing when using system font on Mac 2014-12-03 17:07:51 +08:00
minggo 8080a585cb Merge pull request #9357 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2014-12-03 16:49:16 +08:00
zhangbin 79a7ca6516 Update the reference of submodule cocos2d-console. 2014-12-03 16:40:42 +08:00
pipu a3fcd28118 revert submodule cocos2d-console 2014-12-03 16:17:36 +08:00
pipu b6d590d4e8 revert submodule plugin 2014-12-03 16:16:43 +08:00
pipu f876677fbb revert submodule binding-generator 2014-12-03 16:13:38 +08:00
kaile.yin b4612447f3 change tab to 4 space 2014-12-03 16:12:44 +08:00
tangziwen da8dc13601 avoid the case that "hasAmbient" use before assign 2014-12-03 16:00:52 +08:00
kaile.yin 9d49f82eb9 Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3 
Conflicts:
	tools/tolua/cocos2dx.ini
 2014-12-03 16:00:32 +08:00
pipu 6d764bc2c8 Merge branch 'v3' into v3_flatbuffers 
Conflicts:
	tools/cocos2d-console
 2014-12-03 15:47:03 +08:00
pipu 6a64b867df Modify bugs that parse resource path for ButtonReader, CheckBoxReader, ImageViewReader, LayoutReader, LoadingBarReader, PageViewReader, ScrollViewReader, SliderReader 2014-12-03 15:24:21 +08:00
kaile.yin fd69a5efc3 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-12-03 15:22:46 +08:00
huangshiwu ca10211b25 modify Clipping to RenderTexture Test to get correct behavior 2014-12-03 14:17:42 +08:00
minggo 0d1baf4037 Merge pull request #9327 from samuele3hu/v3_manual_bindings 
Add more useful trace back info when got invalid arguments by calling functions
 2014-12-03 14:17:16 +08:00
minggo 77b5c40283 Merge pull request #9224 from pjc0247/v3 
fix C4129 warning
 2014-12-03 14:15:38 +08:00
minggo 4bee194a0b Merge pull request #9285 from huangshiwu/v3_drawpolygon 
DrawNode::drawPolygon refactor
 2014-12-03 14:06:48 +08:00
minggo 2e45d7d0d6 Merge pull request #9302 from samuele3hu/v3_test 
Fix some errors about cpp-tests and lua-tests
 2014-12-03 14:05:50 +08:00
minggo f13f649a7b Merge pull request #9306 from super626/v3 
refactor bundle
 2014-12-03 14:04:59 +08:00