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

1305 Commits

Author SHA1 Message Date
minggo aa573a9553 Merge pull request #10904 from pipu/fixed_widget_reader_actiontag 
Optimize parse action tag for node and widget.
 2015-03-17 14:18:22 +08:00
konopka 0387b13bb6 Adding missing virtual keywords 2015-03-16 16:39:43 +01:00
pipu a5e9ebc4e6 Fix parse action tag for widget. 2015-03-16 20:04:59 +08:00
Martin Konopka 2c80b6ae3a Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] 2015-03-15 00:10:08 +01:00
Martin Konopka cd12d08a52 Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] 2015-03-14 19:33:15 +01:00
Nite Luo cfa1f0c84f Merge pull request #10843 from konopka/fix_compiler_reorder_warnings 
Get rid of compiler warnings: field '_xxx' will be initialized after field '_yyy'...
 2015-03-13 21:12:35 -07:00
Huabing.Xu 639ed335b3 Merge pull request #10839 from pipu/node_load_callback 
To add the function node load callback called during create node from csb file.
 2015-03-13 15:06:14 +08:00
Martin Konopka 350b81501d Get rid of warnings: field '_xxx' will be initialized after field '_yyy' [-Wreorder] 
Initialization follows the order of declaration, not the order of the initialization list.
 2015-03-12 23:47:58 +01:00
pipu 56c3d1c6f6 To add the function node load callback called during create node from csb file. 2015-03-12 17:36:39 +08:00
pipu 7515fc78f5 To set csd version for serializing. 2015-03-12 16:15:17 +08:00
pipu c72c8e865d To reconstruct object extension data. 2015-03-12 15:47:15 +08:00
pipu 90da84a663 To modify that check whether or not string is not empty. 2015-03-11 09:59:07 +08:00
pipu 00bf9f5bfb To optimize the situation that source path is existed, but source is not existed. 2015-03-10 17:48:48 +08:00
m2q1n9 c97742072f fix cocostudio anchor point bug 
fix a bug which will cause anchor point config not work
 2015-03-09 14:30:41 +08:00
pipu c21538e6e2 Merge branch 'v3' into reconstruct_parse_callbackbind 2015-03-09 10:38:02 +08:00
pipu 1fa9b2577a Merge branch 'v3' into reconstruct_parse_callbackbind 2015-03-09 10:16:14 +08:00
yangxiao 8137b01f23 merge cocos 2015-03-06 18:31:57 +08:00
minggo 65926a9f0b Merge pull request #10734 from pipu/projectnode_animation_innerspeed 
Serialize and parse attribute "innerspeed" for ProjectNode.
 2015-03-06 15:43:57 +08:00
pipu fadac31868 Serialize and parse attribute "inner speed" for ProjectNode. 2015-03-05 15:48:17 +08:00
pipu be1b0b7239 To modify layout attribute name that are used in serialized and parsed. 2015-03-05 14:34:35 +08:00
yangxiao faf299c5a1 make path shorter 2015-03-05 13:24:06 +08:00
pipu 010a077fa8 To reconstruct callback binding for nest node as WidgetCallBackHandlerProtocol in CSLoader. 2015-03-04 17:29:40 +08:00
Ray 83a7b8012c 3DParticle Reader and tests 2015-02-26 09:19:14 +08:00
Ray 2f4fbbf4e8 fix the define problem 2015-02-25 14:28:39 +08:00
Ray 94523b667a Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3 2015-02-25 14:19:37 +08:00
Ray c66a4f28bc Add CocosStudio UserCameraReader 
fix Sprite3DReader Test
 2015-02-25 14:19:08 +08:00
Dale Stammen b39b078593 fixed conflict with near and far defined in windows.h for Win32, WP8 and WinRT platforms 2015-02-24 14:39:21 -08:00
Ray c5cc1ebaa2 fix test project 2015-02-23 16:35:46 +08:00
Ray fbe9e5b767 complate project file 2015-02-23 00:52:50 +08:00
Ray 35e3e8d62d Sprite3D Reader and tests 2015-02-23 00:34:30 +08:00
Ray 8eb201797d 工程文件修改 2015-02-19 17:52:50 +08:00
Ray 73e40f1c4b Node3DReader Test 2015-02-19 16:18:54 +08:00
Ray 2f01deee89 3D Editor Reader 
Node3DReader
 2015-02-19 12:08:09 +08:00
kompjoefriek 89152b2856 Tabs to spaces 
Changed indenting tabs to spaces
 2015-01-29 10:40:00 +01:00
kompjoefriek 0c70660551 Fixed warnings 
- signed/unsigned mismatch
- printing enum with %d
- using int as bool
 2015-01-29 01:36:22 +01:00
andyque ac3d79a516 add constructor to AnimationInfo 2015-01-28 16:59:27 +08:00
geron-cn df10a974fa fix projectnode 2015-01-27 23:19:27 +08:00
minggo f09626bcfb Merge pull request #10235 from pipu/modify_parse_ignoresize 
Modify that parse ignoreSize for TextAtlas, TextBMFont.
 2015-01-27 18:44:01 +08:00
minggo 15bf919000 Merge pull request #10231 from geron-cn/fixanimationlistclone 
FIX BUG:  animationinfos lost after actiontimeline clone
 2015-01-27 15:24:25 +08:00
pipu ed1b7edce7 Modify that parse ignoreSize for TextAtlas, TextBMFont. 2015-01-27 15:09:48 +08:00
geron-cn 390c336a19 FIX animationfio lost after actiontimeline clone 2015-01-27 12:04:14 +08:00
geron-cn d3baae0304 Merge branch 'v3' of github.com:cocos2d/cocos2d-x into fixProjectNodeLoader 2015-01-26 21:21:31 +08:00
geron-cn a1a7273436 fix bug: fix crash when lack of projected file 2015-01-26 21:20:26 +08:00
pipu 35c1e73b8f Checking whether tileset is valid during parses TMXTiledMap in GameMapReader. 2015-01-26 13:14:17 +08:00
kompjoefriek ca48c5e5dd Fixed lots of compiler warnings 
- signed / unsigned mismatches
- using int as bool
- Removed throw() from CCFrame.h, why is explained here:
http://www.gotw.ca/publications/mill22.htm
 2015-01-23 02:02:33 +01:00
