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

1042 Commits

Author SHA1 Message Date
andyque e4cad50c2f fix tons of warnings 2015-07-15 12:04:48 +08:00
andyque 91dfb07a8c add more descriptive message to ASSET macro. 2015-07-14 15:28:36 +08:00
andyque fc673ee502 Merge branch 'v3.7-release' into v3 2015-07-13 22:44:54 +08:00
XiaoFeng 92d78efce0 Fix percentage setting won't effect when UISlider's background resource set to null 2015-07-10 17:00:16 +08:00
pandamicro 893d39c543 Merge pull request #12737 from chengstory/FixReaderBug 
Fix cocos reader bug.
 2015-07-09 10:33:45 +08:00
zhangcheng 0862d313b2 Fix cocos reader bug. 
Fixes child nodes can't be rendered when particle and TiledMap as parent and their resource have been removed from disk.
 2015-07-08 16:13:38 +08:00
xpol 8179fe04f0 And more warnings. 2015-07-07 23:10:04 +08:00
xpol 29dcbe6685 Fixes some warnings and a related bug in CCSprite. 
This story tells us that we should not just ignore warnings.
 2015-07-07 23:01:24 +08:00
XiaoFeng 9a6ffd8904 Add bug test for PageView layout & CCNodeDraw::onDrawGLLine 2015-07-07 09:54:42 +08:00
Ricardo Quesada 4c88be9520 removes -fno-excpetion and -fexception from cmake 2015-07-06 12:09:50 -07:00
Vincent Yang d26c08de46 Merge branch 'v3_scene3d_fixvisitingcamera' into v3_scene3dtest 2015-07-01 14:47:42 +08:00
andyque 0c1ee8b26a fix studio json reader percentage mode bug 2015-06-25 16:14:22 +08:00
pandamicro ac138a3287 Merge pull request #12474 from xiaofeng11/v3_xiaofeng 
Update 3d reader for compatible with cocosstudio 3.1.2 version csd file
 2015-06-23 16:27:32 +08:00
andyque 70b709f4a8 fix rapidjson assert error 2015-06-23 13:54:11 +08:00
XiaoFeng 375e80bd70 Update 3d reader for compatible with cocosstudio 3.1.2 version csd file 
Update easing default speed
 2015-06-23 11:31:16 +08:00
Vincent Yang 187437068f Fixed bug: wrong usage of isVisitableByVisitingCamera, which should only effect draw call. 2015-06-18 10:32:30 +08:00
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
pandamicro 8e3e928efd Merge pull request #12040 from geron-cn/v3 
fix bug:  fix actiontimeline can not step to last frame when loop play
 2015-06-11 14:36:08 +08:00
XiaoFeng 20a6151f4c Fix indent 2015-06-09 17:40:42 +08:00
XiaoFeng f6083f3490 Fix issue 10258 & 10408 2015-06-09 14:38:48 +08:00
zhangcheng 8d3d3a0348 1, Add onAdd and onRemove function to replace onEnter and onCancel used in onAdd and onRemove of ComponentContainer. 2015-06-04 14:06:31 +08:00
Dale Stammen 9ee4b4af1e Merge branch 'v3' into v3-winrt-audio 2015-05-27 11:54:21 -07:00
anniruddh.koppal 4501a53cfa Added MP3 support to simple audio engine 2015-05-27 10:57:26 -07:00
子龙山人 e044b1ab11 Merge pull request #11785 from geron-cn/fixbug 
fix crash when run TestTimelineFrameEvent in cpp-test
 2015-05-27 16:28:13 +08:00
geron-cn c19adbdc3c fix bug: fix actiontimeline can not step to last frame when loop play 2015-05-27 10:24:50 +08:00
andyque c668001e73 fix assert failure of NinePatchImageParser and rapidjson 2015-05-26 17:20:10 +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 be20666b65 Fix ArmatureAnimation crash 2015-05-18 12:08:26 +08:00
geron-cn 3e0b0a0feb fix crash when run TestTimelineFrameEvent in cpp-test 2015-05-11 23:04:26 +08:00
Vladislav Kaplun f67b4761da Fix a logical bug that may wrong behavior 2015-05-11 15:15:00 +03:00
Dale Stammen 351a898a70 removed CC_PLATFORM_WP8 2015-05-08 09:19:13 -07:00
Ricardo Quesada 10b71464a7 No throws in cocos2d-x code 2015-05-05 17:17:41 -07:00
Vladimir Timofeev 2d8c687d6e Fix the Frame class: 
* Field initialization order (warning in Xcode)
* Make conditions with && and || more readable for programmers (warning in Xcode)
 2015-05-01 11:51:20 +03:00
XiaoFeng 9d0741544c Fix a logical bug that may cause null pointer been used 2015-04-29 15:58:44 +08:00
XiaoFeng 49b465f0f4 Fix wrong shadow & outline color bug for text component 2015-04-29 10:46:23 +08:00
XiaoFeng 27e3dce628 Fix simulator crash when miss some armature resource 2015-04-28 11:54:36 +08:00
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