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

25118 Commits

Author SHA1 Message Date
huanghsiwu f549aa3747 fix wp8 template crash bug by modefy font resource's properties 2014-10-18 11:20:12 +08:00
honghui f2647e56e4 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-10-18 09:45:25 +08:00
minggo 61215e015f Merge pull request #8831 from samuele3hu/v3_new_spine 
Add lua-bindings for Light and test case and fix compile error triggered by UIHelper.cpp
 2014-10-18 09:28:17 +08:00
samuele3hu e74c3cd1e4 Remove some comments 2014-10-18 00:29:04 +08:00
samuele3hu 529ee72432 Fix compile error triggered by UIHelper.cpp 2014-10-18 00:25:55 +08:00
samuele3hu 6502beaf95 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine 2014-10-18 00:14:53 +08:00
samuele3hu 3348f8300e Add lua-bindings for AmbientLight,BaseLight,DirectionLight,PointLight,SpotLight and related test case 2014-10-18 00:13:22 +08:00
minggo 7e6ee9c15a Merge pull request #8801 from 2youyouo2/v3 
add deprecated information for Armature::drawContour
 2014-10-17 23:02:49 +08:00
minggo ac692eaa4d Merge pull request #8818 from samuele3hu/v3_new_spine 
Update Mac project setting and some lua test cases about UI and ActionTimeline
 2014-10-17 23:01:55 +08:00
minggo b4ffad06eb Merge pull request #8822 from huangshiwu/v3_fixtemplate 
change ios and mac template's resource struct
 2014-10-17 23:00:42 +08:00
minggo 1da69a5f7b Merge pull request #8828 from CocosRobot/update_lua_bindings_1413557585 
[AUTO]: updating luabinding automatically
 2014-10-17 22:58:15 +08:00
minggo e1abb74e02 Merge pull request #8829 from CocosRobot/update_lua_bindings_1413557591 
[AUTO]: updating luabinding automatically
 2014-10-17 22:57:32 +08:00
CocosRobot 20781825f2 [AUTO]: updating luabinding automatically 2014-10-17 14:56:22 +00:00
CocosRobot 3a47bfe3c9 [AUTO]: updating luabinding automatically 2014-10-17 14:55:25 +00:00
minggo 4a3aa2f359 Merge pull request #8824 from Dhilan007/v3-fixcrash 
Fix [Node:clipping -> Clipping to RenderTexture] crash
 2014-10-17 22:50:18 +08:00
minggo 857f0c285c Merge pull request #8825 from liamcindy/v3 
update for lay out
 2014-10-17 22:47:09 +08:00
kaile.yin 5b0e2f0304 fixed emit last frame several times 2014-10-17 20:43:01 +08:00
honghui 10d23dcc4a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-10-17 19:37:31 +08:00
Liam 3089317eb7 Merge branch 'v3' of https://github.com/liamcindy/cocos2d-x into v3 2014-10-17 19:18:12 +08:00
Liam 3f954857a8 update for lay out 2014-10-17 19:13:37 +08:00
Dhilan007 b5f91d17da Fix [Node:clipping -> Clipping to RenderTexture] crash 2014-10-17 18:48:18 +08:00
huangshiwu 4802821efd change ios and mac template's resource struct 2014-10-17 18:22:25 +08:00
huangshiwu 60429247ea edit lua-template-runtime's ios info.plist to change launch image's display orientation 2014-10-17 18:17:49 +08:00
Dhilan007 a65b5d7541 Fix CPP template project crash 2014-10-17 18:17:49 +08:00
pipu 48c15d64a1 Modify reader in order to parse attribute "Plist" 2014-10-17 18:17:49 +08:00
joshuastray f13c6bb8b2 fix typo of file name 2014-10-17 18:17:49 +08:00
samuele3hu 7038a7fa31 Rename addSpriteFramesWithFile->addSpriteFrames for SpriteFrameCache 2014-10-17 18:17:49 +08:00
samuele3hu cb327375cf Update the related manifests files for assetsmanager tests 2014-10-17 18:17:49 +08:00
samuele3hu 9e562a440c Update bindings-generator submodule 2014-10-17 18:17:49 +08:00
samuele3hu b214982edd Update bindings-generator submodule 2014-10-17 18:17:49 +08:00
samuele3hu 9bf85f5948 Fix the lua-tests compile error in the release condition 2014-10-17 18:17:49 +08:00
samuele3hu ca50bd3834 Update the Deprecated Func 2014-10-17 18:17:48 +08:00
pipu ebc05f014d Fixed #8770 2014-10-17 18:17:48 +08:00
yangxiao cfb6a7846f Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-10-17 18:08:55 +08:00
yangxiao 66dd0807eb add isVisibleByVisitingCamera check when visit 2014-10-17 18:07:45 +08:00
honghui 788c58ec90 don't show runtime on top by default 2014-10-17 18:00:26 +08:00
Dhilan007 81a8e80496 [LUA]Add New AudioEngine on window 2014-10-17 17:53:33 +08:00
minggo 8b0f61dfb0 Merge pull request #8817 from huangshiwu/v3_luaruntimelaunchimage 
edit lua-template-runtime's ios info.plist to change launch image's disp...
 2014-10-17 17:52:29 +08:00
minggo 58601fd8ec Merge pull request #8804 from pipu/v3_Modify_Parse_Protobuf_Plist 
Modify reader in order to parse attribute "Plist"
 2014-10-17 17:50:02 +08:00
samuele3hu 30f375ef07 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine 2014-10-17 17:37:18 +08:00
honghui f6b5ebb53b delete unused code 2014-10-17 17:36:45 +08:00
samuele3hu 1d6128443a Update Mac project setting and some lua test cases about UI and ActionTimeline 2014-10-17 17:35:50 +08:00
huangshiwu 9f4689b3ce edit lua-template-runtime's ios info.plist to change launch image's display orientation 2014-10-17 17:29:35 +08:00
minggo 91adb9a26c Merge pull request #8807 from Dhilan007/v3-cpptemplate 
Fix CPP template project crash
 2014-10-17 17:17:07 +08:00
Dhilan007 4bede5067e Fix CPP template project crash 2014-10-17 17:02:22 +08:00
minggo d241e568b0 Merge pull request #8788 from samuele3hu/v3_new_spine 
Update the deprecated Func and update bindings-generator
 2014-10-17 16:35:51 +08:00
pipu 1c187a4653 Modify reader in order to parse attribute "Plist" 2014-10-17 16:35:17 +08:00
minggo 7b5e4f9eba Merge pull request #8800 from joshuastray/v3 
fix typo of file name
 2014-10-17 16:33:34 +08:00
joshuastray 32c6bc05b9 fix typo of file name 2014-10-17 16:29:37 +08:00
youyou 351ef8ea66 add DEPRECATED deprecated information for Armature::drawContour 2014-10-17 16:28:37 +08:00