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

658 Commits

Author SHA1 Message Date
minggo 5b282e338f Merge pull request #7279 from andyque/fixTextReader 
fix Text reader font name
 2014-07-02 10:04:00 +08:00
andyque fb3e499d9d fix Text reader font name 2014-07-02 10:08:04 +08:00
minggo d9a1f76755 fix effect of spine 2014-07-02 09:58:07 +08:00
andyque 7d2685ba02 fix content Size 2014-07-01 21:02:37 +08:00
minggo 80204e3048 Merge pull request #7201 from chengstory/cleanupBinaryLoader_AddSceneBinaryParse 
Cleanup binary loader add scene binary parse
 2014-07-01 13:47:35 +08:00
minggo 40e88ab6eb Merge pull request #7251 from 2youyouo2/v3_current_frame_index 
add gotoFrameAndPlay and setCurrentFrame interface
 2014-06-30 17:32:24 +08:00
zhangcheng a3fcddde39 1. NULL->nullptr. 
2. bRet->ret.
 2014-06-30 17:15:55 +08:00
2youyou2 b76127231c add gotoFrameAndPlay and setCurrentFrame interface 2014-06-30 15:53:12 +08:00
pandamicro bee41712ad Fix Travis CI compilation issue 2014-06-30 11:58:15 +08:00
2youyou2 30a13c05c9 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-06-30 11:08:22 +08:00
2youyou2 aba7421ef6 fixed crashed when remove armature in frame event. 2014-06-30 10:14:31 +08:00
2youyou2 1a9e42ef85 fixed armature blend func has no effect 2014-06-30 10:11:43 +08:00
andyque d06ca0e75d fix gui reader 2014-06-26 17:29:07 +08:00
zhangcheng a6d6287b29 1. remove hungary style. 
2.  fixes build error.
 2014-06-26 10:08:17 +08:00
Dale Stammen 3fd615845b removed deleted header file from project 2014-06-25 10:08:54 -07:00
zhangcheng 98c21f6f57 1. remove Hungary style. 2014-06-25 18:10:06 +08:00
zhangcheng bdf7be6fa0 1. add classname = "" log. 2014-06-25 14:32:38 +08:00
zhangcheng 644b61e261 1. add SceneBinary to 2.x 2014-06-25 11:58:36 +08:00
minggo 66703addb2 fixed #4693: override addChild by name 2014-06-25 11:27:48 +08:00
minggo 63d0f66553 Merge pull request #7189 from andyque/feature5161 
replace size with contentSize
 2014-06-24 18:43:33 +08:00
minggo 76e2540fd7 Merge pull request #7163 from darkdukey/fixNodeReader 
Fix NodeReader crash
 2014-06-24 10:49:10 +08:00
andyque 199ad9c623 issue #5161, replace deprecated methods 2014-06-24 10:18:01 +08:00
andyque 312ab4f396 Merge branch 'v3' into feature5161 
Conflicts:
	cocos/editor-support/cocostudio/CCSGUIReader.cpp
	cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.cpp
	cocos/editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.cpp
	cocos/editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.cpp
	cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp
	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp
 2014-06-24 09:51:18 +08:00
Dale Stammen 44d6248056 added missing cocoloader files 2014-06-23 08:31:29 -07:00
minggo fc7b42c0e5 Merge pull request #7157 from 2youyouo2/v3 
update action timeline
 2014-06-23 18:38:46 +08:00
andyque d2680f2884 fix windows compile error 2014-06-23 18:29:23 +08:00
andyque 3e5ab0ec8e fix linux compile error 2014-06-23 17:09:54 +08:00
andyque ce58c2ddd6 remove unused header file 2014-06-23 16:53:06 +08:00
andyque 87455b0ecb add constness to some function 2014-06-23 10:12:54 +08:00
andyque 8a463e7964 remove Hungry style 2014-06-23 10:02:09 +08:00
andyque 5624da5448 Merge branch 'v3' into cleanupBinaryLoader 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/editor-support/cocostudio/CCSGUIReader.h
	cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters
 2014-06-23 09:37:39 +08:00
Nite Luo 21330860a9 Fix NodeReader will crash when encountered unknown NodeType 2014-06-20 17:24:34 -07:00
Dale Stammen 5e1f0b5799 added missing files and tests that broke wp8 build 2014-06-20 09:07:51 -07:00
andyque 5f5b705bee refactor setSize to setContentSize and deprecated the old interface 2014-06-20 14:03:33 +08:00
yinkaile 1aa07906a1 add new line at the end of the file 2014-06-20 11:36:48 +08:00
yinkaile aac4ded898 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-06-20 11:24:12 +08:00
yinkaile 510bc23b16 1.fixed action may shake a little 
2.fixed frame event will emit even they do not in current play section
 2014-06-20 11:23:26 +08:00
yinkaile 043c640037 fixed warning and logic error 2014-06-20 10:52:14 +08:00
zhangbin ec62f05b12 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-06-20 10:51:13 +08:00
zhangbin 0019d9a061 Optimize the win32 projects configuration. 2014-06-20 10:50:43 +08:00
minggo e374bd67c7 Merge pull request #6946 from hanjukim/skip-utf8-bom 
Skip UTF8 BOM if it exists and bug fix for unterminated string
 2014-06-19 22:02:38 +08:00
minggo 0d07e19cd1 Merge pull request #7054 from 2youyouo2/v3 
add TimelineAction
 2014-06-19 21:05:15 +08:00
gin0606 bf4f30d14b Add new line at the end of a file to *.cpp 2014-06-19 20:45:24 +09:00
andyque 4d64b166cc refactor - replace magic string with const string 2014-06-19 17:04:14 +08:00
andyque a26ef87783 cleanup reader code 2014-06-19 15:16:56 +08:00
andyque 515de9eda5 remove magic string of widget json reader 2014-06-19 14:40:24 +08:00
2youyou2 0ce51162af support Label widget 2014-06-19 14:11:37 +08:00
子龙山人 e1095c4f09 Merge pull request #9 from geron-cn/guanghuiv3 
Guanghuiv3
 2014-06-19 13:38:53 +08:00
geron-cn 6abc9aba0e add binary read to test-cpp 2014-06-18 20:09:12 +08:00
andyque b55b95adc3 fix linux compile error 2014-06-18 18:28:31 +08:00