pipu c0a662ff13 Modify bug that parses AnchorPointFrame. 2015-01-22 11:20:01 +08:00
geron-cn 2fc79e2da5 ProjectNode's actiontimeline should jump to 0 frame when after nest into another csd 2015-01-21 15:21:23 +08:00
yusheng.lu f274277367 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_version_1 2015-01-20 14:35:15 +08:00
pipu ea84ae78dc Invoke FileUtils::getInstance()->getStringFromFile() instead of FileUtils::getInstance()->getFileData(). 2015-01-19 17:16:26 +08:00
yusheng.lu 5dc87f49b0 Moved the version pair to 1st position of its map. 2015-01-19 14:42:43 +08:00
pipu 103fecf3ef Fixes memory leaks of using FileUtils::getInstance()->getFileData() in FlatBuffersSerialize.cpp. 2015-01-19 11:45:20 +08:00
Nite Luo 4a440e66c9 Refactor draw command 2015-01-15 14:00:49 -08:00
minggo d57ba984be Merge pull request #9979 from geron-cn/inneractionframe 
inneractionframe rename variables
 2015-01-14 15:15:51 +08:00
geron-cn ab2b86b392 rename variables 2015-01-14 13:02:30 +08:00
pipu e31fe9565a Modify that parses position type of ParticleSystemQuad. 2015-01-14 10:24:44 +08:00
pipu a20cc2b151 Modify that parses plist for cocostudio editor simulator. 2015-01-13 11:12:28 +08:00
pipu 532269c44e fix bug: cut inner timeline action as outer timeline action's length 2015-01-13 11:07:06 +08:00
minggo 7f5f3a2fd9 Merge pull request #9945 from jianglong0156/v3 
issue cocos2d/cocos2d-js #2563 : cccomrender  constructor
 2015-01-12 21:13:01 +08:00
jianglong0156 5d781d7eb4 issue cocos2d/cocos2d-js #2563 : cccomrender need to use its constructor in jsb code. So i modify the constructor to public 2015-01-12 20:49:43 +08:00
pipu aaccdef1eb Modify cocos/editor-support/cocostudio/CMakeLists.txt. 2015-01-12 19:14:04 +08:00
pipu c7a923b658 Update method clone() for InnerActionFrame. 2015-01-12 17:59:30 +08:00
pipu d364a329db Merge branch 'v3' into parse_inneractionframe 2015-01-12 14:26:05 +08:00
pipu 7e83336af8 Update InnerActionFrame. 2015-01-12 13:54:17 +08:00
jianglong0156 4cc0dd129a issue cocos2d/cocos2d-js #2563 : ActionTimelineData need to use its constructor in jsb code. So i modify the constructor to public 2015-01-12 11:57:03 +08:00
pipu 6237115fbf Fixes bug that clone InnerActionFrame. 2015-01-12 11:09:19 +08:00
pipu 78b32332d3 Parse InnerActionFrame, AlphaFrame, modify cocostudio editor version number. 2015-01-12 10:55:15 +08:00
youyou 1d7a4a5c05 fixed event frame will go twice loop when goto frame 2015-01-09 10:24:38 +08:00
yusheng.lu 3c992fe38c Bug fix:When parsing a plist file as image mergin, if in fact the plist file is a particle, a crush will occur. 
Now it's fixed.
 2015-01-05 16:59:09 +08:00
yusheng.lu ec540fcaa2 Update the reader-get link to http://www.cocos2d-x.org/filedown/cocos-reader 2015-01-05 13:26:46 +08:00
yusheng.lu a7fb75dc7d Update the description when the csb reader version dismatches the reader version in Cocos2d-x 2015-01-04 19:12:19 +08:00
yusheng.lu 89034469f5 Updated the version check description. 2014-12-31 16:01:11 +08:00
minggo ad443da6a0 Revert "Feature of version check. " 2014-12-31 14:17:18 +08:00
geron-cn 89c39d3f10 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into armaturenodefix 2014-12-31 04:06:11 +08:00
geron-cn b048b65ae3 make current animation name take effect when autoplay is false 2014-12-31 03:59:36 +08:00
minggo 869a9bb0a9 Merge pull request #9652 from lite3/patch-2 
fix incorrect font path
 2014-12-30 15:43:31 +08:00
yusheng.lu 9a0f302370 revert the layoutComponent codes to prevent the demos crush. 2014-12-30 10:47:00 +08:00
yusheng.lu e5961047aa Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_version 
Conflicts:
	cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp
 2014-12-30 10:42:54 +08:00
yusheng.lu 88f0a1e642 prevent the crush of the cocosstudio demos 2014-12-30 10:33:07 +08:00
yusheng.lu 505a4e8ab0 Feature of version check. When reading a csb file, if the engine's reader version dismatch the version saved in the csb file, an assert will be triggered. User must go to a website to get a reader to match the csb file. 
Removed the version compatible control code before.
 2014-12-29 19:37:53 +08:00
pipu d3783cba95 Modify warning code. 2014-12-29 17:04:23 +08:00
minggo 2b0e287b5f Merge pull request #9656 from geron-cn/v3_actionline_animationlist 
fix: auto add search path for armaturenodereader
 2014-12-29 09:17:01 +08:00
geron-cn b25e307dee fix add search path for armaturenodereader 2014-12-26 18:27:47 +08:00
lite3 b102587590 fix incorrect font path 2014-12-26 16:20:04 +08:00
minggo f01cc596a3 Merge pull request #9637 from geron-cn/v3_actionline_animationlist 
V3 actiontimeline animationlist
 2014-12-26 16:05:49 +08:00
