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

1940 Commits

Author SHA1 Message Date
Huabing.Xu eba84b5dea fix wrong indentions 2014-06-27 14:45:30 +08:00
Huabing.Xu 1152f77ed7 clean up fast tmx code 2014-06-27 14:42:53 +08:00
Huabing.Xu b232896f85 roll back fps compute logic 
fix crash bug
 2014-06-27 13:41:06 +08:00
Huabing.Xu 6292ed05be improvement for fast tmx rendering 2014-06-27 11:50:44 +08:00
Huabing.Xu a04b5fc5d5 use custom command for fast_tmx rendering 2014-06-27 10:30:21 +08:00
Huabing.Xu 81aa9c2c74 use custom command for rendering 2014-06-26 20:45:08 +08:00
Huabing.Xu 87e5e1460e adjust some code to reduce indentions 2014-06-26 11:45:15 +08:00
Huabing.Xu c1b5984ce8 using stable sort for quads 2014-06-25 11:08:47 +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
Huabing.Xu bda9708206 clean up Fast TMX code2 2014-06-25 10:06:37 +08:00
Huabing.Xu 67f83f43b0 clean up Fast TMX code 2014-06-25 10:04:20 +08:00
minggo 7155eb4ebb use reference instead 2014-06-24 18:23:10 +08:00
minggo 3336f7edad use reference instead 2014-06-24 14:53:02 +08:00
Huabing.Xu 740372ceb3 new version of rendering for tile map 2014-06-24 11:04:17 +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
boyu0 f2ecb31958 closed #5541: add more warning for unsupported functions. 2014-06-24 10:33:21 +08:00
boyu0 c40c461848 closed #5541: add warning code and comment. 2014-06-23 13:55:52 +08:00
Dale Stammen 5e1f0b5799 added missing files and tests that broke wp8 build 2014-06-20 09:07:51 -07:00
boyu0 2fc8889791 issue #5541: change RotateTo/RotateBy for Physics. 2014-06-20 18:40:21 +08:00
Huabing.Xu bb4128036c use quad command for tile map rendering 2014-06-20 18:10:18 +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
gin0606 3ae8e29ce5 Add new line at the end of a file to *.h 2014-06-19 20:45:49 +09:00
gin0606 bf4f30d14b Add new line at the end of a file to *.cpp 2014-06-19 20:45:24 +09:00
Huabing.Xu f82be936b5 Merge branch 'fast_tmx_copy' into fast_tmx 
Conflicts:
	cocos/2d/CCFastTMXLayer.cpp
 2014-06-19 18:10:44 +08:00
Huabing.Xu e03c412e71 refactor fast tmx rendering 2014-06-19 18:05:21 +08:00
boyu0 5f10ff2c29 issue #4437: change name TMXLayer2 and TMXTiledMap2 to FastTMXLayer and FastTMXTiledMap, change Point to Vec2 2014-06-19 15:57:13 +08:00
minggo 136033c282 not set _orderOfArrival to 0 after visit 2014-06-19 15:09:27 +08:00
minggo e60e3c217d Merge pull request #7046 from Dhilan007/v3-label-improve 
1.Support setting up the line height and additional kerning of label.
 2014-06-19 09:44:51 +08:00
boyu0 d89c2176c3 issue #4437: add vertex z support, fix some bugs. 2014-06-18 18:19:13 +08:00
Dhilan007 9351172baf add test case for new API of Label. 2014-06-18 18:01:55 +08:00
minggo 08453b911d Merge pull request #7071 from pandamicro/Script_onEnter_fix 
Fixed #5563: Wrap override onEnter function by script call detection code to solve bugs in JSB
 2014-06-18 13:37:57 +08:00
pandamicro 94fdff1da9 Fixed #5563: Make sendNodeEventToXXX as static functions of ScriptEngineManager in CCScriptSupport 2014-06-18 11:51:52 +08:00
minggo 6ecca08340 Merge pull request #7039 from minggo/get-child-by-name 
issue #4693: add getName(), setName() and getChildByName()
 2014-06-18 11:30:14 +08:00
Dale Stammen da9a652868 added missing files to project 2014-06-17 09:27:36 -07:00
minggo 4da24dfade issue #4693: correct comment 2014-06-17 16:21:24 +08:00
lvlong ef32bffceb modify bundle3D load() 2014-06-17 13:59:03 +08:00
minggo 53963a2441 issue #4693:enumerateChildren() support regular expression 2014-06-17 11:43:03 +08:00
lvlong ae5965f05f test new version and modify vs2012 project 2014-06-17 10:52:55 +08:00
yangxiao 452fdc047a Merge branch 'newcode' into v3 2014-06-16 22:36:01 +08:00
yangxiao 927d29f334 bug on Repeat when diff bigger than duration 2014-06-16 18:21:47 +08:00
pandamicro d00c9fe70a Fixed #5563: Add sendNodeEventToJSExtended function to fix issues and remove lua event send (unnecessary) 2014-06-16 12:50:35 +08:00
minggo 111e08062f Merge pull request #7056 from visiblelight/render_texture 
Use RGBA when saving a file from render texture
 2014-06-16 10:44:30 +08:00
yangxiao dd8f66ce57 merge loader 2014-06-16 00:01:38 +08:00
pandamicro d524ba1013 Fixed #5563: Wrap override onEnter function by script call detection code to solve bugs in JSB 2014-06-13 17:59:23 +08:00
vision 33fb1dd050 Make the API more extendable 2014-06-13 15:27:59 +08:00
vision 7e99121af7 Change the default pixel format from RGB to RGBA for render texture when saving as PNG. 2014-06-13 13:35:18 +08:00
boyu0 ee919b673f issue #4437: config for android and linux. 2014-06-13 11:07:21 +08:00
pandamicro 7ccff325b6 Issue #5554: Define __NodeRGBA's constructor as CC_CONSTRUCTOR_ACCESS for JSB usage 2014-06-13 10:29:40 +08:00
lvlong 742ea7f2df Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 
Conflicts:
	cocos/2d/cocos2d.vcxproj.filters
	cocos/3d/CCBundle3D.cpp
	cocos/3d/CCBundle3D.h
 2014-06-12 15:53:41 +08:00