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

7403 Commits

Author SHA1 Message Date
geron-cn 490b33405d Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_actionline_animationlist 2014-12-25 17:37:05 +08:00
geron-cn 79e5341742 remove animation list binary parse 2014-12-25 17:22:49 +08:00
andyque 3f0f7c289f change setColor to setTextColor 2014-12-25 16:07:34 +08:00
minggo 6ec03010a7 Merge pull request #9630 from andyque/fixCICompile 
fix ci compile error
 2014-12-25 16:03:50 +08:00
andyque 60893607cc fix ci compile error 2014-12-25 15:38:51 +08:00
lvlong 75d2deb2c8 revert 2014-12-25 15:25:19 +08:00
lvlong 3f91957e79 revert 2014-12-25 15:21:53 +08:00
Liam fa85faec68 update for cocos reader 2014-12-25 15:02:22 +08:00
yangxiao 04e273e245 bind setRotationQuat 2014-12-25 14:54:20 +08:00
CocosRobot 6b15f4edcb [AUTO]: updating luabinding automatically 2014-12-25 06:14:03 +00:00
Liam 807e63eae3 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into CocoReader 2014-12-25 14:13:02 +08:00
Liam bd37d806ff update for cocos reader 2014-12-25 14:11:05 +08:00
minggo 2ec85f8c4e Merge pull request #8922 from TimothyZhang/do-not-lock-when-no-message-in-websocket 
avoid locking when message queue is empty in websocket
 2014-12-25 14:09:35 +08:00
minggo 9643b87ed0 Merge pull request #9173 from 2youyouo2/v3 
improve ActionTimeline api
 2014-12-25 14:06:02 +08:00
lvlong a4a108f766 fix lua binding again!! 2014-12-25 14:04:41 +08:00
minggo 0c66e638f7 Merge pull request #8183 from xseekerj/patch-3 
CCPlatformMacros.h
 2014-12-25 14:02:52 +08:00
minggo 2ca143959b Merge pull request #9620 from yinjimmy/LuaStackExecuteScriptFile 
execute script with full file path
 2014-12-25 13:45:46 +08:00
youyou f678d1027c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
 2014-12-25 12:09:31 +08:00
yangxiao 0db70977f9 wrong scale order 2014-12-25 10:39:48 +08:00
yangxiao 510633ba72 wrong spelling 2014-12-25 10:33:49 +08:00
yinjimmy b4a442cd8c fix compile error on windows 2014-12-25 09:33:28 +08:00
yangxiao 6eed142e03 rename _rotation_quat to _rotationQuat 2014-12-24 18:12:00 +08:00
CocosRobot 381be0f6f0 [AUTO]: updating luabinding automatically 2014-12-24 09:41:09 +00:00
minggo 03d53ba7c4 Merge pull request #9585 from doomsdayer/v3_armature_reader 
V3 armature reader
 2014-12-24 17:36:09 +08:00
yangxiao 17207673ff merge cocos 2014-12-24 17:34:58 +08:00
yangxiao 88e0f025ef make it clean 2014-12-24 17:18:09 +08:00
yangxiao 22ae384edf Rotation representation with quaternion fix #9510 2014-12-24 17:07:54 +08:00
minggo 705bf500f7 Merge pull request #9604 from CocosRobot/update_lua_bindings_1419403220 
[AUTO]: updating luabinding automatically
 2014-12-24 17:06:05 +08:00
yusheng.lu 7c34b06969 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader 2014-12-24 16:02:37 +08:00
youyou db6ffd7962 Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x; branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-12-24 15:59:50 +08:00
minggo 0b7572f3ee [ci skip] 2014-12-24 15:35:58 +08:00
yusheng.lu c64792959c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader 2014-12-24 15:32:02 +08:00
lvlong da2683aad9 Merge branch 'frustum' of github.com:lvlonggame/cocos2d-x into frustum 2014-12-24 15:10:48 +08:00
lvlong 4d1ca0966c lua binding 2014-12-24 15:09:26 +08:00
lvlonggame 805b248af3 modify win-project 2014-12-24 15:06:58 +08:00
minggo 42f1d5fdf3 Merge pull request #9601 from minggo/set-glcolor 
Director supports setting clear color
 2014-12-24 14:45:43 +08:00
