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

24993 Commits

Author SHA1 Message Date
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
minggo 6367727e18 Merge pull request #8784 from pipu/v3_Modify_Bug_#8770 
Fixed #8770
 2014-10-17 15:47:30 +08:00
minggo d8684091b0 Update RELEASE_NOTES.md 2014-10-17 15:38:16 +08:00
minggo 2cc5f6758b update version 2014-10-17 15:36:34 +08:00
minggo 74fe28e5e5 Update RELEASE_NOTES.md 2014-10-17 15:30:43 +08:00
minggo da01599ee2 update release note 2014-10-17 15:26:28 +08:00
minggo 6f55818146 Merge pull request #8791 from cocoscodeide/v3 
win32 runtime need more dll files
 2014-10-17 15:13:48 +08:00
samuele3hu 936510411b Rename addSpriteFramesWithFile->addSpriteFrames for SpriteFrameCache 2014-10-17 15:04:16 +08:00
honghui 8c0af59f9a open lua debugger only when IDE connected 2014-10-17 14:55:20 +08:00
honghui 8a38d192bb win32 runtime need more dll files 2014-10-17 14:55:20 +08:00
minggo 31664d979a Merge pull request #8783 from andyque/adjustUITestProject 
fix scrollView rotate issue
 2014-10-17 14:54:32 +08:00
minggo 9c3a64000b Merge pull request #8790 from Dhilan007/v3-android-release 
Default build mode of samples change to release builds on android
 2014-10-17 14:53:59 +08:00
Dhilan007 d997fdc7f7 Default build mode of samples change to release builds 2014-10-17 14:51:34 +08:00
minggo 73836e432d Merge pull request #8787 from CocosRobot/update_lua_bindings_1413527197 
[AUTO]: updating luabinding automatically
 2014-10-17 14:41:03 +08:00
samuele3hu 14f91ea9f6 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_new_spine 2014-10-17 14:38:07 +08:00
samuele3hu dfd2077648 Update the related manifests files for assetsmanager tests 2014-10-17 14:35:52 +08:00
samuele3hu 4593b55e1a Update bindings-generator submodule 2014-10-17 14:32:24 +08:00
CocosRobot e8373e9b41 [AUTO]: updating luabinding automatically 2014-10-17 06:28:36 +00:00
samuele3hu dd2ad66e41 Update bindings-generator submodule 2014-10-17 14:23:58 +08:00
minggo 871b440fc7 Merge pull request #8786 from andyque/changeCCSSubmodule 
update css submodule
 2014-10-17 14:23:56 +08:00
andyque e76b605aeb update css submodule 2014-10-17 14:22:48 +08:00
samuele3hu c4d3914230 Fix the lua-tests compile error in the release condition 2014-10-17 14:16:17 +08:00
samuele3hu 066d94530c Update the Deprecated Func 2014-10-17 14:15:30 +08:00
pipu 778701595c Fixed #8770 2014-10-17 14:11:15 +08:00
minggo 18ca7c936c Merge pull request #8768 from Dhilan007/v3-33rc 
Improve Android.mk
 2014-10-17 14:09:49 +08:00
andyque 952e52365b fix scrollView rotate issue 2014-10-17 14:02:49 +08:00