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

1038 Commits

Author SHA1 Message Date
CaiWenzhi e0aa82da13 Merge master branch to develop branch 2013-11-06 16:04:06 +08:00
2youyou2 efd8f62992 add virtual 2013-11-06 15:40:06 +08:00
2youyou2 12d6bc1722 1. change CCARRAY_FOREACH to range-based loop 2013-11-06 15:25:44 +08:00
2youyou2 f05c1590ae 1.fix particle kCCPositionTypeFree state bug 2013-11-06 11:20:16 +08:00
Ricardo Quesada 84a6aa29cd Adds more 64-bit fixes 
Replaces more `int` with `long` where it makes sense.

Also , it repalces some `unsigned long` with `long` for "lenght"
values as described in our c++ guideline
 2013-11-05 17:36:44 -08:00
2youyou2 8b86373b08 1.Change to range-based loop 2013-11-05 20:33:29 +08:00
2youyou2 16c23d0ad3 remove CC_PROPERTY and CC_SYNTHESIZE. 2013-11-05 19:53:38 +08:00
2youyou2 3eef64c3b8 1. Change NULL to null 
2. Remove CocoStudio/Armature files
 2013-11-05 15:32:13 +08:00
2youyou2 b076711b69 fix compile error 2013-11-05 13:42:27 +08:00
2youyou2 25196072f2 1. change color json format 
2. fix tween easing
3. fix CCBone crate bug
 2013-11-05 11:57:20 +08:00
Ricardo Quesada ba7ed6e578 Fixes some compiler warnings 
The warnings are related to:

* 64-to-32-bit conversion
* shadow variables
 2013-11-04 16:31:36 -08:00
James Chen 9be8ca3714 [cmake] output lib to root/lib 2013-11-04 21:03:08 +08:00
James Chen daa91ad413 [CMake] Update library dependency. 2013-11-04 21:03:07 +08:00
James Chen 922924e1ab TestCpp is ok. 2013-11-04 21:03:07 +08:00
2youyou2 a9054ba14a 1.add method to set collider filter 2013-11-01 14:36:44 +08:00
2youyou2 005d3c0121 1. fix if frame event is at the last frame, it may emit event several times 
2. add method for removing single data info
3. add test TEST_DIRECT_LOADING
4. add test TEST_FRAME_EVENT
5. add method for getting calculated collider vertex
 2013-10-31 17:28:14 +08:00
Dhilan007 a68d92ff5a perfect vs-project configuration 2013-10-31 10:51:38 +08:00
yinkaile 80b97be6f4 update develop 2013-10-30 11:34:16 +08:00
yinkaile 8fa8b9f844 update develop 2013-10-30 09:41:40 +08:00
yinkaile 2d3df69982 fix add display 2013-10-29 16:57:06 +08:00
James Chen 48ce5e39fe EventDispatcher is managed by Director now, like Scheduler and ActionManager. 2013-10-26 15:04:01 +08:00
James Chen 1f3863e787 Event Dispatcher refactor commit. TestCpp could run. 2013-10-25 10:53:45 +08:00
James Chen cfaef2a01a Adding onEnterHook, onXXXHook for Node. 2013-10-25 10:53:45 +08:00
minggo d07d054a01 issue #2905:ndk-r8e build ok now 2013-10-23 17:44:20 +08:00
minggo abcf8f268d fix conflicts 2013-10-22 18:36:13 +08:00
minggo 6a664d480a issue #2905:samples build ok on linux 2013-10-22 18:01:56 +08:00
garfield_ho 0002815acb Modify the sequenceCompleted method in CCBAnimationManager,So it can set the next sequence in callback 2013-10-22 15:56:35 +08:00
James Chen 74b514c299 Merge pull request #3979 from HoGarfield/AutoPlay-Animation 
closed #3033: CCBReader can't play sequence automatically in JSB.
 2013-10-22 00:30:47 -07:00
Dhilan007 232f0d598b issues #2905:add new vs project 2013-10-21 22:21:11 +08:00
garfield_ho 464d1598d2 fixed bug of CCBReader that can not autoplaySequence 2013-10-19 16:48:57 +08:00
minggo 63c13d8eaa issue #2905:simplify Android.mk dependence 2013-10-18 14:18:36 +08:00
minggo e50f9fc43b issue #2905: jsbinding samples and lua binding samples build ok on android 2013-10-17 15:04:30 +08:00
minggo 91eada6c1e Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2905-adjust_folder 2013-10-16 16:50:46 +08:00
minggo 8f7a489a4d issue #2905:make cocostudio and gui flat 2013-10-16 16:48:39 +08:00
James Chen 6fba0dd5db issue #2905: [iOS Mac] TestJavascript works now. 2013-10-16 15:43:59 +08:00
James Chen 7dc8aeb156 issue #2905: Updating include path for 'cocostudio' module, adding 'cocostudio' prefix. 2013-10-16 11:19:01 +08:00
minggo 6fc2be62f5 issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
minggo 4313c46e93 issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00