pipu bc18bafaa7 Update that parse plist for CheckBoxReader. 2014-12-26 14:18:28 +08:00
geron-cn 70eef1f660 fix play 2014-12-25 17:45:14 +08:00
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
Liam fa85faec68 update for cocos reader 2014-12-25 15:02:22 +08: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
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
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
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
Liam 83fcf74882 update for code format 2014-12-24 10:56:01 +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
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
yusheng.lu 2b7c0edfed license in ArmatureNodeReader.h added. 2014-12-23 15:13:27 +08:00
Liam e4360b7616 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Layout 2014-12-23 14:15:55 +08:00
yusheng.lu 7eedef71e6 armature node test completed 2014-12-23 11:13:05 +08:00
yusheng.lu 1e05361873 ios/mac project compeleted 2014-12-22 20:08:27 +08:00
yusheng.lu 02b9269cff completed multiplatform projects 2014-12-22 19:39:10 +08:00
youyou 70052b2a3f support animation list 2014-12-22 18:57:48 +08:00
yusheng.lu b0bfc2906a change armature codes files path 2014-12-22 18:26:50 +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
yusheng.lu 62c5df2d9d armature node reader done (projs incompleted) 2014-12-22 17:35:39 +08:00
Liam ce9f269680 update object reader for new lay out system 2014-12-22 15:38:47 +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 20beb3b9e0 Merge pull request #9567 from joewan/v3-improve-perf 
fix serious performance problem of Animate.
 2014-12-22 14:57:26 +08:00
pipu 0c6e22dd77 Update that parse resource path with flat buffers for readers 2014-12-22 13:42:18 +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
joewanchen c2473b9b99 fix. 2014-12-21 01:03:30 +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
pipu 79acf80fb1 Update that avoid crash during load resource which serialize by flat buffers 2014-12-17 19:00:24 +08:00
minggo 9da1317f10 Merge pull request #9453 from sxd1140/v3 
add stopActionByName()
 2014-12-17 18:32:04 +08:00
minggo b3731fa06a Merge pull request #9486 from 2youyouo2/v3_EventFrame 
fixed frame event
 2014-12-16 09:53:43 +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
youyou 579bb3f8d8 fixed frame event 2014-12-12 18:02:03 +08:00
pipu accf66c49f Update that serialize plist file name 2014-12-11 19:15:04 +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
Sxd 5f47bef320 add stopActionByName() 2014-12-11 02:57:13 +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 eef6d08813 Merge pull request #9402 from doomsdayer/v3_listview 
V3 listview
 2014-12-10 11:13:42 +08:00
youyou 41c86de0d4 update csloader 2014-12-09 22:13:17 +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
yusheng.lu 7426a32d9f 1. ListView demo compeleted. 
2. Optimized ListViewReader format.
 2014-12-08 19:00:12 +08:00
pipu 56a25a2644 Update reader 2014-12-08 15:48:24 +08:00
pipu c3365a4654 Add interface that create node with flat buffers object for simulator 2014-12-08 14:32:33 +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
kaile.yin 1db2bf89e0 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-12-05 14:42:25 +08:00
youyou 0235c4c377 change head file 2014-12-05 00:10:42 +08:00
pipu 56f7895e27 Modify bugs for flatbuffers 2014-12-04 20:38:46 +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
kaile.yin 3f1cb4338a Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3 2014-12-04 15:33:38 +08:00
kaile.yin 743166f50b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
 2014-12-04 15:32:25 +08:00
youyou 4af869fdeb update make file 2014-12-03 18:47:41 +08:00
kaile.yin 9d49f82eb9 Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3 
Conflicts:
	tools/tolua/cocos2dx.ini
 2014-12-03 16:00:32 +08:00
pipu 6a64b867df Modify bugs that parse resource path for ButtonReader, CheckBoxReader, ImageViewReader, LayoutReader, LoadingBarReader, PageViewReader, ScrollViewReader, SliderReader 2014-12-03 15:24:21 +08:00
kaile.yin fd69a5efc3 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-12-03 15:22:46 +08:00
pipu ec978905d7 Modify that load .csb file serialized by flat buffers 2014-12-03 10:54:16 +08:00
pipu fc97a3d0c6 Modify serialize property "value" of VisibleFrame 2014-12-02 16:11:46 +08:00
pipu 22b044805c Add callback parse 2014-12-01 21:50:05 +08:00
pipu 57dbb214ca Modify that serialize "percent" default property for SilderReader 2014-12-01 19:58:48 +08:00
pipu 69729bcd65 Add that parse "color" in NodeReader 2014-12-01 16:27:21 +08:00
pipu 584c7dc7c6 Delete that use protocol buffers 2014-12-01 12:46:29 +08:00
pipu 1447919be1 Merge branch 'v3_flatbuffers' of https://github.com/pipu/cocos2d-x into v3_flatbuffers 2014-12-01 11:49:11 +08:00
pipu 27261ddcc0 Modify NodeReader, ButtonReader, WidgetReader, TextReader, TextFieldReader 2014-12-01 11:48:04 +08:00
Dale Stammen 301e947c37 no initialization list for WP8 2014-11-27 05:21:04 -08:00
pipu 5d3d839886 Update Android.mk for cocostudio 2014-11-27 17:28:20 +08:00
pipu ce3ca169d7 Modify that calls createNodeFromProtocolBuffers() for CSLoader 2014-11-27 17:23:22 +08:00
pipu e38da9f9b6 Add callback framework using flat buffers 2014-11-27 16:49:19 +08:00
pipu e1c287d500 Modify that parse "actionTag" for WidgetReader 2014-11-27 12:12:29 +08:00
pipu 889f84e540 newest v3 flatbuffers 2014-11-26 13:29:23 +08:00
pipu 6b999d53f3 Modify that declare and definition that function return value of createNodeWithFlatBuffers() for all kinds of "NodeReader" 2014-11-26 11:50:42 +08:00
kaile.yin 2a86677619 fixed setCurrentFrame 2014-11-24 10:49:22 +08:00
youyou 966100a511 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-11-24 10:35:51 +08:00
pipu 5d50a8ef92 Modify that initialize Color4B for WidgetReader 2014-11-21 19:36:20 +08:00
zhangcheng 32ce3dca2e 1, Update windows project. 2014-11-21 18:12:46 +08:00
pipu 6be17520c7 Config android, linux, wp8 2014-11-21 18:08:09 +08:00
pipu f3cb80d8f6 Add flat buffers reader and serialize 2014-11-21 15:15:38 +08:00
Vladimir Timofeev a689fc4c7e sync with upstream 
Conflicts:
	CMakeLists.txt
 2014-11-20 12:19:00 +03:00
