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

206 Commits

Author SHA1 Message Date
zhangcheng 1c983f1f39 GBKToUTF8 2015-06-17 13:16:06 +08:00
XiaoFeng 8d19ea7320 Fix when button set to disabled mode and won't have a disable texture will cause simulator won't show button in disabled gray mode 2015-06-12 15:47:34 +08:00
andyque 81d562803b upgrade rapidjson to 1.0.2 2015-05-25 11:43:03 +08:00
XiaoFeng e94bcbd28c Remove missing resource label from all UI widget 2015-05-22 18:21:59 +08:00
XiaoFeng 49b465f0f4 Fix wrong shadow & outline color bug for text component 2015-04-29 10:46:23 +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
pipu ca74486f60 Update CSParseBinary_generated 2015-04-08 16:54:58 +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
pipu 90da9dbee5 Avoid crash during parse TextAtlas. 2015-03-24 15:59:21 +08:00
pipu c1f147b7a1 Avoid crash during parse armature node. 2015-03-19 11:51:34 +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
pipu a5e9ebc4e6 Fix parse action tag for widget. 2015-03-16 20:04:59 +08: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
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
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
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 35e3e8d62d Sprite3D Reader and tests 2015-02-23 00:34:30 +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
pipu ed1b7edce7 Modify that parse ignoreSize for TextAtlas, TextBMFont. 2015-01-27 15:09:48 +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 e31fe9565a Modify that parses position type of ParticleSystemQuad. 2015-01-14 10:24:44 +08:00
pipu 78b32332d3 Parse InnerActionFrame, AlphaFrame, modify cocostudio editor version number. 2015-01-12 10:55:15 +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