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

15506 Commits

Author SHA1 Message Date
minggo dfcd0872ed Merge pull request #5006 from dabingnn/develop_layerColorDepthTestOccludeBugcase 
Add Test Case: LayerColor should not occlude sprites and labels when dep...
 2014-01-09 01:59:16 -08:00
WuHuan 4dbb0ee1e8 mingw console 2014-01-09 17:48:37 +08:00
James Chen 4b4dc16030 Exports CC and CXX for gcc and clang. 2014-01-09 17:48:08 +08:00
James Chen 488d1d6109 Merge pull request #5014 from CocosRobot/updategeneratedsubmodule_1389259028 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-09 01:28:31 -08:00
James Chen c0195015c3 updates CC and CCX env variables 2014-01-09 17:26:33 +08:00
samuele3hu 8826659cf1 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI 2014-01-09 17:24:37 +08:00
samuele3hu 2cbe502113 issue #3643:Lua websocket can't receive more than 64 bytes of data 2014-01-09 17:23:22 +08:00
CaiWenzhi c3b2a99be6 Merge branch 'develop' into develop_nutty_modify_framework_removeuselesssample 2014-01-09 17:17:52 +08:00
CocosRobot c60681c556 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-09 09:17:11 +00:00
James Chen f14bbd59c9 Adding clang build for travis ci. 2014-01-09 17:16:09 +08:00
James Chen ffdfcfbefb Update CHANGELOG [ci skip] 2014-01-09 17:13:34 +08:00
James Chen f523c1c2fd Update AUTHORS [ci skip] 2014-01-09 17:12:58 +08:00
James Chen 7dc07e329b Merge pull request #5012 from dumganhar/drawnode 
closed #3641: DrawNode Supports to draw triangle, quad bezier, cubic bezier
 2014-01-09 01:11:50 -08:00
James Chen 2133c0e566 Merge commit 'refs/pull/3938/head' of git://github.com/cocos2d/cocos2d-x into drawnode 
Conflicts:
	cocos/2d/CCDrawNode.h
 2014-01-09 17:03:08 +08:00
James Chen 3bb1fae660 Merge pull request #5010 from boyu0/fix_texture2dtest_crash_bug 
closed #3638: Fix Image crashes when load tga file.
 2014-01-09 00:40:09 -08:00
boyu0 e34ef0d38f change initialization _data from 0 to nullptr. 2014-01-09 16:33:31 +08:00
James Chen f12fb48eef Merge pull request #5011 from Dhilan007/develop_crash 
fix compiling error in CCControlSlider.cpp on vs.
 2014-01-08 23:59:20 -08:00
Dhilan007 ccda90cab5 fix compiling error in CCControlSlider.cpp on vs. 2014-01-09 15:52:04 +08:00
CaiWenzhi 1ca7642976 Merge branch 'develop' into develop_nutty_modify_framework_removeuselesssample 2014-01-09 15:51:24 +08:00
CaiWenzhi 19f0e55464 fixed bug of layout 2014-01-09 15:43:18 +08:00
James Chen 43a9c84cc2 Update CHANGELOG [ci skip] 2014-01-09 15:26:54 +08:00
James Chen b8528351c4 Update AUTHORS [ci skip] 2014-01-09 15:26:24 +08:00
boyu0 e063755596 fix Image crashes in mac when load tag file 2014-01-09 15:26:05 +08:00
James Chen 2c8c7a7a9d Merge pull request #5008 from dumganhar/iss3605-websocket-4k 
Merge PR #5003: fix WebSocket cannot send/receive more than 4096 bytes of data
 2014-01-08 23:23:42 -08:00