CocosRobot a5d3e8361b [AUTO]: updating luabinding automatically 2014-12-24 06:42:09 +00:00
minggo bb9fb9f0d6 Merge pull request #9591 from liamcindy/Layout 
update for lay out
 2014-12-24 14:27:08 +08:00
yusheng.lu fa5b4f8df7 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader 
Conflicts:
	cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
	cocos/2d/libcocos2d_wp8.vcxproj.filters

resolve the conflicts
 2014-12-24 13:06:38 +08:00
minggo b925689435 Director supports setting clear color 2014-12-24 11:53:38 +08:00
Liam dcd544cc66 update ui widget function format 2014-12-24 11:12:14 +08:00
Liam 83fcf74882 update for code format 2014-12-24 10:56:01 +08:00
minggo 5d8e004b9b Merge pull request #9600 from huangshiwu/v3_allocator_wp 
fix allocator related compile error on wp8/8.1 and winrt
 2014-12-24 10:54:16 +08:00
kaile.yin 942abfc654 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
 2014-12-24 10:53:09 +08:00
huangshiwu 01eeb15a8d fix allocator related compile error on wp8/8.1 and winrt 2014-12-24 10:45:29 +08:00
minggo ef9c44566b Merge pull request #9593 from CocosRobot/update_lua_bindings_1419317247 
[AUTO]: updating luabinding automatically
 2014-12-24 10:31:58 +08:00
minggo 4cac8e2cb4 Merge pull request #9595 from super626/v3 
Do not try to load empty texture
 2014-12-24 10:31:44 +08:00
songchengjiang ceb834b8d4 read AABB from file(v0.6+) 2014-12-24 10:12:31 +08:00
yinjimmy 24648db2b5 execute script with full file path 2014-12-24 02:18:29 +08:00
yinjimmy b46ee82e90 support bind address for console 2014-12-24 02:04:42 +08:00
yinjimmy a26f62186b track log for windows 2014-12-24 01:26:13 +08:00
Liam 33bd5e3f4c remove unused code 2014-12-23 20:36:18 +08:00
Liam 815ea2a1a5 update for code format 2014-12-23 20:29:53 +08:00
minggo dea483b6ef performance improve 2014-12-23 18:07:22 +08:00
yusheng.lu d543f8f6a2 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader 2014-12-23 16:12:50 +08:00
yangxiao 908b9e470d do not try to load empty texture 2014-12-23 15:52:45 +08:00
yusheng.lu 2b7c0edfed license in ArmatureNodeReader.h added. 2014-12-23 15:13:27 +08:00
andyque d8f726bc4f modify widget default behavior 2014-12-23 15:03:31 +08:00
CocosRobot 864b924dfb [AUTO]: updating luabinding automatically 2014-12-23 06:49:30 +00:00
minggo ca932a38e4 Merge pull request #9538 from andyque/fixCapInsetSize 
restrict capInsets of ui::ImageView, ui::Slider and ui::LoadinbBar
 2014-12-23 14:44:32 +08:00
minggo 90a7f99873 Merge pull request #9570 from liamcindy/UIListView 
override function for listview
 2014-12-23 14:25:46 +08:00
Liam e4360b7616 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Layout 2014-12-23 14:15:55 +08:00
CocosRobot facf9a1a66 [AUTO]: updating luabinding automatically 2014-12-23 04:05:21 +00:00
minggo 40d00e3d97 Merge pull request #9554 from super626/sync_load 
create 3d sprite asynchronously
 2014-12-23 12:00:13 +08:00