minggo 340e21d57e Merge pull request #9050 from joewan/fix-armature-spriteframe 
fix sprite frame cache, and remove unnecessary headers dependencies.
 2014-11-20 10:54:30 +08:00
youyou 769b2cbc75 add file to mac project 2014-11-19 20:06:10 +08:00
joewanchen 7c4355c60d rename functions. 2014-11-19 15:27:55 +08:00
kaile.yin d764c18271 update Android.mk 2014-11-19 10:57:22 +08:00
Vladimir Timofeev b0a6cf1182 Use standard cmake control variable to control static or dynamic build BUILD_SHARED_LIBS 2014-11-18 17:48:54 +03:00
kaile.yin bbd971d910 create ActionTimelineNode 2014-11-17 21:05:20 +08:00
Vladimir Timofeev 27ef26270c Unify TinyXML2 usage. 
* should be included as simple "tinyxml2.h", but on some files was "tinyxml2/tinyxml2.h", replace this.
* Add cmake/Modules/FindTinyXML2.cmake
* As tinyxml2 for now has not prebuilt, instead sources included, add their as subdirectory if USE_PREBUILT_LIBS
 2014-11-15 14:43:50 +03:00
minggo d6eea4dc3c Merge pull request #9037 from G17hao/patch-8 
Update CCBone.cpp
 2014-11-13 18:46:48 +08:00
minggo 6c67c6921d Merge pull request #8977 from pipu/v3_Modify_TextReader 
Modify that parsing attribute "fontName" of TextReader
 2014-11-11 12:05:49 +08:00
minggo e7d5e79e88 Merge pull request #8998 from aeonmine/v3 
fix memory leak cocos studiov2.0 engine v3.3
 2014-11-09 23:24:16 +08:00
joewanchen c4b1aeb0ec fix momery leak (partly fix, memory leak still exist). 2014-11-07 11:43:55 +08:00
joewanchen b05f558214 fix compile error. 2014-11-07 10:14:07 +08:00
joewanchen b682438b68 revert some modifications. 2014-11-07 09:17:32 +08:00
joewanchen c2b97a3b13 fix sprite frame cache, and remove unnecessary headers dependencies. 
we should add private headers for ccs, do not expose privae headers to users.
 2014-11-07 09:13:59 +08:00
G17hao c7f5c3052d Update CCBone.cpp 
fix the bone disorderly flying
http://www.cocoachina.com/bbs/read.php?tid-220321-keyword-%C2%D2%B7%C9.html
 2014-11-06 17:51:19 +08:00
minggo 8a49ae0b07 Merge pull request #8981 from vovkasm/clean-order-of-fields-initialization 
Cleanup order of fields initialization.
 2014-11-05 17:51:58 +08:00
minggo 98073632d4 Merge pull request #8908 from zawasp/v3-source 
fix some warnings / remove TABs
 2014-11-05 13:39:20 +08:00
Ricardo Quesada 3a34d6eb9d Performance improvements 
`Director::getMatrix()` returns `const Mat4`
 2014-11-04 16:46:14 -08:00
峰　正博 828715ab8b ;; -> ; 2014-11-04 11:54:48 +09:00
峰　正博 29779a4604 modiry document->Parse((char*)pByte); to document->Parse((const char*)pByte); 2014-11-04 11:51:00 +09:00
峰正博 85fb2c91ab fix memory leak cocos studiov2.0 engine v3.3 2014-11-04 01:25:58 +09:00
minggo d0edba2db3 Merge pull request #8975 from 2youyouo2/v3_EventFrame 
update event frame
 2014-10-31 10:32:53 +08:00
Vladimir Timofeev 2835b094da Cleanup order of fields initialization. 
Make initialization order to match declarations.
This change twice reduces number of warnings when compiling on MacOS X with Xcode 6.1
Warnings was like "Field 'XXXX' will be initialized after field 'YYYY'"
 2014-10-30 17:28:41 +03:00
pipu 2ed51e042d Modify that parsing attribute "fontName" of TextReader 2014-10-30 18:00:03 +08:00
kyokomi 2b4cf9ae59 bugfix: setting forget the contentSize. 2014-10-29 19:38:12 +09:00
kaile.yin dd517813a8 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_EventFrame 2014-10-25 23:02:38 +08:00
Dale Stammen 38d5be5082 no mp3 for winrt 2014-10-23 07:01:53 -07:00
Mircea Rila 3d276db6d2 fix some warnings / remove TABs 2014-10-23 12:54:15 +03:00
kaile.yin 0f184a4982 add arriving last frame event 2014-10-23 17:38:04 +08:00
kaile.yin e7de544231 1.fixed frame event may forword emit 2014-10-23 17:37:18 +08:00
minggo 47697daf03 remove unneeded codes 2014-10-21 17:28:14 +08:00
minggo db8dc25b01 fix warning 2014-10-21 11:40:34 +08:00
minggo f224f275ec Merge pull request #8851 from pipu/#8838 
Fixed #8838
 2014-10-20 15:14:07 +08:00
minggo 49bd79d14a Merge pull request #8853 from 2youyouo2/v3_EventFrame 
fixed emit frame event
 2014-10-20 13:57:38 +08:00
pipu 50a8f9f3fb Modify that parse "AnchorPointFrame" 2014-10-20 12:43:01 +08:00
pipu 8072328ca6 Modify that record path of .csb file 2014-10-20 11:56:48 +08:00
kaile.yin 400cceeae8 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_EventFrame 2014-10-20 10:18:29 +08:00
pipu 0134e9247d Fixed #8838 2014-10-20 10:15:44 +08:00
kaile.yin 959844d9bb Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3_EventFrame 2014-10-20 10:03:33 +08:00
youyou 03ebe0152b fixed timeline loop 2014-10-19 21:32:23 +08:00
minggo 7e6ee9c15a Merge pull request #8801 from 2youyouo2/v3 
add deprecated information for Armature::drawContour
 2014-10-17 23:02:49 +08:00