James Chen f8d369248b closed #3605: Websocket doesn't support send/receive data which larger than 4096 bytes, renames member variables to follow cocos2d-x coding guide line. 2014-01-09 15:18:06 +08:00
James Chen ef7aea6edc Merge pull request #5007 from CocosRobot/updategeneratedsubmodule_1389250605 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-08 22:59:27 -08:00
CocosRobot ce0b86e7fe [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-09 06:56:48 +00:00
Zhe Wang a5130633c6 Merge pull request #5005 from walzer/remove_UICCLabelAtlas 
Hide default constructor of LabelAtlas into protected, and modify related invokes.
 2014-01-08 22:50:59 -08:00
Huabing.Xu 1b339a4635 Add Test Case: LayerColor should not occlude sprites and labels when depth test is true 2014-01-09 14:50:29 +08:00
walzer 1ad14340bf issue #3627, remove Hungarian Notation in LabelAtlas 2014-01-09 14:26:34 +08:00
walzer 8da4879560 issue #3627, remove lua/js doxygen mark from LabelAtals constructor & destructor. 2014-01-09 14:21:43 +08:00
James Chen b0f6ae8c42 Merge commit 'refs/pull/5003/head' of git://github.com/cocos2d/cocos2d-x into websocket-test 2014-01-09 14:16:44 +08:00
walzer d15874fdf7 fixed #3627, an extra benefit from adding LabelAtlas::create() is that we can hide its default constructor into protected. 2014-01-09 14:16:26 +08:00
edwardzhou 480a9277da fix WebSocket cannot send/receive more than 4096 bytes of data 2014-01-09 13:29:56 +08:00
James Chen b454bf01e3 Merge pull request #5002 from heliclei/develop 
support [ci skip] in commit message
 2014-01-08 20:53:19 -08:00
James Chen d9d91b04e8 Merge pull request #5001 from CocosRobot/updategeneratedsubmodule_1389243030 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-08 20:52:24 -08:00
CocosRobot 2945322b97 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-09 04:50:38 +00:00
heliclei 007a64e50e support [ci skip] command 2014-01-09 12:47:46 +08:00
Zhe Wang bbd4a2b235 Merge pull request #5000 from walzer/remove_UICCLabelAtlas 
Remove UICCLabelAtlas in GUI module
 2014-01-08 20:45:01 -08:00
walzer 7055340ace fixed #3627. There're no UICCLabelAtlas any more. 2014-01-09 12:43:57 +08:00
walzer 2d8fcb2c00 issue #3627, remove UICCLabelAtlas, add LabelAtlas::create() for GUI module 2014-01-09 12:40:51 +08:00
James Chen ac547cedca Merge pull request #4999 from CocosRobot/updategeneratedsubmodule_1389238661 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-08 19:38:18 -08:00
CocosRobot 746a360176 [AUTO] : updating submodule reference to latest autogenerated bindings 2014-01-09 03:37:44 +00:00
James Chen 23dec543b3 Merge pull request #4995 from Dhilan007/develop_crash 
amendment incorrect use of macro
 2014-01-08 19:30:29 -08:00
James Chen 29cbd2bcc8 Update CHANGELOG [ci skip] 2014-01-09 11:29:36 +08:00
James Chen 630bd32192 Update AUTHORS [ci skip] 2014-01-09 11:28:54 +08:00
James Chen 811271e5a1 Merge pull request #4997 from dumganhar/iss3619 
Merge PR #4085: Fix of ControlButton doesn't support to set scale ratio of touchdown state
 2014-01-08 19:27:24 -08:00
James Chen 46009e5daf Merge commit 'refs/pull/4085/head' of git://github.com/cocos2d/cocos2d-x into iss3619 
Conflicts:
	extensions/GUI/CCControlExtension/CCControlButton.cpp
 2014-01-09 11:16:44 +08:00
CaiWenzhi 4cadcca497 Merge branch 'develop' into develop_nutty_modify_framework_removeuselesssample 2014-01-09 11:01:47 +08:00
James Chen 526ac4c69a Merge pull request #4996 from CocosRobot/updategeneratedsubmodule_1389236390 
[AUTO] : updating submodule reference to latest autogenerated bindings
 2014-01-08 19:00:24 -08:00