yusheng.lu 7eedef71e6 armature node test completed 2014-12-23 11:13:05 +08:00
yangxiao 3d77c7535d merge cocos 2014-12-23 10:35:35 +08:00
yangxiao 2309a524fd simplify AsyncTaskPool 2014-12-23 10:12:37 +08:00
lvlong 026f0a8b25 modify code format. 2014-12-23 09:57:46 +08:00
mannewalis 9d885fe664 default lock macros to nothing for unsupported platforms 2014-12-22 19:49:20 -05:00
mannewalis 09f2eed4b8 default lock macros to nothing for unsupported platforms 2014-12-22 19:46:16 -05:00
mannewalis aad45d6952 fixing windows8 build 2014-12-22 19:43:40 -05:00
yusheng.lu 1e05361873 ios/mac project compeleted 2014-12-22 20:08:27 +08:00
yusheng.lu 2de5ba7c2f vs filters update 2014-12-22 19:43:14 +08:00
yusheng.lu 02b9269cff completed multiplatform projects 2014-12-22 19:39:10 +08:00
Liam 1e85f1a080 Merge branch 'UILayout_Widget' into UILayout_Reader 2014-12-22 19:23:03 +08:00
Liam 377d8ec3c0 Merge branch 'UILayout' into UILayout_Widget 2014-12-22 19:22:09 +08:00
Liam 39d0f183d4 update for code format 2014-12-22 19:05:31 +08:00
youyou 70052b2a3f support animation list 2014-12-22 18:57:48 +08:00
Liam 0465ff8325 remote unuseful format 2014-12-22 18:39:44 +08:00
yusheng.lu b0bfc2906a change armature codes files path 2014-12-22 18:26:50 +08:00
lvlong db9f4a23fe feedback commit. 2014-12-22 18:13:07 +08:00
yusheng.lu 6de7fae114 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader 2014-12-22 18:00:08 +08:00
yangxiao 1ba826ea17 modify code style 2014-12-22 17:40:02 +08:00
lvlong 2058742e4a Merge branch 'frustum' of github.com:super626/cocos2d-x into frustum 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/2d/CCCamera.cpp
	cocos/2d/CCCamera.h
	cocos/3d/CCFrustum.cpp
	cocos/3d/CCFrustum.h
	cocos/3d/CCPlane.cpp
	cocos/3d/CCPlane.h
	cocos/3d/CCRay.cpp
	cocos/3d/CCRay.h
	cocos/3d/CCSprite3D.cpp
	tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.cpp
	tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.h
 2014-12-22 17:37:00 +08:00
yusheng.lu 62c5df2d9d armature node reader done (projs incompleted) 2014-12-22 17:35:39 +08:00
yangxiao e8c7f30541 add quaternion 2014-12-22 17:23:44 +08:00
CocosRobot 34e1bce6c3 [AUTO]: updating luabinding automatically 2014-12-22 08:02:05 +00:00
minggo feacf75f12 Merge pull request #9575 from minggo/MoveTo-MoveBy-support-v3 
#9555 MoveTo and MoveBy support Vec3
 2014-12-22 15:57:12 +08:00
lvlong 63ebf20026 modify code format. 2014-12-22 15:51:10 +08:00
Liam ce9f269680 update object reader for new lay out system 2014-12-22 15:38:47 +08:00
lvlong 7291e6e94a modify about feedback. 2014-12-22 15:23:41 +08:00
Liam f5a242be97 update for widget percent position and size logic 2014-12-22 15:23:26 +08:00
yangxiao bdc12dce8b add quaternion property 2014-12-22 15:14:18 +08:00
minggo 6ac611bd1d Merge pull request #9573 from pipu/update_parse_resource_path 
Update that parse resource path with flat buffers for readers
 2014-12-22 15:11:24 +08:00
minggo 81de0ae687 Merge pull request #9566 from austinkelleher/dev 
Fixing variable name lenght -> length.
 2014-12-22 15:07:15 +08:00
Liam 5a73ea9313 reset widget chaned 2014-12-22 15:04:25 +08:00
minggo 20beb3b9e0 Merge pull request #9567 from joewan/v3-improve-perf 
fix serious performance problem of Animate.
 2014-12-22 14:57:26 +08:00
Liam 7c4d31feab update for lay out samples 2014-12-22 14:51:50 +08:00
minggo 39f56f1303 Merge pull request #9562 from wefiends/upstream2-v3 
AudioEngine-win32.ccp: Switch OpenAL include paths based on OPENAL_PLAINS_INCLUDES.
 2014-12-22 14:50:38 +08:00
