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

649 Commits

Author SHA1 Message Date
minggo cc3a9d0737 fix crash caused by std::regex() 2014-07-01 16:09:25 +08:00
Huabing.Xu e1d97ecb59 Merge branch 'v3' into v3_fix 2014-07-01 14:54:28 +08:00
Huabing.Xu 75c7777999 fix Effect3dSprite memory leak 2014-07-01 14:48:46 +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
andyque 9ef0544953 call parent onExit method 2014-06-30 18:22:58 +08:00
minggo 100968e4e5 Merge pull request #7254 from dabingnn/v3_fix 
fix outline bug
 2014-06-30 17:26:11 +08:00
Huabing.Xu 395e61f977 fix outline bug 2014-06-30 17:21:04 +08:00
Dhilan007 26f3445311 add missing files for the projects 2014-06-30 17:07:55 +08:00
Huabing.Xu 47471e202d Merge branch 'v3' into fast_tmx 
Conflicts:
	cocos/2d/cocos2d.vcxproj.filters
 2014-06-29 20:23:43 +08:00
minggo 4f79176da2 Merge pull request #7234 from boyu0/iss5614_physics_transform 
closed #5614: add transform support for physics
 2014-06-29 17:23:20 +08:00
Huabing.Xu 3771654e66 remove deprecated function 
rename enum to static const member of class
remove hex tile map(we do not support it yet)
 2014-06-27 18:00:06 +08:00
boyu0 fccc517eef add test for physics transform. 2014-06-27 17:30:50 +08:00
yangxiao 4685a8654e Animate3D transition 2014-06-27 17:02:08 +08:00
Huabing.Xu 33a8b6563f windows works for fast tmx 2014-06-27 16:56:26 +08:00
yangxiao 2a6ce26335 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-06-27 16:36:36 +08:00
yangxiao 343ef9ae55 update sprite3d test 2014-06-27 16:36:01 +08:00
lvlong a497cc0ed2 wrong suffix name 2014-06-27 15:53:25 +08:00
lvlong fac17097a0 add a new model and change girl model to it 2014-06-27 11:44:44 +08:00
yangxiao 392a769c8f merge cocos2d v3 2014-06-26 22:48:42 +08:00
yangxiao ccb39e51b2 animation3d transition not finished 2014-06-26 18:35:12 +08:00
minggo 768eb4e1d0 Merge pull request #7222 from minggo/warnings-fix 
fix warnings
 2014-06-26 17:24:13 +08:00
minggo dc635db163 fix warnings 2014-06-26 16:15:02 +08:00
minggo e0e9d3379c Merge pull request #6948 from lite3/v3 
Add immediate send request
 2014-06-26 16:05:58 +08:00
minggo 2917596d5e add utils::findChildren() 2014-06-26 14:05:30 +08:00
zhangcheng a6d6287b29 1. remove hungary style. 
2.  fixes build error.
 2014-06-26 10:08:17 +08:00
andyque a4bd3879ac fix ListView addChild problem 2014-06-25 16:17:16 +08:00
zhangcheng bdf7be6fa0 1. add classname = "" log. 2014-06-25 14:32:38 +08:00
minggo 7eb6ed75b8 Merge pull request #7197 from andyque/dimissListViewFocus 
dimiss ListView focus tests
 2014-06-25 14:11:36 +08:00
andyque 634f1b58c4 add todo to reminder me 2014-06-25 14:10:53 +08:00
andyque 1902fdc9f4 dimiss ListView focus tests 2014-06-25 14:04:32 +08:00
andyque 6df8079fd7 closed #5591, fix UIButton setTitleColor & getTitleColor not match 2014-06-25 13:47:29 +08:00
lvlong 7331ef49b6 don't rotate girl model 2014-06-25 13:29:45 +08:00
lvlong 8cc4520deb add boss.c3b 2014-06-25 13:22:04 +08:00
lvlong 658a955e36 modify skindata binary reading 2014-06-25 13:20:42 +08:00
zhangcheng 644b61e261 1. add SceneBinary to 2.x 2014-06-25 11:58:36 +08:00
Huabing.Xu 290897af14 Merge branch 'v3' into fast_tmx 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-06-25 10:10:08 +08:00
minggo 63d0f66553 Merge pull request #7189 from andyque/feature5161 
replace size with contentSize
 2014-06-24 18:43:33 +08:00
lvlong dc0101737c test for tony 2014-06-24 14:43:20 +08:00
lvlong 431378a41e commit for tony test 2014-06-24 14:10:03 +08:00
minggo 4bb6545250 Merge pull request #7166 from boyu0/bug5541_rotation_action_for_physics 
closed #5541: Add rotation action support for physics.
 2014-06-24 10:46: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
yangxiao c65e5d6872 simplify shader, bath sprite3D render 2014-06-23 19:08:26 +08:00
minggo fc7b42c0e5 Merge pull request #7157 from 2youyouo2/v3 
update action timeline
 2014-06-23 18:38:46 +08:00
andyque 7eae7625c1 Merge branch 'v3' into cleanupBinaryLoader 2014-06-23 18:30:03 +08:00
andyque 808c4bd763 remove unused override method 2014-06-23 15:46:07 +08:00
andyque e72d89ba2f fix windows tests compile error 2014-06-23 15:21:25 +08:00
boyu0 c40c461848 closed #5541: add warning code and comment. 2014-06-23 13:55:52 +08:00
andyque c9bcbfb265 fix addEventListener hidden problem 2014-06-23 12:09:49 +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