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

25494 Commits

Author SHA1 Message Date
Ricardo Quesada 159624fce9 Merge pull request #8638 from ricardoquesada/win_fixes 
compiler fixes for windows
 2014-10-10 18:43:10 -07:00
Ricardo Quesada e03fb86990 one more fix, oops 2014-10-10 18:28:05 -07:00
Ricardo Quesada 3cd2163558 more win fixes 2014-10-10 18:21:15 -07:00
Ricardo Quesada ee3086ff8d compiler fixes for windows 2014-10-10 17:41:11 -07:00
dualface 74ec90f90f remove unused codes 2014-10-11 03:14:06 +08:00
dualface b49d2351ff update lua-template-default 2014-10-11 02:55:04 +08:00
dualface 20cbbfdbe5 update luabinding scripts 2014-10-11 02:51:58 +08:00
Ahlwong 4aceaee08c Fix UIButton setFontSize sync ContentSize 2014-10-10 11:17:43 -07:00
SunLightJuly 88acc56e56 restored cocos/CMakeList.txt 2014-10-11 02:15:29 +08:00
dualface 68f71b3df4 do not load deprecated Lua API from luabinding of modules 2014-10-10 23:59:41 +08:00
pipu ffd83bbdd0 Modifying win32 and wp8 protocol buffers lib 2014-10-10 22:38:34 +08:00
minggo 0a2e60a5ad Merge pull request #8631 from CocosRobot/update_cocosfiles_1412951021 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-10-10 22:28:52 +08:00
CocosRobot 127b8acd14 [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-10 14:23:42 +00:00
minggo 344db304f6 Merge pull request #8629 from andyque/fixPageVeiwRemoveAllPageIssue 
Fix page veiw remove all page issue
 2014-10-10 22:15:35 +08:00
minggo 4d084496a3 Merge pull request #8578 from SunLightJuly/Lua_LoadChunksFromZIP 
added  LuaStack::loadChunksFromZIP()
 2014-10-10 22:14:55 +08:00
minggo 09616d68d9 Merge pull request #8628 from andyque/ficChipmunkLinuxCompile 
try to fix ubuntu 12.04 compile error
 2014-10-10 22:14:33 +08:00
pipu efe22a0dd7 Modifying protocol buffers for win32 version 2014-10-10 21:55:59 +08:00
SunLightJuly ba064167a8 modified project files and make files 2014-10-10 18:43:40 +08:00
minggo 1359518d7b [ci skip]Update Authors 2014-10-10 18:32:21 +08:00
andyque 59ff2fbf72 remove dead code 2014-10-10 18:08:25 +08:00
minggo 4a193c6d76 Merge pull request #8554 from newnon/v3_scale9sprite_capinets_fix 
Scale9Sprite capInsets set fix
 2014-10-10 18:05:32 +08:00
Huabing.Xu 766c9469d4 add staggered wrapper(using ortho for its implementation now) 2014-10-10 17:52:13 +08:00
lvlong 4bba69d578 add a param comment 2014-10-10 17:48:54 +08:00
lvlong 2c18db5b18 create animate by frame section. 2014-10-10 17:44:45 +08:00
andyque 0f0c3878e5 add more indicator 2014-10-10 17:36:33 +08:00
Huabing.Xu 4bbae0d9c5 add test case for staggered map 2014-10-10 17:29:13 +08:00
andyque ad1e44a254 try to fix ubuntu 12.04 compile error 2014-10-10 17:27:15 +08:00
SunLightJuly 57f6f17f6d updated version in external/config.json 2014-10-10 17:07:59 +08:00
andyque fb1adb5b90 add issue tests skeleton 2014-10-10 17:07:08 +08:00
Dhilan007 89db9ecd3b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-win32-warn 
Conflicts:
	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp
 2014-10-10 17:02:45 +08:00
minggo 2f98d928d4 Merge pull request #8625 from CocosRobot/update_cocosfiles_1412930560 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-10-10 16:44:01 +08:00
CocosRobot 80a92066c2 [AUTO][ci skip]: updating cocos2dx_files.json 2014-10-10 08:42:41 +00:00
minggo a576198897 Merge pull request #8624 from CocosRobot/update_lua_bindings_1412930259 
[AUTO]: updating luabinding automatically
 2014-10-10 16:40:56 +08:00
CocosRobot 53cde3f3b2 [AUTO]: updating luabinding automatically 2014-10-10 08:39:46 +00:00
minggo d5658a69d5 Merge pull request #8621 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2014-10-10 16:31:01 +08:00
minggo 985b2a72b7 [ci skip] Update CHANGELOG 2014-10-10 16:30:26 +08:00
minggo 63e4d7ce27 Merge pull request #8614 from andyque/fixEditBoxMaxLengthOnMac 
fix setMaxLength issue of EditBox-mac
 2014-10-10 16:28:21 +08:00
zhangbin 72ebd715b3 Update the reference of submodule cocos2d-console. 2014-10-10 16:28:03 +08:00
minggo 00f8f84552 [ci skip] Update CHANGELOG 2014-10-10 15:56:15 +08:00
minggo 4b7d5694b8 Merge pull request #8573 from Dhilan007/v3-labelatlas 
fix #8569: LabelAtlas opacity do not change when setting parent node's opacity
 2014-10-10 15:52:50 +08:00
minggo c774867f3e [ci skip] Update CHANGELOG 2014-10-10 15:37:08 +08:00
minggo 44f3dcdfca Merge pull request #8608 from Dhilan007/v3-fileutil-ios 
issue #8568: Fixed FileUtils::removeFile doesn't work on iOS
 2014-10-10 15:35:43 +08:00
minggo a11091a10d [ci skip] Update CHANGELOG 2014-10-10 15:30:30 +08:00
minggo 7d4a235d46 Merge pull request #8611 from dabingnn/v3_fixGLProgramCrash 
V3 fix gl program crash
 2014-10-10 15:28:23 +08:00
minggo 8964c8860a [ci skip] Update CHANGELOG 2014-10-10 15:27:12 +08:00
andyque 2013cdb4ef fix setMaxLength issue of EditBox-mac 2014-10-10 15:26:33 +08:00
minggo 01e3ae2c61 Merge pull request #8606 from andyque/fixButtonContentSize 
fix button title only content size issue
 2014-10-10 15:23:25 +08:00
minggo 49b3e907e9 Merge pull request #8604 from samuele3hu/v3_3D 
Add CameraTest、OBBTest and related lua bindings
 2014-10-10 15:22:17 +08:00
Dhilan007 7fb448e90f add 'static' for global function 2014-10-10 15:13:05 +08:00
minggo df60fde7ab Merge pull request #8610 from andyque/fixCocostudioIncludePath 
fix cocostudio include path
 2014-10-10 15:05:39 +08:00