minggo 1268f73a7c MoveTo and MoveBy support Vec3 2014-12-22 14:34:35 +08:00
pipu 0c6e22dd77 Update that parse resource path with flat buffers for readers 2014-12-22 13:42:18 +08:00
Liam 56e42b0a0a update for lay out 2014-12-22 11:20:03 +08:00
kaile.yin a8dd2a4e80 Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3 2014-12-22 11:15:07 +08:00
kaile.yin b924dafe83 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/2d/libcocos2d.vcxproj.filters
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
 2014-12-22 11:14:31 +08:00
Liam 8d8215b148 override function for listview 2014-12-22 09:55:29 +08:00
joewanchen bb1267cd09 use auto&. 2014-12-21 14:05:34 +08:00
joewanchen a15a4a0739 fix compile error. 2014-12-21 02:03:41 +08:00
joewanchen c2473b9b99 fix. 2014-12-21 01:03:30 +08:00
joewanchen 3765f87651 fix. 2014-12-21 00:49:23 +08:00
joewanchen 7d6686eb7b fix. 2014-12-21 00:42:55 +08:00
joewanchen fc69dabca2 fix serious performance problem. 2014-12-21 00:22:23 +08:00
Austin Kelleher d3ca364259 Fixing variable name lenght -> length. 2014-12-20 07:34:44 -05:00
Ricardo Quesada 92584bbc7f Merge pull request #9547 from mannewalis/mem_alloc_again 
Mem alloc again
 2014-12-19 14:35:26 -08:00
Nick Barrios 0c2e64b8b9 AudioEngine-win32.ccp: Switch OpenAL include paths based on OPENAL_PLAINS_INCLUDES. 2014-12-19 16:50:47 -05:00
mannewalis 50bd3cf2b7 modify inline macro to work on windows 2014-12-19 10:57:19 -05:00
XiaoYang 9102c77840 Merge pull request #182 from lvlonggame/v3 
camera frustum update
 2014-12-19 16:14:01 +07:00
XiaoYang 6be4538f3d Merge pull request #181 from songchengjiang/sync_load 
fix errors on Windows
 2014-12-19 13:33:20 +07:00
yangxiao eb2e27ef27 Merge branch 'newcode' into sync_load 2014-12-19 14:27:17 +08:00
WenhaiLin 4366fb7230 Fix compile error on WIN32. 2014-12-19 11:49:40 +08:00
songchengjiang f5f95c5693 fix errors on Windows 2014-12-19 11:30:51 +08:00
yangxiao f4dbaa53e4 add to linux 2014-12-19 10:29:10 +08:00
lvlong 13cae3c480 deal tab 2014-12-19 10:25:59 +08:00
yangxiao 5aad841080 add stop task 2014-12-19 10:22:02 +08:00
yangxiao d1a35fe47a make bundle thread safe 2014-12-19 10:21:30 +08:00
yangxiao c788a1892d make it thread safe 2014-12-19 10:20:44 +08:00
yangxiao 37f4d67a49 make it thread safe 2014-12-19 10:20:37 +08:00
minggo 627e5dacfc Merge pull request #9543 from tjunxin/patch-1 
comment line 83
 2014-12-19 10:04:14 +08:00
minggo 8f3e9d9fb1 Merge pull request #9540 from pipu/avoid_crash_during_load_resource_with_flatbuffers 
Update that avoid crash during load resource which serialize by flat buffers.
 2014-12-19 09:58:26 +08:00
minggo 6f0a4191cb Merge pull request #9533 from andyque/fixWebpPremultiplyAlpha 
fix webp format premultipliedAlpha error
 2014-12-19 09:53:44 +08:00
yangxiao 549ec2adab make bundle thread safe 2014-12-19 09:48:20 +08:00
mannewalis 467a5e9c12 minor changes for linux build 2014-12-18 18:21:49 -05:00
mannewalis c05a6c877d adding files to cmake files 2014-12-18 18:10:13 -05:00
lvlong a5746dd2a0 1. modify Android.mk 
2. modify DrawNode3D include path
 2014-12-18 18:14:16 +08:00
