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

18381 Commits

Author SHA1 Message Date
minggo 7840a246b7 Merge pull request #6063 from koowolf/add_bg_wav 
add background.wav to wp8 to play
 2014-03-31 15:20:26 +08:00
James Chen 313108af82 Merge pull request #6065 from boyu0/3.0rc1_test 
fix box2dbed dynamic tree test draw.
 2014-03-31 14:38:00 +08:00
James Chen 9a53423e6b Merge pull request #6064 from samuele3hu/develop_socket 
ccvector_to_luaval would lead to memory leak because call the `retain`
 2014-03-31 14:09:15 +08:00
minggo 504eea0269 use xxhash to generate material id 2014-03-31 13:47:07 +08:00
boyu0 48854f4649 delete Time of Impact test which can not shown 2014-03-31 13:41:48 +08:00
boyu0 9b75fc5595 add box2dbed test keyboard event. 2014-03-31 12:07:21 +08:00
samuele3hu 849d462c11 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket 2014-03-31 12:05:45 +08:00
samuele3hu c38388cc62 ccvector_to_luaval would lead to memory leak because call the `retain` 2014-03-31 12:04:47 +08:00
James Chen f946124d37 Merge pull request #6062 from Dhilan007/develop_label 
TextFieldTTF:fixed display incorrect color.
 2014-03-31 12:01:52 +08:00
Dhilan007 cffdb129c9 change type of Label::_shadowNode 2014-03-31 11:47:28 +08:00
koowolf ce78b6369a add background.wav to wp8 to play 2014-03-31 11:46:39 +08:00
pipu 4c1cbabb5e fixed bugs 2014-03-31 11:34:26 +08:00
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