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

29453 Commits

Author SHA1 Message Date
minggo c89ac9f336 Merge pull request #10924 from CocosRobot/update_lua_bindings_1426573536 
[AUTO]: updating luabinding automatically
 2015-03-17 14:41:52 +08:00
CocosRobot 9df3f57e0d [AUTO]: updating luabinding automatically 2015-03-17 06:28:14 +00:00
minggo 56718294a6 Merge pull request #10921 from CocosRobot/update_cocosfiles_1426573112 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-03-17 14:19:08 +08:00
CocosRobot 2b14d11bb9 [AUTO][ci skip]: updating cocos2dx_files.json 2015-03-17 06:18:34 +00:00
minggo aa573a9553 Merge pull request #10904 from pipu/fixed_widget_reader_actiontag 
Optimize parse action tag for node and widget.
 2015-03-17 14:18:22 +08:00
minggo f51e2b9537 Merge pull request #10912 from perminovVS/v3-dev-console 
Create Console before any sub systems
 2015-03-17 14:17:35 +08:00
minggo 5b2ba424b1 Merge pull request #10918 from CocosRobot/update_cocosfiles_1426563205 
[AUTO][ci skip]: updating cocos2dx_files.json
 2015-03-17 14:16:38 +08:00
minggo 3aa522eca2 Merge pull request #10905 from MSOpenTech/v3-wp8-fix 
V3 Update Angle to support gl_PointSize on Windows Phone 8.1
 2015-03-17 14:15:56 +08:00
lvlong 733a89100e remove old code! 2015-03-17 13:13:03 +08:00
Dale Stammen ec50e653c4 updated version to 35 2015-03-16 21:21:42 -07:00
lvlong 080132d072 modify sub node transform! 2015-03-17 12:15:03 +08:00
Dale Stammen 5606fad642 Merge branch 'v3' into v3-wp8-fix 2015-03-16 20:47:55 -07:00
CocosRobot d2a853c72b [AUTO][ci skip]: updating cocos2dx_files.json 2015-03-17 03:33:26 +00:00
minggo 7e5708cac6 Merge pull request #10917 from yangws/v3 
Add doxygen config for white book and cocos/doxygen_modules.h for doc mu...
 2015-03-17 11:32:07 +08:00
Vincent Yang 6bbb89a098 Add doxygen config for white book and cocos/doxygen_modules.h for doc mudules. 2015-03-17 11:26:33 +08:00
Dale Stammen 65c83378d0 Merge branch 'v3' into v3-wp8-fix 2015-03-16 20:22:28 -07:00
minggo f7d5a16734 Merge pull request #10873 from konopka/fix_compiler_override_warnings 
Fix compiler override warnings
 2015-03-17 10:38:19 +08:00
Vladimir Perminov e745d5949a Create Console before any sub systems 
Sub system use cocos2d::log in constructors.
 2015-03-16 20:22:20 +03:00
Petr Babička fa245c44b9 Spaces instead of tabs 2015-03-16 17:22:17 +01:00
Alok Sahay 80576b5903 Don't set scale and loadHTMLString on nil. 2015-03-16 17:00:01 +01:00
konopka 0387b13bb6 Adding missing virtual keywords 2015-03-16 16:39:43 +01:00
konopka 7fb79272ca Undo changes that are not allowed by spine license 2015-03-16 16:35:41 +01:00
Dale Stammen e2a5eb2f9f updated to Angle ddbf057c52 2015-03-16 08:18:26 -07:00
Dale Stammen 08ceae3de2 removed no-gl_PointSize shaders for Windows Phone 8.1 2015-03-16 08:08:02 -07:00
pipu a5e9ebc4e6 Fix parse action tag for widget. 2015-03-16 20:04:59 +08:00
yangxiao 8b3e116ed6 check running scene 2015-03-16 18:04:50 +08:00
minggo 9bdf758d5a Merge pull request #10898 from MSOpenTech/v3-winrt-fix 
Fxed use of Color4B in UIEditBoxImpl-winrt.cpp
 2015-03-16 17:19:49 +08:00
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