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

19664 Commits

Author SHA1 Message Date
zhangcheng 1e6b9f7d9f remove isRenderer. 2014-03-26 17:02:37 +08:00
zhangcheng 58a61d94fb add use CCComRender as parent for attaching component 2014-03-26 16:39:32 +08:00
James Chen faa815eee2 Update CHANGELOG [ci skip] 2014-03-26 16:36:04 +08:00
James Chen 22fdbbb198 Merge pull request #5980 from Dhilan007/develop_label2 
Refactor implementation of label's shadow and fixed stroke was not 'outside stroke' for Label generated by 'Font name'
 2014-03-26 16:32:04 +08:00
bmanGH bf0240114d fix crash when sort children while label type is STRING_TEXTURE. since the only one child sprite is not add with batch mode 2014-03-26 16:23:23 +08:00
James Chen b0e315637a Merge pull request #5992 from andyque/fix_typo 
issue #4401, fix a typo
 2014-03-26 16:04:00 +08:00
andyque 876f643bc4 issue #4401, fix a typo 2014-03-26 16:00:55 +08:00
James Chen 8e8de82feb Merge pull request #5991 from dumganhar/develop 
Mac build fix after merging https://github.com/cocos2d/cocos2d-x/pull/5989
 2014-03-26 15:46:15 +08:00
James Chen 1003847cd1 Mac build fix after merging https://github.com/cocos2d/cocos2d-x/pull/5989 2014-03-26 15:44:38 +08:00
James Chen 21ba509a35 Merge pull request #5989 from dumganhar/iss4559-ios-64bit 
closed #4559: Wrong behavior of multi-touch on iphone5s/ipadAir (arm64 arch)
 2014-03-26 15:27:57 +08:00
James Chen c1faad7e2c Warning fixes in SocketIOTest.cpp/ FileUtilsTest.cpp. 2014-03-26 15:04:45 +08:00
James Chen 691442d80d closed #4559: Wrong behavior of multi-touch on iphone5s/ipadAir (arm64 arch) 2014-03-26 15:04:11 +08:00
minggo 5e2ffc45ec Merge pull request #5985 from andyque/remove_pragma_mark 
issue #4401, remove unused pargma mark macro
 2014-03-26 14:58:37 +08:00
andyque 57d8f155df issue #4401. resolve conflicts 2014-03-26 14:54:50 +08:00
chuanweizhang2013 ed75b09d5e Merge branch 'luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into luaruntime 2014-03-26 14:49:07 +08:00
chuanweizhang2013 210cee9f08 update socket protocol 2014-03-26 14:48:04 +08:00
James Chen 9d4f7467c0 Merge pull request #5984 from CocosRobot/update_lua_bindings_1395813723 
[AUTO]: updating luabinding automatically
 2014-03-26 14:46:47 +08:00
James Chen 3e175b7ab3 Merge pull request #5987 from lmskater/fix-git-fetch-fail 
[Jenkins] Make build as failed when git fetch is failed
 2014-03-26 14:44:18 +08:00
andyque 6449ced0ab closed #4560, fixed UISlider hitTest Point 2014-03-26 14:41:53 +08:00
lm 640a82c2ab [Jenkins] Make build as failed when git fetch is failed 2014-03-26 14:29:53 +08:00
Dhilan007 fa91bf1167 remove unused code and fixed warning. 2014-03-26 14:11:40 +08:00
CocosRobot 0140d6d3f7 [AUTO]: updating luabinding automatically 2014-03-26 06:03:04 +00:00
minggo a374241f65 Merge pull request #5924 from MSOpenTech/wp8-3.0-cocos2d-changes 
Windows Phone 8,0 cocos2d-x 3.0  changes
 2014-03-26 13:58:46 +08:00
James Chen c01491d3a3 Merge pull request #5982 from samuele3hu/develop_test 
[luabindings] Modify the config files for bindings-generator to fix the error about “is_ref_class”
 2014-03-26 13:47:04 +08:00
