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

40 Commits

Author SHA1 Message Date
pipu 0d73c51a09 Modifying cocostudio/CSParseBinary.pb.h 2014-10-12 17:46:09 +08:00
pipu 38ac6533a3 Removing ../../ in header file include 2014-10-11 15:50:44 +08:00
pipu 752eb839c7 Add protocolbuf.a 2014-10-09 18:28:09 +08:00
minggo 3679d66c8e remove unneeded includes 2014-08-29 15:39:52 +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
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
kaile.yin 170e1a5d7b init widget properties 2014-07-31 17:48:45 +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
zhangcheng 8bf4c8b6c9 1. Fixes CCTimeLine warning. 
2. Fixes CocoLoader warning.
3. Fixes TriggerTest Bug.
 2014-07-15 18:07:33 +08:00
Dhilan007 6cff8cb564 fixed warn and replace NULL with nullptr. 2014-07-10 00:45:27 +08:00
zhangcheng af0613cf32 1、fixes warning. 2014-07-09 00:09:35 +08:00
kaile.yin d5a79f17ab fixed set color to parent, it will effect its children 2014-07-08 10:13:15 +08:00
andyque 4e63a3da7d modify nodeReader to support LabelAtlas and LabelBMFont 2014-07-01 10:11:36 +08:00
2youyou2 b76127231c add gotoFrameAndPlay and setCurrentFrame interface 2014-06-30 15:53:12 +08:00
minggo 76e2540fd7 Merge pull request #7163 from darkdukey/fixNodeReader 
Fix NodeReader crash
 2014-06-24 10:49:10 +08:00
minggo fc7b42c0e5 Merge pull request #7157 from 2youyouo2/v3 
update action timeline
 2014-06-23 18:38:46 +08:00
andyque d2680f2884 fix windows compile error 2014-06-23 18:29:23 +08:00
andyque 87455b0ecb add constness to some function 2014-06-23 10:12:54 +08:00
Nite Luo 21330860a9 Fix NodeReader will crash when encountered unknown NodeType 2014-06-20 17:24:34 -07:00
yinkaile 1aa07906a1 add new line at the end of the file 2014-06-20 11:36:48 +08:00
yinkaile 510bc23b16 1.fixed action may shake a little 
2.fixed frame event will emit even they do not in current play section
 2014-06-20 11:23:26 +08:00
yinkaile 043c640037 fixed warning and logic error 2014-06-20 10:52:14 +08:00
2youyou2 0ce51162af support Label widget 2014-06-19 14:11:37 +08:00
2youyou2 b323f5772e optimize frame 2014-06-18 14:21:33 +08:00
2youyou2 719fdb712d add frame event test 2014-06-18 11:22:38 +08:00
2youyou2 806d74b6f9 add change play section test 2014-06-17 15:57:30 +08:00
2youyou2 c221a59954 fixed frame's value not right when enter frame 2014-06-17 15:57:06 +08:00
2youyou2 d2a6782a9e fixed start frame not right 2014-06-17 11:45:57 +08:00
2youyou2 02363c2ae4 read visible property 2014-06-16 17:20:59 +08:00
2youyou2 f9a817a2bf read flip property 2014-06-16 15:19:58 +08:00
2youyou2 7bb188f15a fixed not read zorder 2014-06-16 15:03:53 +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
2youyou2 57fe37f9f1 add const word 2014-06-13 18:00:46 +08:00
2youyou2 2031e0e92d change TimelineAction to ActionTimeline 2014-06-13 16:03:03 +08:00