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

1054 Commits

Author SHA1 Message Date
XiaoFeng 28264c0742 Fix simulator crash when add animation under a user defined lua extension 2015-04-27 17:42:20 +08:00
minggo 1f5e5b5058 Merge pull request #11536 from xiaofeng11/v3 
Update Node3DReader compatibility
 2015-04-22 10:25:49 +08:00
pipu fcd48ce2c3 Reset method purge() definition. 2015-04-21 18:16:38 +08:00
pipu 04cde1c52c Modify that serialize base attribute for Node3DReader. 2015-04-21 18:05:46 +08:00
Vladimir Perminov 6ef1e7e3d0 Optimize Vec3 use constructor default. 
Make Vec3 vec3(Vec3::ZERO); to Vec3 vec3;
 2015-04-20 12:56:43 +03:00
minggo 15fe283c2e Merge pull request #11515 from xiaofeng11/v3 
update compatibility for upgraded node3d come with 2.2.5 version
 2015-04-20 17:05:32 +08:00
pipu 388e4b3a93 Modify that parse position for Node3DReader. 2015-04-20 15:56:36 +08:00
minggo 8f88afa123 Merge pull request #11510 from xiaofeng11/v3 
Bug fix
 2015-04-20 15:50:44 +08:00
pipu 4b320a1677 Modify that parse text shadow and outline. 2015-04-20 11:39:43 +08:00
Vladimir Perminov 4c33050536 Optimize Vec2 
small function Vec2 move to Vec2.inl
Added:
setZero();

Change all code:
_vec2 = Vec2(x, y); -> _vec2.set(x, y);
Vec2 vec2 = Vec2(x, y); -> Vec2 vec2(x, y);
_vec2 += Vec2(x, y); -> _vec2.add(x, y);
_vec2 = Vec2::ZERO; -> _vec2.setZero();
Vec2 vec2(Vec2::ZERO); -> Vec2 vec2;
 2015-04-19 20:40:52 +03:00
pipu d1dcf3f620 Modify that serialize attribute "Children". 2015-04-16 13:58:01 +08:00
xiaofeng11 a8fcaf4f4f Merge pull request #17 from geron-cn/xiaov3 
fix actiontimeline step over frame when (noloop play && timespeed>1)
 2015-04-15 13:41:49 +08:00
geron-cn 7b376fd384 fix action timeline step over frame when no (loop play && timespeed>1) 2015-04-15 13:32:04 +08:00
pipu 755134ba3f Update parse animation easing 2015-04-10 17:05:55 +08:00
xiaofeng11 5ec9b14a33 Merge pull request #13 from geron-cn/xiaov3 
fix
 2015-04-10 14:27:09 +08:00
geron-cn b8083f2c99 fix 2015-04-10 14:24:48 +08:00
xiaofeng11 dda662a7c1 Merge pull request #12 from geron-cn/xiaov3 
add blendfunc frame
 2015-04-10 14:04:35 +08:00
geron-cn d238f9905e add blendfunc frame 2015-04-10 13:34:39 +08:00
xiaofeng11 ee98b40af9 Merge pull request #11 from geron-cn/xiaov3 
add tween easing to ccframe
 2015-04-10 10:46:58 +08:00
geron-cn c206725be5 fix color 2015-04-09 19:13:14 +08:00
geron-cn 56bb0a68bb add tween easing to carfare 2015-04-09 18:10:37 +08:00
pipu e86071e77e Rest CCFrame. 2015-04-09 17:21:52 +08:00
pipu 80ad7bbee8 Animation easing. 2015-04-09 16:55:15 +08:00
minggo 8a1aa78f7d Merge pull request #11336 from xiaofeng11/v3 
Update reader
 2015-04-08 18:40:32 +08:00
pipu ca74486f60 Update CSParseBinary_generated 2015-04-08 16:54:58 +08:00
minggo e9cdf333f9 Merge pull request #11246 from xiaofeng11/v3 
V3 reader fix
 2015-04-08 11:46:40 +08:00
Vladimir Perminov 105bac2d55 Optimize Vec3 
small function Vec3 move to Vec3.inl
Added:
add(float xx, float yy, float zz);
setZero();

Change all code:
_vec3 = Vec3(x, y, z);   ->   _vec3.set(x, y, z);
Vec3 vec3 = Vec3(x, y, z);   ->  Vec3 vec3(x, y, z);
_vec3 += Vec3(x, y, z);   ->   _vec3.add(x, y, z);
_vec3 = Vec3::ZERO;   ->   _vec3.setZero();
 2015-04-05 13:09:50 +03:00
pipu 340e26d81a Supplement invoke destroyInstance() of some Reader in destroyCocosStudio(). 2015-04-01 14:08:09 +08:00
pipu 41661830ff Remove CCNodeReader.h/.cpp. 2015-04-01 13:37:36 +08:00
pipu bc7d8f0a09 Add method destroyCocosStudio() for CocoStudio 2015-03-31 19:55:56 +08:00
pipu bb110449be Reset method purge() definition for some Reader. 2015-03-31 14:56:24 +08:00
pipu 91acd6aea9 Set macro CC_DEPRECATED_ATTRIBUTE for method purge() for all Reader. 2015-03-31 14:21:10 +08:00
pipu a0a461f319 Supplement some Reader. 2015-03-31 11:22:34 +08:00
pipu 6f20da4444 Add destroyCocosStudio() 2015-03-30 16:46:33 +08:00
minggo 326233ab02 Merge pull request #11105 from pipu/TextAtlas_parse_avoid_crash 
Avoid crash during parse TextAtlas.
 2015-03-25 13:36:28 +08:00
zhangcheng e2e0ed0595 Avoid timeline crash when custom widget is placed in scene. 2015-03-24 19:59:27 +08:00
minggo e50a71609f Merge pull request #11071 from pipu/reconstruct_ColorFrame 
Reconstruct ColorFrame.
 2015-03-24 16:29:55 +08:00
pipu 90da9dbee5 Avoid crash during parse TextAtlas. 2015-03-24 15:59:21 +08:00
Zhe Wang 8e2e1e5723 Add comments of async load, to avoid confusions of developers. 2015-03-23 20:58:16 +08:00
pipu 787225ce21 Make _alpha of ColorFrame become deprecated attribute. 2015-03-23 15:45:32 +08:00
pipu c068e60aa6 Reconstruct ColorFrame. 2015-03-23 13:37:24 +08:00
pipu 8791e36d3f Create flat buffer format data for "InnerActionSpeed". 2015-03-20 11:10:22 +08:00
minggo 78ff70a8f6 Merge pull request #10972 from pipu/fix_armaturenode_load 
Avoid crash during parse armature node.
 2015-03-19 22:10:34 +08:00
pipu e9b6ca724d Serialize attribute "InnerActionSpeed" during creating project node from .csd file for cocosstudio simulator. 2015-03-19 17:54:26 +08:00
minggo 194510dacc Merge pull request #10969 from pipu/parse_csd_position 
Fix that parse position from .csd file.
 2015-03-19 11:53:31 +08:00
pipu c1f147b7a1 Avoid crash during parse armature node. 2015-03-19 11:51:34 +08:00
pipu 46741e1035 Fix that parse position from .csd file. 2015-03-19 11:22:11 +08:00
pipu e7c89dadf1 Manage reference count of ActiontimelineData object in ObjectExtensionData. 2015-03-18 16:56:16 +08:00
pipu faf9d6b01c Avoid crash during parse .csd file. 2015-03-18 10:28:12 +08:00
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