lvlong f6bea9b6bb 1.add camera culling. 
2.add camera culling sample.
3.fix bug: load .obj file material.
 2014-12-18 17:18:22 +08:00
yangxiao f54f8a4826 remove return value of enque 2014-12-18 16:16:04 +08:00
yangxiao 6e99698c59 Merge branch 'newcode' into sync_load 2014-12-18 14:03:07 +08:00
tjunxin 561350c2bc comment line 83 
As known,  _glProgramStates is a cocos2d::Map container,it will call object->retain() when insert, and call position->second->release() when erase, so the statement of line 83 is redundant.
If i don't comment line 83, the application will crash when GLProgramStateCache::removeUnusedGLProgramState() is called.
 2014-12-18 13:49:54 +08:00
mannewalis 6b1f994c40 turn off global new delete 2014-12-17 13:55:14 -05:00
mannewalis a6eab3c496 Merge branch 'v3' into mem_alloc_again 2014-12-17 11:59:24 -05:00
mannewalis 34a2f6f640 minor tweak 2014-12-17 11:56:19 -05:00
mannewalis fd22242fb2 added locking semantics to fixed block allocator 
pool allocator uses lockless semantics by default
 2014-12-17 11:54:06 -05:00
pipu 79acf80fb1 Update that avoid crash during load resource which serialize by flat buffers 2014-12-17 19:00:24 +08:00
CocosRobot 9ffacb3f78 [AUTO]: updating luabinding automatically 2014-12-17 10:38:03 +00:00
minggo 9da1317f10 Merge pull request #9453 from sxd1140/v3 
add stopActionByName()
 2014-12-17 18:32:04 +08:00
andyque b11e3d74cc restrict capInsets of ui::ImageView, ui::Slider and ui::LoadinbBar 2014-12-17 16:46:48 +08:00
andyque 6856f03bff fix webp format premultipliedAlpha error 2014-12-17 14:21:46 +08:00
samuele3hu 5c20885ad1 Synchronize the KeyCode Enum to Lua 2014-12-17 11:27:01 +08:00
yangxiao ae0888ba8d merge cocos 2014-12-17 10:06:07 +08:00
minggo d9953d4aac Merge pull request #9519 from andyque/addNewRequirements 
refactor Button restrict capInsetSize logic and cleanup ui coding style
 2014-12-17 09:53:31 +08:00
CocosRobot 189e386846 [AUTO]: updating luabinding automatically 2014-12-16 10:44:15 +00:00
minggo 116ff0de63 Merge pull request #9439 from andyque/addcreateMethodToLoadingBar 
add TextureResType to LoadingBar's create method
 2014-12-16 18:31:20 +08:00
minggo e800b3d9ba Merge pull request #9501 from joewan/v3-fix-mismatch 
V3 fix uninitialized members.
 2014-12-16 18:28:36 +08:00
andyque 16cf396ed7 refactor Button restrict capInsetSize logic and cleanup ui coding style 2014-12-16 16:44:04 +08:00
lvlong 73a2a6385a add frustum culling. 2014-12-16 16:34:35 +08:00
CocosRobot 3d327deb6d [AUTO]: updating luabinding automatically 2014-12-16 02:14:01 +00:00
minggo b3731fa06a Merge pull request #9486 from 2youyouo2/v3_EventFrame 
fixed frame event
 2014-12-16 09:53:43 +08:00
minggo 6b18305550 Merge pull request #9497 from Dhilan007/v3-game 
Fixed content size of Label is incorrect after sets empty string.
 2014-12-16 09:48:36 +08:00