kaile.yin 5b0e2f0304 fixed emit last frame several times 2014-10-17 20:43:01 +08:00
pipu 1c187a4653 Modify reader in order to parse attribute "Plist" 2014-10-17 16:35:17 +08:00
youyou 351ef8ea66 add DEPRECATED deprecated information for Armature::drawContour 2014-10-17 16:28:37 +08:00
minggo 18ca7c936c Merge pull request #8768 from Dhilan007/v3-33rc 
Improve Android.mk
 2014-10-17 14:09:49 +08:00
Dhilan007 ccbc668427 Improve Android.mk 2014-10-17 10:13:33 +08:00
minggo ec4d83b646 Merge pull request #8738 from pipu/v3_Modify_Reader 
Modify Reader:
 2014-10-17 09:35:07 +08:00
pipu 20cb663746 Delete the blank block 2014-10-16 19:02:39 +08:00
kaile.yin 7faf2fe1e6 set tag for ActionTimeline 2014-10-16 18:14:58 +08:00
pipu 7cb2629baa Delete annotate code of all Reader files 2014-10-16 17:44:22 +08:00
pipu 85bbcdd537 Deleting original code that parsing "Visible" 2014-10-16 16:26:46 +08:00
pipu e77f7f02b0 Modify Reader: 
1. Parsing "FlipX", "FlipY", "AnchorPoint".
2. Parsing "VisibleForFrame" instead of "Visible"
 2014-10-16 15:55:38 +08:00
minggo 58480f8486 Merge pull request #8712 from pipu/v3_modify_warning_of_reader 
Modifying warning of *Reader
 2014-10-16 12:03:59 +08:00
pipu d3f972c139 Modifying warning of *Reader 2014-10-15 17:20:54 +08:00
Dale Stammen 1404f15daa added check for WinRT and WP8 2014-10-14 14:15:21 -07:00
Dale Stammen fd638f00b7 removed old WP8 project files 2014-10-14 14:09:52 -07:00
minggo 0ab3017094 Merge pull request #8658 from pipu/v3_pipu 
V3 pipu
 2014-10-14 14:25:46 +08:00
andyque 96660cb653 fix linux compile 2014-10-13 18:19:49 +08:00
pipu a8febf9656 1. update wp8 projects. 2014-10-13 15:31:29 +08:00
pipu 96c8fde63a 1. Modifying UIButton.cpp 
2.  Modifying protocol directory name to "protobuf-lite" for iOS, mac platform
 2014-10-13 12:49:15 +08:00
minggo cb220fe528 Merge pull request #8657 from coldfog/v3 
Fix bug that ActionManagerEx::initWithBinary can only load one UI animation
 2014-10-13 10:20:27 +08:00
pipu 8040955062 Modifying cocos/editor-support/cocostudio/CMakeLists.txt, cocos/ui/CMakeLists.txt 2014-10-12 20:21:32 +08:00
pipu 2d51724686 1. Update wp8 projects. 2014-10-12 19:32:13 +08:00
pipu 0d73c51a09 Modifying cocostudio/CSParseBinary.pb.h 2014-10-12 17:46:09 +08:00
pipu 9503253a17 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_pipu 2014-10-12 17:44:28 +08:00
pipu 798d103479 Reverting cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj, cocos/editor-support/cocostudio/proj.wp8/libCocosStudio.vcxproj.filters 2014-10-12 17:06:26 +08:00
pipu 86aee1e548 Modifying cocos2d_lib.xcodeproj, cocos/Android.mk, cocos/editor-support/cocostudio/Android.mk 2014-10-12 15:39:22 +08:00
Yuyao Feng cc22ba9854 Fix bug that ActionManagerEx::initWithBinary can only load one UI animation 2014-10-12 08:58:28 +08:00
maldewar e21dd9a10d Fixing conflict, use of macro function. 2014-10-11 13:06:42 -07:00
maldewar 5a7febdf25 Fixing merging, identation only conflicts. 2014-10-11 12:00:17 -07:00
pipu 38ac6533a3 Removing ../../ in header file include 2014-10-11 15:50:44 +08:00
pipu ab969db441 Modifying ImageViewReader, UIImageView 2014-10-11 15:43:37 +08:00
pipu 29eb552d00 1. Modifying ButtonReader 
2. Modifying UILoadingBar
3. Reverting UIScale9Sprite
 2014-10-11 15:35:09 +08:00
pipu b732ce378e Merge branch 'v3_pipu_protocol_buffers' into merge_test 
Conflicts:
	cocos/ui/UIScale9Sprite.cpp
 2014-10-11 11:08:46 +08:00
pipu ffd83bbdd0 Modifying win32 and wp8 protocol buffers lib 2014-10-10 22:38:34 +08:00
Dhilan007 89db9ecd3b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-win32-warn 
Conflicts:
	tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp
 2014-10-10 17:02:45 +08:00
minggo 4856b6782a Merge pull request #7979 from giginet/scene-reader-canvas-size 
SceneReader sets contentSize by canvasSize.
 2014-10-10 15:00:28 +08:00
pipu d699b5809b Modifying libprotocolbuf.a as protocolbuffer.a 2014-10-10 12:52:42 +08:00
minggo 2a95286329 Merge pull request #7785 from DaisukeHashimoto/fix_CCActionManagerEx_Bug 
use fileName for _actionDic key
 2014-10-10 11:13:41 +08:00
pipu 752eb839c7 Add protocolbuf.a 2014-10-09 18:28:09 +08:00
Dhilan007 83150aa4d1 fix warns and memory leak 2014-10-09 17:19:43 +08:00
martell 73980195c0 wp8: use CC_STATIC because libs are static 2014-10-09 06:33:46 +01:00
martell 30240a8a37 Multi platform cmake support 
Signed-off-by: martell <martellmalone@gmail.com>
 2014-10-03 23:21:45 +01:00
martell fe32bcb952 added support for static and shared builds with audio and studio 
Signed-off-by: martell <martellmalone@gmail.com>
 2014-10-03 23:20:52 +01:00
