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

17180 Commits

Author SHA1 Message Date
minggo 43d85dc0d7 Merge pull request #5580 from lihex/develop 
rename template config file
 2014-03-06 13:58:39 +08:00
lihex c206384edd rename template config file 2014-03-06 13:56:18 +08:00
James Chen 3ea76abeb7 Merge pull request #5579 from dumganhar/develop 
[travis ci] Adds 'for-each-file-in-dir.sh' for generating file list in cocos2d. CocosRobot will send a PR for that change.
 2014-03-06 13:56:02 +08:00
James Chen dfdb6c4158 [travis ci] Adds 'for-each-file-in-dir.sh' for generating file list in cocos2d. CocosRobot will send a PR for that change. 2014-03-06 13:54:24 +08:00
minggo 6add5372aa Merge pull request #5577 from chuanweizhang2013/update-cocosfile 
update coocs2dx_files.json
 2014-03-06 13:44:27 +08:00
CaiWenzhi 2a5ecc2376 Fixed bugs of Flipping 2014-03-06 13:40:46 +08:00
CaiWenzhi bcdc0458a4 Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-06 13:32:59 +08:00
minggo 2d890fe2ab Merge pull request #5578 from minggo/install 
setup improve
 2014-03-06 11:53:46 +08:00
minggo 4453e6e7fc setup improve 2014-03-06 11:51:50 +08:00
CaiWenzhi 3554dcd749 Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-06 11:22:33 +08:00
zhangbin fec04dd6ae Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-03-06 11:03:49 +08:00
James Chen 87b657b5bb Merge pull request #5575 from dumganhar/iss4286-event-crash 
closed #4286: 'EventDispatcherTest/Issue 4129' crashes on Windows.
 2014-03-06 11:03:34 +08:00
Ricardo Quesada e0030d35b2 Merge pull request #5576 from ricardoquesada/perf_improvement_in_quad_command 
little performance improvement in quad command
 2014-03-05 18:50:54 -08:00
Ricardo Quesada 273d0d22f1 little performance improvement in quad command 2014-03-05 18:50:09 -08:00
James Chen 183622c718 'EventDispatcherTest/Issue 4129' crashes on Windows. 2014-03-06 10:45:29 +08:00
heliclei 73a3011b11 fix comments 2014-03-06 10:31:29 +08:00
heliclei 08d0cde490 Merge remote-tracking branch 'upstream/develop' into node-string-tag 2014-03-06 10:02:50 +08:00
zhangbin 6da0afdd03 Solve the crash in CocoStudioComponentsTest. 2014-03-06 09:23:27 +08:00
Ricardo Quesada 4fe827e46b Merge pull request #5572 from ricardoquesada/ondraw_updated 
onDraw() updated
 2014-03-05 16:05:32 -08:00
Ricardo Quesada a0ab8fcdf3 onDraw() updated 
`onDraw()` receives `const kmMat4 &transform` and `bool
transformUpdated`.

`CC_NODE_DRAW_SETUP()` is no longer used in our code.
`_modelViewTransform` is only used as a cache.
 2014-03-05 15:49:08 -08:00
Ricardo Quesada 06a26f89de Merge pull request #5571 from ricardoquesada/setup_py_fixes 
Improves setup.py
 2014-03-05 14:10:38 -08:00
Ricardo Quesada a012459b94 Improves setup.py 2014-03-05 14:09:45 -08:00
Ricardo Quesada ff14c6ada5 Merge pull request #5570 from ricardoquesada/test_names_improvements 
Test names improvements
 2014-03-05 12:04:35 -08:00
Ricardo Quesada f5646381ea updates CHANGELOG 2014-03-05 11:51:37 -08:00
Ricardo Quesada 0cb759cab8 Better names for tests 2014-03-05 11:50:12 -08:00
CaiWenzhi 5e84c15812 Add RichText 2014-03-05 23:03:49 +08:00
CaiWenzhi cb5f9ad6dc Modify windows project 2014-03-05 22:34:24 +08:00
CaiWenzhi ad85d2c800 Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-05 21:20:26 +08:00
CaiWenzhi 4f9dfdbef8 Fixed build error except Windows 2014-03-05 21:18:51 +08:00
minggo 5d6395ca68 Merge pull request #5568 from minggo/dev-test 
update android build script since it only has testcpp now
 2014-03-05 20:38:17 +08:00
minggo db4d163806 update android build script since it only has testcpp now 2014-03-05 20:36:37 +08:00
minggo 7046b0a258 Merge pull request #5566 from minggo/dev-test 
remove wrong sub-title
 2014-03-05 20:00:45 +08:00
minggo 6d31e4eb15 remove wrong sub-title 2014-03-05 19:58:33 +08:00
minggo ac9f86cf18 Merge pull request #5565 from natural-law/develop 
Update the reference of submodule "plugin".
 2014-03-05 19:31:42 +08:00
James Chen 12206fc1fd Merge pull request #5561 from boyu0/v3.0_final_test 
Move Box2dTestBed step method to onDraw.
 2014-03-05 19:28:42 +08:00
minggo f1cd89b168 Merge pull request #5557 from dabingnn/develop_fixRetroTest 
fix: shader RetroTest by using new label
 2014-03-05 19:25:40 +08:00
zhangbin cfd6728d3c Update the reference of submodule "plugin". 2014-03-05 19:09:15 +08:00
chuanweizhang2013 58cdf07a35 add 2014-03-05 18:31:31 +08:00
minggo 8666e63b41 Merge pull request #5555 from dabingnn/develop_fixControlSwitchBug 
Develop fix control switch bug
 2014-03-05 18:26:32 +08:00
minggo b7df75745e Merge pull request #5562 from Dhilan007/develop_label 
issue #3629:new label support customize the effects such as Shadow[blur is unsupported], Outline
 2014-03-05 17:28:37 +08:00
CaiWenzhi d608a9e98f Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-05 17:14:27 +08:00
CaiWenzhi 7a4ba91f29 Modify project file 2014-03-05 17:08:59 +08:00
minggo d06d105520 Merge pull request #5564 from minggo/install 
make setup script smart
 2014-03-05 17:07:18 +08:00
heliclei 55080d713b refactor string tag to name 2014-03-05 17:03:25 +08:00
minggo 3099faa47b make setup script more smart 2014-03-05 17:00:07 +08:00
CaiWenzhi ab47cafb31 Merge branch 'develop' into develop_nutty_modify_framework_for315 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/gui/UIButton.cpp
	cocos/gui/UIButton.h
	cocos/gui/UIWidget.h
 2014-03-05 16:52:31 +08:00
Dhilan007 dfdf19daff remove unused shader and also did adjust FontAtlas::getTexture 2014-03-05 16:51:16 +08:00
minggo 40d9e78f5a Merge pull request #5563 from lihex/develop 
update submodule
 2014-03-05 16:16:38 +08:00
lihex 389811d9e5 update submodule 2014-03-05 16:14:56 +08:00
boyu0 b0414a88ed Delete Box2DView::tick() method. 2014-03-05 15:55:08 +08:00