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

27840 Commits

Author SHA1 Message Date
Dale Stammen ef5e6fc473 fixed use of Color4B 2015-03-16 02:17:05 -07:00
yangxiao 5b26ba3c68 override setCameraMask 2015-03-16 17:11:17 +08:00
minggo 633d3604a3 Merge pull request #10891 from CocosRobot/update_lua_bindings_1426489737 
[AUTO]: updating luabinding automatically
 2015-03-16 16:31:51 +08:00
minggo 02ef15eec7 Merge pull request #10896 from natural-law/v3 
[ci skip] Update the reference of submodule cocos2d-console.
 2015-03-16 16:30:21 +08:00
zhangbin 1b92859c61 Update the reference of submodule cocos2d-console. 2015-03-16 16:29:07 +08:00
yangxiao f56d8c4784 fix camra mask for label does not work 2015-03-16 15:31:29 +08:00
CocosRobot a3ddd92307 [AUTO]: updating luabinding automatically 2015-03-16 07:11:12 +00:00
minggo f5b5521b8f [ci skip]update CHANGELOG 2015-03-16 14:59:26 +08:00
minggo f25be54e95 Merge pull request #10671 from kpkhxlgy0/v3 
enable setWritablePath on platform win32 and mac
 2015-03-16 14:57:26 +08:00
minggo d0753674b2 Merge pull request #10514 from cpascal/uiEditBox_Win32 
Fixed missing ui::EditBox functionalities on Win32
 2015-03-16 14:56:49 +08:00
minggo 23dbbf6d99 Merge pull request #10887 from CocosRobot/update_lua_bindings_1426488653 
[AUTO]: updating luabinding automatically
 2015-03-16 14:54:26 +08:00
minggo f7624ecca9 [ci skip]update CHANGELOG 2015-03-16 14:54:06 +08:00
CocosRobot 7a4e727ee2 [AUTO]: updating luabinding automatically 2015-03-16 06:53:18 +00:00
minggo 1916bc1f1f Merge pull request #10693 from Mazyod/editbox-text-alpha-support 
Support Color4B for editbox text
 2015-03-16 14:52:36 +08:00
minggo d7dc44b86f [ci skip]update CHANGELOG 2015-03-16 14:51:07 +08:00
minggo 2ea88a30bb Merge pull request #10817 from garfieldkwong/fix_autorelease_branch 
fix issue autorelease will not release trigger by autorelease.
 2015-03-16 14:47:30 +08:00
minggo ebe5dff7a6 Merge pull request #10737 from newnon/v3_scale9_blend_func 
blending function for Scale9Sprite
 2015-03-16 14:45:08 +08:00
Martin Konopka f4d56971ed Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] 2015-03-15 00:16:20 +01:00
Martin Konopka 2c80b6ae3a Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] 2015-03-15 00:10:08 +01:00
Martin Konopka cd12d08a52 Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] 2015-03-14 19:33:15 +01:00
Nite Luo 878590946f Merge pull request #10866 from darkdukey/console_fix_v3 
Fix multithread compiling
 2015-03-14 02:30:04 -07:00
Nite Luo 18d716cfd2 Use xcode for jenkins build 2015-03-14 02:08:52 -07:00
Nite Luo 860c108f86 revert changes in mac build script 2015-03-14 01:30:11 -07:00
Nite Luo 1d96876699 Test if reduce log size will fix the build 2015-03-14 01:09:42 -07:00
Nite Luo cfa1f0c84f Merge pull request #10843 from konopka/fix_compiler_reorder_warnings 
Get rid of compiler warnings: field '_xxx' will be initialized after field '_yyy'...
 2015-03-13 21:12:35 -07:00
Nite Luo 99bc7e2a2b Fix multithread compiling 2015-03-13 19:53:22 -07:00
Nite Luo 3194da4e7d Merge pull request #10720 from darkdukey/hide_cursor 
Hide cursor
 2015-03-13 10:48:15 -07:00
Huabing.Xu eb1d70c5a9 Update RELEASE_NOTES.md 2015-03-13 19:35:52 +08:00
Huabing.Xu 7c968ebaca Merge pull request #10859 from super626/v3 
release note for PU
 2015-03-13 19:33:36 +08:00
yangxiao c3d7fbebf4 correct words 2015-03-13 18:12:20 +08:00
yangxiao b124df143b add release note 2015-03-13 18:09:47 +08:00
Huabing.Xu 369bc73dc3 Merge pull request #10857 from dabingnn/v3 
[ci skip] update release notes
 2015-03-13 17:20:37 +08:00
Huabing.Xu f5cab860eb [ci skip] update release notes 2015-03-13 17:18:29 +08:00
Huabing.Xu 67fef0eb5e Merge pull request #10856 from super626/v3 
modify dds to png
 2015-03-13 17:00:26 +08:00
Huabing.Xu ffa63be60e Update CHANGELOG 2015-03-13 16:48:54 +08:00
Huabing.Xu 779374633d Merge pull request #10855 from SunLightJuly/v3_fix 
define  __G__TRACKBACK__ in cocos.init
 2015-03-13 16:46:00 +08:00
XiaoYang 824a876afd Merge pull request #254 from songchengjiang/v3 
replace mp_fire_02_2x2.dds with mp_fire_02_2x2.png
 2015-03-13 16:39:37 +08:00
SunLightJuly 6871e30b8d define __G__TRACKBACK__ in cocos.init 2015-03-13 16:39:36 +08:00
songchengjiang 7e5af41817 replace mp_fire_02_2x2.dds with mp_fire_02_2x2.png 2015-03-13 16:34:21 +08:00
Huabing.Xu 23d50879b8 Merge pull request #10854 from SunLightJuly/v3_fix 
fixed bug
 2015-03-13 16:30:58 +08:00
SunLightJuly f321f725b0 fixed Java_org_cocos2dx_lua_AppActivity_nativeIsDebug(): return false only, because runtime have been removed 2015-03-13 16:12:08 +08:00
Huabing.Xu 135ad0e735 Merge pull request #10853 from dabingnn/v3 
[ci skip]fix make package for lua runtime is removed
 2015-03-13 15:29:33 +08:00
Huabing.Xu 6b00b65824 [ci skip]fix make package for lua runtime is removed 2015-03-13 15:29:05 +08:00
Huabing.Xu 5ea181742c Merge pull request #10851 from CocosRobot/update_lua_bindings_1426230804 
[AUTO]: updating luabinding automatically
 2015-03-13 15:21:40 +08:00
Huabing.Xu c6883a6d39 Merge pull request #10852 from CocosRobot/update_cocosfiles_1426231217 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-03-13 15:20:37 +08:00
CocosRobot 5203d1e7be [AUTO][ci skip]: updating cocos2dx_files.json 2015-03-13 07:20:18 +00:00
CocosRobot 2f0eb6712d [AUTO]: updating luabinding automatically 2015-03-13 07:15:34 +00:00
Huabing.Xu b771461af8 Merge pull request #10849 from super626/v3 
release note for PU
 2015-03-13 15:14:56 +08:00
yangxiao cbb470b5de release note for PU 2015-03-13 15:08:09 +08:00
Huabing.Xu 639ed335b3 Merge pull request #10839 from pipu/node_load_callback 
To add the function node load callback called during create node from csb file.
 2015-03-13 15:06:14 +08:00