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

32 Commits

Author SHA1 Message Date
andyque e4cad50c2f fix tons of warnings 2015-07-15 12:04:48 +08:00
minggo da69dbd133 Merge pull request #11388 from xiaofeng11/v3 
Reader update
 2015-04-13 11:20:53 +08:00
pipu 7a67b6ccce Test samples 2015-04-10 14:52:54 +08:00
Ricardo Quesada 49e2e8964e more compilations issues. 
compiles on Android
 2015-04-08 21:40:39 -07:00
Ricardo Quesada 23b0d4d2f6 more fixes with the namespaces 2015-04-08 21:23:47 -07:00
Ricardo Quesada 51374eb822 tests compiles on xcode 6.3 
no more USING_NS in the header files.
it creates conflict with xcode 6.3
 2015-04-08 17:37:30 -07:00
WenhaiLin 0d51c13743 Make all test cases work fine with new test framework. 2015-04-03 14:31:03 +08:00
pipu bc7d8f0a09 Add method destroyCocosStudio() for CocoStudio 2015-03-31 19:55:56 +08:00
pipu a0a461f319 Supplement some Reader. 2015-03-31 11:22:34 +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 56c3d1c6f6 To add the function node load callback called during create node from csb file. 2015-03-12 17:36:39 +08:00
andyque ac3d79a516 add constructor to AnimationInfo 2015-01-28 16:59:27 +08:00
andyque 35c436f1f3 fix compile error 2015-01-28 16:35:16 +08:00
geron-cn 7b9d9ff9f9 fix complie error on win 2015-01-28 10:33:50 +08:00
geron-cn 3268dbc9fd add cpp-test for animation list and projected 2015-01-28 02:12:09 +08:00
pipu 78b32332d3 Parse InnerActionFrame, AlphaFrame, modify cocostudio editor version number. 2015-01-12 10:55:15 +08:00
youyou 2b7ead06de update timeline test 2014-12-04 16:49:43 +08:00
kaile.yin 743166f50b Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
	tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
 2014-12-04 15:32:25 +08:00
pipu 06a0026632 Update ActionTimelineTestScene 2014-12-02 16:00:30 +08:00
kaile.yin bbd971d910 create ActionTimelineNode 2014-11-17 21:05:20 +08:00
pipu 752eb839c7 Add protocolbuf.a 2014-10-09 18:28:09 +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
minggo dc635db163 fix warnings 2014-06-26 16:15:02 +08:00
yinkaile 1aa07906a1 add new line at the end of the file 2014-06-20 11:36:48 +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 d2a6782a9e fixed start frame not right 2014-06-17 11:45:57 +08:00
2youyou2 7ee90b4114 add performance test 2014-06-17 11:13:46 +08:00
2youyou2 fda54a21f1 change test title 2014-06-16 09:45:44 +08:00
2youyou2 2031e0e92d change TimelineAction to ActionTimeline 2014-06-13 16:03:03 +08:00