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

41 Commits

Author SHA1 Message Date
geron-cn 0babe85947 add PlayableFrame 2016-01-12 17:21:01 +08:00
XiaoFeng f5f09133e6 Change ASSERT to safety mode 2015-11-26 16:49:01 +08:00
XiaoFeng e313f7be8b Combine Studio change for ActionTimeline 2015-11-16 15:56:23 +08:00
geron-cn be8a158bd7 fix bug: #23532 AnchorPointFrame animation performance diffrent with cocos studio 2015-10-20 15:49:12 +08: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 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
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 28264c0742 Fix simulator crash when add animation under a user defined lua extension 2015-04-27 17:42:20 +08:00
geron-cn d238f9905e add blendfunc frame 2015-04-10 13:34:39 +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
zhangcheng e2e0ed0595 Avoid timeline crash when custom widget is placed in scene. 2015-03-24 19:59:27 +08:00
pipu c068e60aa6 Reconstruct ColorFrame. 2015-03-23 13:37:24 +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
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
geron-cn a1a7273436 fix bug: fix crash when lack of projected file 2015-01-26 21:20:26 +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
geron-cn ab2b86b392 rename variables 2015-01-14 13:02:30 +08:00
pipu 532269c44e fix bug: cut inner timeline action as outer timeline action's length 2015-01-13 11:07:06 +08:00
pipu c7a923b658 Update method clone() for InnerActionFrame. 2015-01-12 17:59:30 +08:00
pipu 7e83336af8 Update InnerActionFrame. 2015-01-12 13:54:17 +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 69824ff07b add space for readable 2014-12-15 09:36:21 +08:00
youyou 579bb3f8d8 fixed frame event 2014-12-12 18:02:03 +08:00
kaile.yin e7de544231 1.fixed frame event may forword emit 2014-10-23 17:37:18 +08:00
kaile.yin 5b0e2f0304 fixed emit last frame several times 2014-10-17 20:43:01 +08:00
minggo 3679d66c8e remove unneeded includes 2014-08-29 15:39:52 +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
kaile.yin d884054ec9 remove cascade color for CorlorFrame 2014-08-19 15:19:47 +08:00
kaile.yin 3dcdb1cde4 remove some update condition of Frame::apply function 2014-08-01 14:40:42 +08:00
Dhilan007 6cff8cb564 fixed warn and replace NULL with nullptr. 2014-07-10 00:45:27 +08:00
yinkaile 043c640037 fixed warning and logic error 2014-06-20 10:52:14 +08:00
2youyou2 b323f5772e optimize frame 2014-06-18 14:21:33 +08:00
2youyou2 c221a59954 fixed frame's value not right when enter frame 2014-06-17 15:57:06 +08:00
2youyou2 d9f34a1412 change texture to textureName 2014-06-13 19:52:53 +08:00
2youyou2 5bce6b87ea change ActionTimeline to cocostudio ActionTimeline folder 2014-06-13 18:51:32 +08:00