Ricardo Quesada 342d934a0e scheduler and macro fixes 
* kRepeatForever -> CC_REPEAT_FOREVER
* schedule_selector -> CC_SCHEDULE_SELECTOR
* [new] Node::schedule(const std::function<>& callback, const std::string &key)

Updates all smaples
 2014-10-03 09:38:36 -07:00
Frank.Xu 1c1d917620 Fix pull request #6894 merge conflicts 2014-09-29 16:22:55 +08:00
andyque c9b959ec82 replace raw string literal with const external variables to keep consistence. 2014-09-29 11:35:03 +08:00
minggo 9511f0deb5 Merge pull request #8130 from yestein/v3 
Add Cocostudio Armature getOffsetPoints API for Lua
 2014-09-28 16:48:37 +08:00
Hong Liang 9448345de3 bugfix for UI animation playing crash if GUI JSON file is loaded again. 2014-09-26 11:29:48 +08:00
yestein b19b2c5786 replace tab to 4 spaces 2014-09-24 15:14:47 +08:00
yestein 72c5d77273 Add Cocostudio Armature getOffsetPoints API for Lua 2014-09-24 11:20:36 +08:00
andyque d4b2e8d154 remove deprecated warning 2014-09-12 17:06:13 +08:00
andyque 67ad24e7c1 remove orderOfArrival = 0 2014-09-11 15:44:31 +08:00
Ricardo Quesada 6f3ca63f00 Moved base/CCPlatform* -> platform/CCPlatform* 2014-09-09 17:17:07 -07:00
Ricardo Quesada 9082ca18c3 Platform fixed 2014-09-09 16:50:02 -07:00
giginet e9e9741a74 SceneReader sets contentSize by canvasSize. 
We could not get the canvas size of the scene which created on CocosStudio.

Thanks to this commit, we can get scene's canvas size by Node::getContentSize()

```cpp
auto scene = cocos2d::cocostudio::SceneReader::getInstance()->createNodeWithSceneFile("Scene.json");
int width = scene->getContentSize().width;
int height = scene->getContentSize().height;
cocos2d::log("canvasSize = %d, %d", width, height);
```
 2014-09-09 22:30:52 +09:00
minggo 659ba68199 Merge pull request #7942 from andyque/deleteRedundantCode 
remove dead code
 2014-09-04 13:45:12 +08:00
andyque a1edd4a819 remove dead code 2014-09-04 11:00:48 +08:00
lite3 74d8bf6f27 fix 2014-09-02 10:51:17 +08:00
Ricardo Quesada 2c068cd1f5 Merge pull request #7915 from ricardoquesada/xcode_mark_todo_fixme 
Adds MARK: TODO: FIXME: in code
 2014-08-29 12:55:14 -07:00
Ricardo Quesada c149bfca00 Adds MARK: TODO: FIXME: in code 
Replaces XXX with FIXME:
Xcode 6 beta 4 supports this new format
 2014-08-29 12:54:24 -07:00
minggo 444b298028 fix compiling error on windows 2014-08-29 16:44:20 +08:00
minggo 3679d66c8e remove unneeded includes 2014-08-29 15:39:52 +08:00
lite3 2b6bdac05d Merge branch 'v3' into customguireader 2014-08-28 15:13:10 +08:00
minggo 6a8270f33b Merge pull request #7900 from minggo/setposition-optimize 
not create Vec as possible for setting position
 2014-08-28 14:31:54 +08:00
minggo 9fb977ff99 not create Vec as possible for setting position 2014-08-28 11:41:18 +08:00
minggo f0f1bf1b92 Merge pull request #7883 from giginet/set-node-name-via-ccs-scene 
Add the feature that CCSSceneReader can load name properties as node names.
 2014-08-28 11:14:15 +08:00
minggo d3ce2acff6 Merge pull request #7892 from Dhilan007/v3-androidmk 
Adjust android.mk for cocos2d and related module
 2014-08-28 10:16:39 +08:00
Ricardo Quesada 3dda35b4ef Adds `std::nothrow` to `new` 
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
 2014-08-27 16:31:57 -07:00
Dhilan007 bef774a14a Adjust android.mk for cocos2d and related module 2014-08-27 22:54:28 +08:00
Dhilan007 9135236bb0 Merge branch 'v3_test' of https://github.com/samuele3hu/cocos2d-x into v3-androidmk 2014-08-27 21:15:57 +08:00
samuele3hu 3d5f8de346 Adjust android.mk for cocos2d and related module 2014-08-27 20:58:32 +08:00
minggo 04bfbdd5a1 fix conflict 2014-08-27 13:50:01 +08:00
samuele3hu 3759648d3a Remove the useless aneroid.mk files 2014-08-27 10:21:47 +08:00
samuele3hu a5a706aa05 Remove the useless win32 project 2014-08-27 10:20:15 +08:00
giginet d07903827d Add the feature that CCSSceneReader can load name properties as node names. 
When name property of objects on CocosStudio Scene are set.
They will be loaded and set as Node::name property.

Thanks to this commit. We are enable to access to each nodes on scene via its names.

```cpp
auto scene = cocos2d::cocostudio::SceneReader::getInstance()->createNodeWithSceneFile("Scene.json");
auto object = scene->getChildByName<cocos2d::Sprite *>("objectName");
```
 2014-08-27 03:49:07 +09:00
minggo b9c51e6994 remove unneeded codes 2014-08-26 18:19:28 +08:00
samuele3hu 74624f5ba1 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module 2014-08-25 11:52:52 +08:00
minggo e7050486d3 fix conflict 2014-08-24 18:56:51 +08:00
minggo 030f80a257 one static library for c++ and another one for lua-binding 2014-08-24 03:52:51 -07:00
samuele3hu 70cba1f64a Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module 
Conflicts:
	cocos/Android.mk
 2014-08-22 14:01:17 +08:00
samuele3hu 2f60e610a2 Integrate libcocosdenshion,libcocos3d,libnetwork,libcocostudio and libextension into cocos2d on the iOS/Mac platform 2014-08-22 13:49:21 +08:00
minggo a0b19db670 Merge pull request #7840 from minggo/fix-warning 
fix warnings
 2014-08-22 13:41:31 +08:00