mannewalis 640695c21c reverting android properties change 2014-12-15 16:31:22 -08:00
mannewalis a095635459 android fixes 2014-12-15 16:21:12 -08:00
mannewalis b532ce74d8 diagnostics track allocator enable 2014-12-15 16:16:35 -08:00
mannewalis c50bf94c59 removing Allocator<T> and inheriting base directly. 2014-12-15 09:34:25 -08:00
joewanchen 7b23e3ab1d remove useless function call. 2014-12-15 19:47:25 +08:00
joewanchen 713d19c830 initialize _contentSizeDirty. 2014-12-15 19:43:54 +08:00
joewanchen 0cc4b58383 initialize _startPointCaptured. 2014-12-15 19:42:25 +08:00
yangxiao 5ad408530c merge cocos 2014-12-15 17:47:05 +08:00
Wenhai Lin 4ed5872ba3 Fixed content size of Label is incorrect after sets empty string. 2014-12-15 14:36:57 +08:00
youyou 69824ff07b add space for readable 2014-12-15 09:36:21 +08:00
Vladimir Timofeev be01bede63 Fix couple of warnings. Make forward declarations to match to real declarations. 2014-12-14 21:04:14 +03:00
Vladimir Timofeev 6494a7abae Hide tinyxml2 from user visible header. 2014-12-14 20:32:24 +03:00
Vladimir Timofeev 9bd1ab74c7 Replace #include "tinyxml2/tinyxml2.h" to #include "tinyxml2.h" in new cocostudio code. This should fix build with cmake when USE_PREBUILT_LIBS=NO. Because FindTinyXML2.cmake find tinyxml2.h header (without prefix dir). And some systems install tinyxml2 includes without special directory. 
Also this inclusion style match other existing files such as cocos/platform/CCFileUtils.cpp
 2014-12-14 12:14:16 +03:00
mannewalis cb547413d2 fix range error on reporting all allocators 2014-12-13 11:45:08 -08:00
mannewalis 58be92b35f added more diagnostic info. 
still crashing, but only on device. Suspect a free(p) that was allocated with new.
 2014-12-13 11:42:35 -08:00
mannewalis e81e9a7f47 fixing some issues, still crashing, but want to keep changes. 2014-12-13 10:40:45 -08:00
mannewalis 7b2fea798a add total count and fix remaining reporting issues 2014-12-12 17:16:44 -08:00
mannewalis 00da483e1b minor changes 2014-12-12 14:54:24 -08:00
mannewalis 595b3c1cd2 some minor tweaks comments and logging 2014-12-12 10:54:59 -08:00
mannewalis bc7757a366 adding allocator system 2014-12-12 08:57:06 -08:00
youyou 579bb3f8d8 fixed frame event 2014-12-12 18:02:03 +08:00
minggo cf8b6120a0 Merge pull request #9481 from super626/v3 
CullFace state change bug and fix #9465
 2014-12-12 15:48:31 +08:00
XiaoYang b106b2f7ce Merge pull request #175 from lvlonggame/v3 
fix bug: same model in mirror state cullFace problem.
 2014-12-12 09:52:01 +07:00
minggo 7acb8bfddf Merge pull request #9477 from pipu/update_serialize_plist_file_name 
Update that serialize plist file name and load plist file
 2014-12-12 10:13:18 +08:00
pipu accf66c49f Update that serialize plist file name 2014-12-11 19:15:04 +08:00
minggo 93561fcb8e [ci skip]update version 2014-12-11 18:14:28 +08:00
minggo 07c9251557 Merge pull request #9462 from edwardzhou/fix_UIText_clone_missing_contentSize 
Fix UIText miss copy contentSize for clone
 2014-12-11 17:55:32 +08:00
minggo f0f393654e Merge pull request #9459 from pipu/fix_#9457 
Fixes #9457
 2014-12-11 15:12:48 +08:00
minggo d7c722c67f Merge pull request #9455 from samuele3hu/v3_cocostudio 
Add Websocket support for Mac platform
 2014-12-11 15:12:10 +08:00
lvlong d0ce99413d fix bug: same model in mirror state cullFace problem. 2014-12-11 14:24:26 +08:00
Edward Zhou 1ca92411fc Fix UIText miss copy contentSize for clone 2014-12-11 13:33:28 +08:00
pipu 70b9767c56 1. Fixes #4957 that click test TestChangePlaySection, then it will crash. 
2. Modify default value of selectedState to serialize check box data.
 2014-12-11 11:34:31 +08:00
