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

18216 Commits

Author SHA1 Message Date
boyu0 4fa8d24561 fix some box2d test position 2014-03-31 11:26:11 +08:00
Dhilan007 08beaa3532 TextFieldTTF:fixed display incorrect color. 2014-03-31 11:16:12 +08:00
minggo c4c10b393f Merge pull request #6061 from natural-law/develop 
Optimize the performance of BlurSpriteTest in Shader Sprite.
 2014-03-31 10:49:28 +08:00
zhangbin 8aa187d8dc Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-03-31 10:47:04 +08:00
zhangbin 95ab15195c Optimize the performance of BlurSpriteTest in Shader Sprite. 2014-03-31 10:44:48 +08:00
boyu0 530354ca67 fix box2d dynamic tree draws 2014-03-31 10:21:54 +08:00
minggo 6cc51a2cfc Merge pull request #6057 from samuele3hu/develop_socket 
Add the omitted socket script for lua-tests
 2014-03-31 10:15:38 +08:00
bmanGH f4479770e3 Merge branch 'feature/fix_STRING_TEXTURE_label_sortAllChildren_crash' of https://github.com/bmanGH/cocos2d-x into feature/fix_STRING_TEXTURE_label_sortAllChildren_crash 
* 'feature/fix_STRING_TEXTURE_label_sortAllChildren_crash' of https://github.com/bmanGH/cocos2d-x:
  Label ignore sort children.
  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-30 21:09:48 +08:00
bmanGH c86ab37685 Label ignore sort children. 2014-03-30 21:08:43 +08:00
bmanGH 503fed5313 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-30 21:08:43 +08:00
bmanGH e2db57006b Label ignore sort children. 2014-03-30 20:45:44 +08:00
James Chen 1328d1a898 Merge pull request #6058 from CocosRobot/update_cocosfiles_1396106624 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-03-29 23:47:22 +08:00
CocosRobot 12af1b4982 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-29 15:23:46 +00:00
minggo f80bdfff76 Merge pull request #6055 from MSOpenTech/wp8-3.0 
Cocos2d-x 3.0 Windows Phone 8 support
 2014-03-29 23:21:34 +08:00
minggo a874ecf8b0 Merge pull request #6053 from natural-law/develop 
Solve the error effect of BlurSpriteTest in Shader Sprite.
 2014-03-29 21:42:54 +08:00
samuele3hu 056303ea35 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket 2014-03-29 14:58:45 +08:00
samuele3hu 219a91a641 Add the omitted socket script for lua-tests 2014-03-29 14:58:23 +08:00
James Chen cad5ea2acf Merge pull request #6056 from samuele3hu/develop_test 
Update some test cases about new Label
 2014-03-29 11:23:24 +08:00
James Chen 652b3d8c25 Merge pull request #6054 from maksqwe/cmake_fix 
fix cmake win32 project generation
 2014-03-29 11:22:30 +08:00
samuele3hu 7127cb560e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_test 2014-03-29 10:36:15 +08:00
samuele3hu 403e96b943 Use the New Label in the Extension test case 2014-03-29 10:34:52 +08:00
Dale Stammen 039e746745 updated project dependencies 2014-03-28 16:12:00 -07:00
Dale Stammen ffbaac5fa5 fixed project refs 2014-03-28 16:03:37 -07:00
Dale Stammen 9f68a1111e added wp8 editbox support 2014-03-28 16:03:09 -07:00
Dale Stammen 958c7fdf9d added winrt and wp8 project files and property sheets 2014-03-28 16:02:23 -07:00
Dale Stammen c739956582 added wp8 support files and projects 2014-03-28 15:54:36 -07:00
Dale Stammen 8d1f4188eb added wp8 support files and projects 2014-03-28 15:53:55 -07:00
Dale Stammen 101818ac62 added wp8 support files and projects 2014-03-28 15:44:15 -07:00
Dale Stammen 623b7ae3f5 added wp8 support files and projects 2014-03-28 15:42:41 -07:00
Dale Stammen b2d3dbf0fe added wp8 support files and projects 2014-03-28 15:39:20 -07:00
Dale Stammen 6970955378 added wp8 support files and projects 2014-03-28 15:32:52 -07:00
Dale Stammen 0999df368f added .user to Visual Studio ignores 2014-03-28 15:32:23 -07:00
Dale Stammen 31150ce189 added wp8 support files and projects 2014-03-28 12:55:40 -07:00
Dale Stammen 97bdaad41b added wp8 and winrt support files and projects 2014-03-28 12:53:35 -07:00
Dale Stammen afe561cccc added wp8 and winrt support files and projects 2014-03-28 12:52:16 -07:00
Dale Stammen aa0ef00de3 added external libs for wp8 2014-03-28 12:02:27 -07:00
Dale Stammen 7b25ffeb4e added wp8 build files 2014-03-28 11:33:09 -07:00
Dale Stammen 8bd5497ac6 use ResolutionPolicy::SHOW_ALL on WP8 2014-03-28 11:28:48 -07:00
Dale Stammen 210f95c2d3 can't close app on WP8 2014-03-28 11:27:43 -07:00
Dale Stammen db8efd32f7 fixed reserved word DELETE in wp8 compiler 2014-03-28 11:26:41 -07:00
Dale Stammen 77efd401a7 intialize _hasMipmaps to false in constructor 2014-03-28 11:25:57 -07:00
Dale Stammen 6ad8ec00ed added missing variadicCreate for wp8 2014-03-28 11:25:39 -07:00
Maks Naumov 9644d68259 fix cmake win32 project generation 2014-03-28 19:06:13 +02:00
samuele3hu a387f60f80 Update the font size for new label test display 2014-03-28 23:32:11 +08:00
zhangbin 77e0694883 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-03-28 20:55:12 +08:00
zhangbin 6a1974a78a Solve the error effect of BlurSpriteTest in Shader Sprite. 2014-03-28 20:53:14 +08:00
pipu 733b364b51 Fixed bugs for Editor 2014-03-28 18:54:06 +08:00
minggo c7fb226f11 Merge pull request #5929 from shujunqiao/cocos-console-test 
Cocos console test
 2014-03-28 18:34:21 +08:00
James Chen 1c5cff089e Merge pull request #6050 from CocosRobot/update_lua_bindings_1396001378 
[AUTO]: updating luabinding automatically
 2014-03-28 18:11:59 +08:00
CocosRobot 494321a674 [AUTO]: updating luabinding automatically 2014-03-28 10:11:08 +00:00