minggo 2afbc7a698 fix warnings 2014-08-21 16:21:23 +08:00
pandamicro 34b93a24ff Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into 3.2-cocos-engine-PR 
Conflicts:
	cocos/platform/desktop/CCGLViewImpl.h
 2014-08-21 16:07:19 +08:00
pandamicro 9544482058 Fix Android.mk s 2014-08-21 15:40:42 +08:00
pandamicro 485dd1f7da Update #3897: Refactor missed protected constructors 2014-08-21 15:40:22 +08:00
lite3 679d525453 Merge branch 'v3' into customguireader 2014-08-21 01:22:07 +08:00
lite3 9f348962c7 Merge branch 'v3' into customguireader 2014-08-21 00:18:30 +08:00
minggo 74fba21fc0 Merge pull request #7825 from 2youyouo2/v3 
remove cascade color for CorlorFrame
 2014-08-20 10:23:15 +08:00
minggo cdd67be77a use LOCAL_STATIC_LIBRARIES instead of LOCAL_WHOLE_STATIC_LIBRARIES 2014-08-19 15:29:40 +08:00
kaile.yin d884054ec9 remove cascade color for CorlorFrame 2014-08-19 15:19:47 +08:00
kaile.yin 6abaf27b14 fixed ArmatureAnimation::setSpeedScale 2014-08-18 16:19:54 +08:00
Daisuke Hashimoto 5b620fbfe1 use fileName for _actionDic key 2014-08-14 21:10:51 +09:00
yangxiao 032ba062a9 rename isVisibleByVisitingCamera to isVisitableByVisitingCamera 2014-08-14 10:26:37 +08:00
yangxiao 4629d257e1 rename checkCameraMask to isVisibleByVisitingCamera 2014-08-14 09:58:11 +08:00
yangxiao 76329f9e53 add camera mask check to visit 2014-08-13 12:06:51 +08:00
lite3 8f59d8ac93 add GUIReader::registerTypeAndCallBack for std::function 2014-08-12 17:19:52 +08:00
lite3 69e2b815ed fix: copy map when getParseCallBackMap() and getParseObjectMap() 2014-08-12 17:05:23 +08:00
kaile.yin 358b1f6736 fixed bone rotation isn't right 2014-08-11 19:53:51 +08:00
martell 75911658aa Make CMake More Robust 2014-08-06 15:43:19 +01:00
kaile.yin 3dcdb1cde4 remove some update condition of Frame::apply function 2014-08-01 14:40:42 +08:00
kaile.yin 2fc082cac1 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-07-31 17:52:49 +08:00
kaile.yin 170e1a5d7b init widget properties 2014-07-31 17:48:45 +08:00
Huabing.Xu 65775f2d30 remove CC_CONSTUCTOR_ACCESS fow win32 release 2014-07-30 16:39:21 +08:00
Huabing.Xu c722c0fcd0 libcocostudio for windows 2014-07-29 11:31:37 +08:00
Huabing.Xu d6bc2f4998 liuGUI->libui for windows 2014-07-28 22:12:07 +08:00
Huabing.Xu c6956504bf change CocosDenshion to libcocosdenshion 2014-07-28 21:35:16 +08:00
Huabing.Xu 4a4f05c827 change cocos2d to libcocos2d for windows 2014-07-28 20:55:58 +08:00
Huabing.Xu 7f5782c207 chang module name for windows project file 2014-07-28 09:20:02 +08:00
minggo fa1d9ecf0c Merge pull request #7568 from 2youyouo2/v3 
fixed init Armature blendfunc state
 2014-07-24 17:44:56 +08:00
Huabing.Xu c7bfc934fd windows works now 2014-07-24 12:57:39 +08:00
kaile.yin 3b1ee96aef fixed armature blendfunc effect 2014-07-23 21:35:08 +08:00
kaile.yin 01d85340ad fixed black edge in Armature 2014-07-23 20:07:33 +08:00
Huabing.Xu 61ff03ab45 windows cpp-tests works now 2014-07-23 18:34:49 +08:00
kaile.yin bdad6d9b67 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-07-23 15:24:36 +08:00
kaile.yin 5aae024a7b fixed cannot set blendfunc to Armature 2014-07-23 15:21:20 +08:00
minggo 2e56a4ce21 Merge pull request #7546 from nutty898/v3_nutty_modifynodereader 
Fixed bug of NodeReader
 2014-07-22 18:34:36 +08:00
cai wenzhi d14522880d Fixed bug of NodeReader 2014-07-21 22:45:33 +08:00
zhangcheng 6cfc5b72dc 1. CocosStudio adapt to cocos2d-x v3.2. 2014-07-21 17:45:56 +08:00
minggo aef1e01ce5 Merge pull request #7518 from natural-law/android-dependencies 
Android dependencies
 2014-07-18 17:57:42 +08:00
zhangcheng 24d87ad05b 1. fixes ActionManagerEx crashes. 2014-07-17 17:24:41 +08:00
minggo a653d0eb28 Merge pull request #7440 from boyu0/add_utils_atof 
Add utils::atof(), fix bug: particle not shown on android.
 2014-07-17 09:59:15 +08:00
zhangcheng 1530ba4a90 1、fixes Trigger condition value can't be export. 2014-07-16 16:12:55 +08:00
zhangcheng 80de57be39 1、 fixes lua TriggerTest bug. 2014-07-16 14:50:35 +08:00
zhangbin 7e7c3a1e55 Merge branch 'v3' into android-dependencies 2014-07-16 13:49:20 +08:00
zhangbin 14f3d6f230 Adjust the dependencies of extensions & cocostudio on android. 2014-07-16 13:47:57 +08:00
zhangcheng 8bf4c8b6c9 1. Fixes CCTimeLine warning. 
2. Fixes CocoLoader warning.
3. Fixes TriggerTest Bug.
 2014-07-15 18:07:33 +08:00