minggo a1c60bcf24 Merge pull request #9452 from minggo/java-style 
[ci skip]use java coding style
 2014-12-11 10:55:14 +08:00
minggo 48345a0d65 Merge pull request #9441 from pipu/update_reader 
Update Reader
 2014-12-11 10:02:38 +08:00
minggo 7c07bc6a90 Merge pull request #9449 from Dhilan007/v3-keycode 
Make KEY_SHIFT equal to KEY_LEFT_SHIFT, KEY_CTRL equal to KEY_LEFT_CTRL, KEY_ALT equal to KEY_LEFT_ALT.
 2014-12-11 09:58:57 +08:00
samuele3hu 5d3008d6ac Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_cocostudio 2014-12-11 09:51:18 +08:00
Sxd 5f47bef320 add stopActionByName() 2014-12-11 02:57:13 +08:00
minggo 1d1028a68b Merge pull request #9410 from andyque/fixEditBox_v3 
Fix edit box v3
 2014-12-10 18:54:20 +08:00
minggo 0e7470505f replace tab with 4 spaces 2014-12-10 18:32:58 +08:00
Dhilan007 8b78c181ce Make KEY_SHIFT equal to KEY_LEFT_SHIFT, KEY_CTRL equal to KEY_LEFT_CTRL, KEY_ALT equal to KEY_LEFT_ALT. 2014-12-10 18:11:07 +08:00
minggo 77ed7a47e2 use java coding style 2014-12-10 18:07:46 +08:00
pipu d3351a4b11 1. Fix bug that after load .csb file, call Text widget's setString(), content of string dosen't line wrap and content of Text is chaotic. 
2. Update how to parse attribute scale9Enabled
 2014-12-10 17:35:39 +08:00
pipu e81dca372a Update that sets default value of font name for ButtonReader, TextFieldReader, TextReader 2014-12-10 15:46:58 +08:00
pipu 6b6fe4129d Update Reader 2014-12-10 12:36:14 +08:00
minggo 33a8c0d49b Merge pull request #9434 from CocosRobot/update_lua_bindings_1418121129 
[AUTO]: updating luabinding automatically
 2014-12-10 11:15:09 +08:00
minggo eef6d08813 Merge pull request #9402 from doomsdayer/v3_listview 
V3 listview
 2014-12-10 11:13:42 +08:00
andyque 989c05cd2d add TextureResType to LoadingBar 2014-12-10 10:21:17 +08:00
youyou 41c86de0d4 update csloader 2014-12-09 22:13:17 +08:00
samuele3hu 4b43fab3e6 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_cocostudio 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
 2014-12-09 21:03:01 +08:00
CocosRobot b0aacdc287 [AUTO]: updating luabinding automatically 2014-12-09 10:34:49 +00:00
samuele3hu 7e8da62ebc Add Websocket support for Mac platform 2014-12-09 18:29:20 +08:00
kaile.yin 9fdd8cee06 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
 2014-12-09 16:03:33 +08:00
pipu f54254494c Update CCActionTimelineCache.cpp, LayoutReader.cpp, PageViewReader.cpp, ScrollViewReader.cpp, TextFieldReader.cpp, TextReader.cpp 2014-12-09 15:13:09 +08:00
minggo 5ab4f16fb1 Merge pull request #9411 from pipu/v3_reader_update 
V3 reader update
 2014-12-09 13:44:55 +08:00
kaile.yin cb509aa69f Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-12-09 13:33:39 +08:00
lite3 91c7127bbd Merge branch 'v3' into spriteretainframe 2014-12-09 10:51:47 +08:00
lite3 4f4c30051e retain the sprite frame 
do not removed by SpriteFrameCache::removeUnusedSpriteFrames
 2014-12-08 21:04:15 +08:00
yusheng.lu 7426a32d9f 1. ListView demo compeleted. 
2. Optimized ListViewReader format.
 2014-12-08 19:00:12 +08:00
