Commit Graph

2034 Commits

Author SHA1 Message Date
Huabing.Xu aaa65dcae4 Merge branch 'v3' into v3_windowChangeModule 2014-07-29 10:20:23 +08:00
Huabing.Xu 4a4f05c827 change cocos2d to libcocos2d for windows 2014-07-28 20:55:58 +08:00
minggo 7ad7b5b3f7 Merge pull request #7585 from wagulu/patch-1
Update CCParticleSystem.cpp
2014-07-28 10:54:05 +08:00
Dhilan007 b9cfa4a8b5 fix warn 2014-07-25 14:38:02 +08:00
LiuZhuo 2f10e8e468 Update CCParticleSystem.cpp 2014-07-25 11:40:23 +08:00
Huabing.Xu 58cd01b2f6 reverse cocos2d.vcxproj 2014-07-24 10:37:54 +08:00
wagulu 46ac5d12b2 Update CCParticleSystem.cpp
diff is base on WorldSpace, when you scale scene,you will get the wrong value.
2014-07-23 21:04:17 +08:00
minggo 3662077025 Merge pull request #7556 from Dhilan007/v3
fixed FontAtlasCache::getFontAtlasCharMap may returns the same instance when using different arguments.
2014-07-23 11:29:26 +08:00
LinWenhai 0fe02b3636 Update CCFontAtlasCache.cpp 2014-07-22 22:07:19 +08:00
LinWenhai 815d063a0a replace sprintf with snprintf 2014-07-22 22:05:56 +08:00
Sergey 2acce6771f software per decompression support 2014-07-22 15:49:36 +04:00
Dhilan007 f38b48914f fixed FontAtlasCache::getFontAtlasCharMap may returns the same instance when using different arguments. 2014-07-22 18:31:53 +08:00
zhangcheng 6cfc5b72dc 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
Huabing.Xu e666ab88ed fix windows compile error 2014-07-21 14:59:47 +08:00
Huabing.Xu 23db16b0bd convert indention to space 2014-07-18 14:53:00 +08:00
Huabing.Xu 8afd7614d1 Merge branch 'v3' into v3_dll 2014-07-18 14:01:17 +08:00
minggo 462f9bdd78 Merge pull request #7502 from visiblelight/render_texture_disabled
The orientation of render texture should be rotated
2014-07-17 20:09:01 +08:00
visiblelight 7e7c3aeb1c The orientation of render texture should be rotated when _keepMatrix is true 2014-07-17 19:53:35 +08:00
Huabing.Xu 52ac47aea8 Merge branch 'v3' into v3_dll 2014-07-17 18:27:36 +08:00
minggo 91a537dec6 Merge pull request #7493 from visiblelight/render_texture_disabled
no need to save/restore for render texture when entering background
2014-07-17 17:07:54 +08:00
vision a2413a6538 no need to save/restore for render texture when entering background 2014-07-17 17:03:10 +08:00
minggo c482e2e14f Merge pull request #7491 from Dhilan007/v3-320final
fixed text line wrap issue in UITextField.
2014-07-17 16:48:41 +08:00
Dhilan007 8ac1398037 fixed text line wrap issue in UITextField. 2014-07-17 16:23:38 +08:00
Huabing.Xu 3c6e87d34e Merge branch 'v3' into v3_dll
Conflicts:
	cocos/base/ccUtils.h
2014-07-17 14:12:10 +08:00
andyque 4f5cd2a368 change FastTileMap to TileMap 2014-07-17 14:09:53 +08:00
andyque 880c2c4c3f change FastTiledMap namespace to cocos2d::experimental 2014-07-17 10:46:20 +08:00
minggo 2403bc2e50 Merge pull request #7343 from zhouxiaoxiaoxujian/feature/COC-10
Add getChildByName method for get a node that can be cast to Type T
2014-07-17 10:02:57 +08:00
Huabing.Xu a0be6d9ac7 remove Storage project, merge code into cocos2d 2014-07-16 14:49:05 +08:00
Huabing.Xu 0350186589 Merge branch 'v3' into v3_dll 2014-07-16 11:15:16 +08:00
Huabing.Xu 63de5f6acc add CC_DLL 2014-07-15 12:00:31 +08:00
Huabing.Xu 8bbce767f3 add CC_DLL for ActionEase 2014-07-14 22:42:44 +08:00
Dhilan007 5e10575ab0 disable warn on zero-sized structures. 2014-07-14 17:53:55 +08:00
Huabing.Xu 9806b37398 add CC_DLL of DrawPrimitive 2014-07-14 17:40:02 +08:00
minggo 981922eb95 Merge pull request #7432 from joshuastray/transition_ctor_access
move constructors and destructors to CC_CONSTRUCTOR_ACCESS and add needed constructors for js bindings
2014-07-14 16:28:18 +08:00
Huabing.Xu 52c0bd365b add chipmunk.lib for release 2014-07-14 14:47:00 +08:00
Huabing.Xu 469dbea7da window dll version work now 2014-07-14 14:40:47 +08:00
joshuastray 98b1c0bbed add needed constructors for js bindings 2014-07-14 14:25:36 +08:00
joshuastray e14c2587b5 move constructors and destructors to CC_CONSTRUCTOR_ACCESS 2014-07-14 14:25:06 +08:00
minggo cfc291e49d Merge pull request #7379 from joshuastray/v3
move JumoTo's copy constuctor and operator= to private
2014-07-12 20:19:03 +08:00
Dhilan007 d8cdb75851 Fix compile errors on WP8 2014-07-11 15:10:19 +08:00
minggo 6c37541657 Merge pull request #7363 from Dhilan007/v3-event-clear
Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8.
2014-07-11 13:36:52 +08:00
Huabing.Xu 60dd7a4514 Merge branch 'v3' into v3_dll 2014-07-11 11:10:26 +08:00
Huabing.Xu f5cffba6c9 change pure virtual function to virtual function in action series
remove unimplemented function to deprecated and give an empty implementation
add CC_DLL to Vec2
2014-07-11 10:19:49 +08:00
joshuastray 7396f447a4 move initWithDuration to CC_CONSTRUCTOR_ACCESS 2014-07-10 17:56:20 +08:00
minggo 831b0b332b Merge pull request #7371 from minggo/enumerateChildren-fix
Node::enumerateChildren  just searches from itself
2014-07-10 15:46:04 +08:00
minggo c7856b21fd Merge pull request #7366 from Dhilan007/v3-fixed-warn
fixed warn and replace NULL with nullptr.
2014-07-10 15:42:02 +08:00
joshuastray 30574af6c5 move JumoTo's copy constuctor and operator= to private 2014-07-10 14:30:08 +08:00
minggo 0ba3f6c1c9 Merge pull request #7376 from joshuastray/v3
use CC_CONSTRUCTOR_ACCESS to replace protected/private
2014-07-10 14:14:08 +08:00
joshuastray 6b22870e27 use CC_CONSTRUCTOR_ACCESS to replace protected 2014-07-10 14:00:23 +08:00
minggo 316564d58a Node::enumerateChildren just searches from itself 2014-07-10 11:07:39 +08:00