pandamicro 216af377d0 Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into ArmatureTrans 2014-07-15 11:32:12 +08:00
pandamicro db8f0ea3ab Fixed #5724: Use correct transform in CCSkin's updateTransform function 2014-07-15 11:31:10 +08:00
pandamicro 67c07f94f4 Issue #5724: Correction of property name in CCBone 2014-07-15 11:30:36 +08:00
boyu0 c7fec217ba Change atof() to utils::atof() 2014-07-14 20:45:24 +08:00
zhangbin e4319bf534 Adjust the dependencies of cocosbuilder & cocostudio on android. 2014-07-14 09:48:16 +08:00
zhangbin b0c465d96b Adjust the dependencies between modules on android. 2014-07-14 09:48:16 +08:00
geron-cn 64408a5d8f fix bug: crash in ui csbs 2014-07-11 19:02:14 +08:00
andyque d4122d616a fix text reader binray version setFontName 2014-07-11 13:58:08 +08:00
andyque 43255e2b96 Merge branch 'v3' into addStudio1.4 
Conflicts:
	cocos/editor-support/cocostudio/WidgetReader/TextReader/TextReader.cpp
 2014-07-11 13:55:13 +08:00
minggo d1d84e0d1f Merge pull request #7386 from chengstory/v3_fixesLoaddTTFError 
1. fixes TextReader load default font error.
 2014-07-11 13:40:16 +08:00
andyque 646f7c7e3f Merge branch 'v3' into addStudio1.4 2014-07-11 13:39:34 +08:00
minggo 4895e6d54a Merge pull request #7362 from geron-cn/chukongv3 
Chukongv3
 2014-07-10 21:17:19 +08:00
zhangcheng a0ecae21c3 1. fixes TextReader load default font error. 2014-07-10 19:29:39 +08:00
geron-cn 1c4cb78745 deal with null in string 2014-07-10 18:24:11 +08:00
kaile.yin 04c63cc370 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-07-10 17:51:02 +08:00
kaile.yin 42f2302866 fixed call Bone::setRotation has no effect 2014-07-10 17:50:38 +08:00
andyque f76f71eb5d fix win32 & win8 compile error 2014-07-10 16:37:15 +08:00
andyque 41ccd5e465 add v1.4 tests 2014-07-10 16:37:15 +08:00
Dhilan007 6cff8cb564 fixed warn and replace NULL with nullptr. 2014-07-10 00:45:27 +08:00
minggo 7d74be3158 Merge pull request #7356 from 2youyouo2/v3 
fixed Armature blend func effect
 2014-07-09 18:37:15 +08:00
kaile.yin c53cb42e83 fixed Armature blend func effect 2014-07-09 14:25:51 +08:00
zhangcheng af0613cf32 1、fixes warning. 2014-07-09 00:09:35 +08:00
kaile.yin f01b249880 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-07-08 10:21:00 +08:00
kaile.yin d5a79f17ab fixed set color to parent, it will effect its children 2014-07-08 10:13:15 +08:00
Dale Stammen fa62f4273f fixed missing zlib.h header path 2014-07-07 10:14:57 -07:00
andyque 037a7dc882 fix TextReader TTF font Reader issue 2014-07-07 15:22:14 +08:00
andyque 0483c64286 fix widget ignoreContentSize issue 2014-07-07 15:21:14 +08:00
minggo a942aae84f Merge pull request #7316 from cocoscodeide/v3 
lua runtime template 1.2
 2014-07-04 18:33:36 +08:00
chuanweizhang2013 39b03de8a9 revert Android.mk 2014-07-04 15:39:07 +08:00
andyque c8165bb2d9 fix indent problems 2014-07-04 11:53:06 +08:00
andyque a429182765 fix windows compile and running error 2014-07-04 11:22:36 +08:00
minggo eb97b9ad45 Merge pull request #7305 from andyque/fixLayoutReader 
fix layout background image default color & opacity
 2014-07-03 17:16:56 +08:00
andyque f82e96daf0 fix layout background image default color & opacity 2014-07-03 16:56:05 +08:00
minggo 0be6d27271 Merge pull request #7295 from minggo/support-regular-expression 
Support regular expression
 2014-07-03 15:20:06 +08:00
andyque 32724e559d fix container default color issue 2014-07-03 14:38:45 +08:00
minggo fffdfb3711 Merge pull request #7290 from chengstory/v3_OpBinaryParse 
V3 op binary parse
 2014-07-03 14:00:01 +08:00
minggo 2cfea323b0 Merge pull request #7300 from 2youyouo2/v3 
fixed add relative data bug
 2014-07-03 13:56:04 +08:00
minggo 6cc600ccce fix compiling warnings 2014-07-03 11:43:56 +08:00
zhangcheng d1db470cf2 Merge branch 'macLoader' into v3_OpBinaryParse 2014-07-02 16:11:02 +08:00
zhangcheng 2b1ef55ea9 1. fixes scene parse crash. 2014-07-02 15:58:42 +08:00
zhangcheng 9204ac28df 1. merge v3 2014-07-02 15:37:15 +08:00
zhangcheng cf9b049926 1. fixes same name warning. 2014-07-02 10:53:35 +08:00
andyque fb3e499d9d fix Text reader font name 2014-07-02 10:08:04 +08:00
andyque 7d2685ba02 fix content Size 2014-07-01 21:02:37 +08:00
geron-cn 17c320f1e2 fix 2014-07-01 19:06:51 +08:00
geron-cn c561f4e2f4 fix win can not compile 2014-07-01 18:55:09 +08:00
zhangcheng 02c7c93e43 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into OpBinaryParse 2014-07-01 16:36:37 +08:00
zhangcheng 4b8f818a1d 1、Update binary parse lib. 2014-07-01 16:31:17 +08:00
geron-cn dfdc4f6b66 fix bug: did not addarmature to the relativedata 2014-07-01 16:24:59 +08:00
andyque fefdc70af9 add default value to widget reader 2014-07-01 14:01:27 +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 b9a968680f add default value to widgets reader 2014-07-01 10:57:12 +08:00
andyque 4e63a3da7d modify nodeReader to support LabelAtlas and LabelBMFont 2014-07-01 10:11:36 +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