minggo 7749e11614 Merge pull request #9414 from CocosRobot/update_lua_bindings_1418033522 
[AUTO]: updating luabinding automatically
 2014-12-08 18:16:50 +08:00
CocosRobot e510f24663 [AUTO]: updating luabinding automatically 2014-12-08 10:14:41 +00:00
minggo dd5659b6eb Merge pull request #9401 from minggo/iss9398-not-close-dir 
invoke closedir after invoke opendir
 2014-12-08 18:10:41 +08:00
minggo b6b9a5013f Merge pull request #9404 from super626/v3 
bug fix
 2014-12-08 18:08:25 +08:00
pipu 56a25a2644 Update reader 2014-12-08 15:48:24 +08:00
andyque 119a68afd9 fix EditBox move animation position is wrong on iPhone6 Plus 2014-12-08 15:34:58 +08:00
andyque d53d71610b Merge branch 'v3' into fixEditBox_v3 2014-12-08 15:20:06 +08:00
pipu c3365a4654 Add interface that create node with flat buffers object for simulator 2014-12-08 14:32:33 +08:00
minggo 3dd68b47b3 Merge pull request #9390 from liamcindy/UIReader 
update for cocos reader
 2014-12-08 14:25:57 +08:00
minggo c067338c17 closedir when succeed 2014-12-08 11:36:11 +08:00
XiaoYang a59d4ab2a3 Merge pull request #171 from tangziwen/v3 
let billboard can rotate in the Z axis
 2014-12-08 09:34:58 +07:00
yangxiao a1ec27d0b1 calculate aabb if not exist 2014-12-08 10:30:06 +08:00
minggo 74c80296aa invoke closedir after invoke opendir 2014-12-08 09:58:58 +08:00
Dale Stammen 1d908f94ab fixed renameFile for wp8 and winrt to pass file and assetmangers tests 2014-12-05 18:12:25 -08:00
Liam e4b6a2bf57 update for cocos reader 2014-12-05 19:43:40 +08:00
yusheng.lu 2f456a5668 ListViewReader completed and listview callback feature. 2014-12-05 19:31:10 +08:00
Liam be929dcde6 update for cocos reader 2014-12-05 19:19:53 +08:00
yangxiao 2a445ef1d9 correct unsuitable word 2014-12-05 16:44:49 +08:00
yangxiao 11d9f27c00 createAsync comment 2014-12-05 16:11:14 +08:00
yangxiao 5bc74e55df modify comment 2014-12-05 15:59:21 +08:00
yangxiao b665daf2f8 add comment 2014-12-05 15:55:01 +08:00
yangxiao 3439b7f68d refactor async load callback funtion 2014-12-05 15:48:46 +08:00
yangxiao 60e1b54b1a fix ~ThreadTasks() bug 2014-12-05 15:25:56 +08:00
yangxiao c99185b755 add async load test 2014-12-05 15:01:30 +08:00
kaile.yin 1db2bf89e0 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-12-05 14:42:25 +08:00
youyou 04f870edb5 update head file 2014-12-05 10:08:48 +08:00
minggo 959f04cb20 Merge pull request #9378 from lite3/patch-1 
print more info
 2014-12-05 09:30:10 +08:00
minggo 68370ca229 Merge pull request #9381 from pipu/modify_bugs_for_flatbuffers 
Modify bugs for flatbuffers
 2014-12-05 09:28:19 +08:00
youyou 0235c4c377 change head file 2014-12-05 00:10:42 +08:00
Huabing.Xu 697e1fd75e Merge pull request #9377 from dabingnn/v3.3Perf 
performance improvement
 2014-12-04 21:08:24 +08:00
pipu 56f7895e27 Modify bugs for flatbuffers 2014-12-04 20:38:46 +08:00
lite3 8df8ee36db print more info 2014-12-04 19:18:54 +08:00
kaile.yin 9f9c4782f1 change file name 2014-12-04 18:51:32 +08:00
kaile.yin a6653c7d8d change name 2014-12-04 18:50:00 +08:00
Huabing.Xu 27ff06b1d2 performance improvement 2014-12-04 18:37:57 +08:00