samuele3hu ac0ad54433 Modify the config files for bindings-generator to fix the error about “is_ref_class” 2014-03-26 12:58:33 +08:00
samuele3hu 674bce677d update `bindings-generator` submoudle 2014-03-26 12:56:29 +08:00
James Chen ec8de6b402 Update CHANGELOG [ci skip] 2014-03-26 11:50:22 +08:00
James Chen 7a8db8271f Merge pull request #5930 from andyque/Branch_issue4429 
closed #4429: Boolean value could not be written to specified plist file
 2014-03-26 11:46:56 +08:00
cw 749a00e5a9 update sim to support Xcode 5.1 2014-03-26 11:27:50 +08:00
Dhilan007 1247760d95 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_label_fixs 
Conflicts:
	cocos/2d/CCLabel.cpp
 2014-03-26 11:15:48 +08:00
Dhilan007 41ffa372e8 label: Refactor implementation of shadow. 2014-03-26 11:09:16 +08:00
Huabing.Xu bc15ac1415 closed #4552: change assert log message 2014-03-26 10:07:50 +08:00
Ricardo Quesada f5585d8409 Merge pull request #5976 from ricardoquesada/chipmunk_fixes 
chipmunk fixes for Linux
 2014-03-25 16:47:21 -07:00
Ricardo Quesada c82933e3c4 chipmunk fixes for Linux 2014-03-25 16:46:10 -07:00
Ricardo Quesada 96e8c4777d Merge pull request #5973 from ricardoquesada/chipmunk_6_2_1 
Upgrades to Chipmunk 6.2.1
 2014-03-25 10:56:37 -07:00
Ricardo Quesada 473a6b19ee Upgrades to Chipmunk 6.2.1 2014-03-25 10:37:35 -07:00
James Chen f6c6d428ad Merge pull request #5926 from andyque/fix_tests_warnings 
issue #4401, remove warnings under win32
 2014-03-25 18:17:42 +08:00
James Chen 12138d893a Merge pull request #5970 from CocosRobot/update_lua_bindings_1395739745 
[AUTO]: updating luabinding automatically
 2014-03-25 17:40:21 +08:00
CocosRobot c5d6e83673 [AUTO]: updating luabinding automatically 2014-03-25 09:30:11 +00:00
CaiWenzhi c976791f7d Merge branch 'develop' into develop_nutty_modifylayout_add_Boxes 2014-03-25 17:17:57 +08:00
CaiWenzhi 243b7e5822 Modify layout and add Boxes 2014-03-25 17:15:54 +08:00
James Chen 04fb2b9fa0 Merge pull request #5968 from dumganhar/develop 
[ci] Updates travis scripts. only commit relevant folder.
 2014-03-25 17:13:12 +08:00
James Chen b8eee8e1a4 [ci] Updates travis scripts. only commit relevant folder. 2014-03-25 17:07:15 +08:00
Huabing.Xu 9aa8327d9c closed #4552: separate material ID and openGL ProgramID 2014-03-25 16:54:29 +08:00
minggo dda53f26d4 [ci skip] 2014-03-25 16:50:36 +08:00
James Chen fe89291be6 Update CHANGELOG [ci skip] 2014-03-25 16:47:59 +08:00
James Chen b6589b0b5a Merge pull request #5931 from Dhilan007/develop_label 
label: Support to clip transparent area of Label, content size will be updated with only non-transparent area.
 2014-03-25 16:47:12 +08:00
LinWenhai 4b454fe7bb Update getter of ClipMarginEnabled. 2014-03-25 16:37:34 +08:00
James Chen 952bb23324 Merge pull request #5964 from CocosRobot/update_lua_bindings_1395735859 
[AUTO]: updating luabinding automatically
 2014-03-25 16:30:36 +08:00
James Chen f672f3153e Update CHANGELOG [ci skip] 2014-03-25 16:30:00 +08:00