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

17276 Commits

Author SHA1 Message Date
lm 2fe329199b Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-03-03 18:29:51 +08:00
bmanGH e0aefc663d Merge branch 'feature/fix_timer_cancel_bug' of https://github.com/bmanGH/cocos2d-x into feature/fix_timer_cancel_bug 
* 'feature/fix_timer_cancel_bug' of https://github.com/bmanGH/cocos2d-x:
  Fix Timer::cancel always call Director::getInstance()->getScheduler() even in another Scheduler;
 2014-03-03 18:12:35 +08:00
minggo d207670011 Merge pull request #5501 from nutty898/develop_nutty_modify_framework_for315 
Develop nutty modify framework for315
 2014-03-03 18:09:32 +08:00
bmanGH 754603e1c6 Fix Timer::cancel always call Director::getInstance()->getScheduler() even in another Scheduler; 2014-03-03 18:02:40 +08:00
minggo 01dd962cb6 Merge pull request #5495 from Dhilan007/develop_gblur 
fixed incorrect effect of Gaussian Blur.
 2014-03-03 18:01:29 +08:00
minggo 2def8d018b Merge pull request #5516 from shujunqiao/develop 
modify autotest.py in tools/jenkins-scripts
 2014-03-03 17:58:07 +08:00
minggo 594342ea3e Merge pull request #5505 from dumganhar/event-dispatcher-refactor 
[EventDispatcher] Adds 'pauseEventListenersForTarget', 'resumeEventListenersForTarget' and 'removeEventListenersForTarget'.
 2014-03-03 17:56:57 +08:00
bmanGH ff514abab0 Merge remote-tracking branch 'upstream/develop' into develop 
* upstream/develop:
  Update CHANGELOG [ci skip]
  fixed #3599. use a scheduler to fix the position of editbox when it's parent postion has been changed
  fixed add ParticleSystem display crashed
  closed #4150:  add const to getPosition/RotationOffset method.
  check validation of ndk root
  add install.py
  closed #4150:  Fix missing "!"
  closed #4150:  Delete PhysicsBodyInfo::set/getPosition/Rotation method.
  issue #4150:  Add physics position/rotation test
  issue #4150:  Correct body position with the node has a parent. Add set/getPosition/Rotation method.
 2014-03-03 17:53:07 +08:00
bmanGH b5cd820be2 Fix Timer::cancel always call Director::getInstance()->getScheduler() even in another Scheduler; 2014-03-03 17:51:27 +08:00
qiaofeng00oo f2e9ae97e2 modify autotest.py in tools/jenkins-scripts 2014-03-03 17:47:55 +08:00
lm e6c6381039 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-03-03 17:40:44 +08:00
minggo 3168456010 Merge pull request #5511 from minggo/install 
create install.py to set environment variables needed by cocos2d-x
 2014-03-03 17:37:06 +08:00
lm 7650cbc8c1 [jenkins]Add [ci rebuild] command via pr comments 2014-03-03 17:32:29 +08:00
James Chen aeecee86a4 Update CHANGELOG [ci skip] 2014-03-03 17:14:16 +08:00
James Chen 1b7525ecf9 Merge pull request #5486 from andyque/bug3599 
fixed #3599. add adjustTextFieldPosition function call to the visit method
 2014-03-03 17:12:01 +08:00
James Chen bd3efebb26 Merge pull request #5513 from 2youyouo2/develop 
fixed CocoStudioTest/ArmatureTest crashes.
 2014-03-03 16:15:51 +08:00
andyque 7d2db27cae fixed #3599. use a scheduler to fix the position of editbox when it's parent postion has been changed 2014-03-03 15:46:43 +08:00
minggo be0ac5dc1c Merge pull request #5493 from boyu0/bug4150_physics_position_rotation 
closed #4150: fix physics position and rotation bug.
 2014-03-03 14:57:33 +08:00
yinkaile 8f1ba73a52 fixed add ParticleSystem display crashed 2014-03-03 14:56:56 +08:00
boyu0 fdcbfa2eca closed #4150: add const to getPosition/RotationOffset method. 2014-03-03 14:35:44 +08:00
minggo 336dc9f7fc check validation of ndk root 2014-03-03 14:11:28 +08:00
bmanGH 2d7c032860 Merge remote-tracking branch 'upstream/develop' into develop 
* upstream/develop: (82 commits)
  issue #4165: Adds missing deprecated methods in Scheduler class.
  closed #4165: Updates comments.
  closed #4165: Deprecates old methods: Scheduler::(un)scheduleSelector, Scheduler::isScheduleForTarget.
  issue #4165: Scheduler::scheduleCallback -> Scheduler::schedule, Scheduler::scheduleSelector -> Scheduler::schedule. APIs are clear for c++ developers now.
  Update CHANGELOG [ci skip]
  TimerTargetCallback::initWithLambda -> TimerTargetCallback::initWithCallback.
  closed #4160: Adds test case for issue 4160.
  closed #4160: Out of range exception in EventDispatcher
  Refactors Scheduler class.
  fix windows compile error
  add CCConosle [autotest run] command
  fixed #4103. fix crash when websocket close
  Modify the depend project path for project "TestCpp".
  Update CHANGELOG [ci skip]
  Update AUTHORS [ci skip]
  issue #4129: Adds test case for issue 4119.
  issue #4129: Adds default argument(nullptr) for dispatchCustomEvent.
  issue #4129: Remove unused references in Xcode project.
  closed #4129: Event listeners in engine shouldn't be removed by method removeAllEventListeners().
  issue #4129: EventTouch::getTouches return const reference.
  ...
 2014-03-03 14:10:10 +08:00
CaiWenzhi 23a51c7c84 Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-03 13:45:53 +08:00
James Chen 4d5e1d4e03 Merge pull request #5510 from dumganhar/develop 
issue #4165: Adds missing deprecated methods in Scheduler class.
 2014-03-03 12:00:13 +08:00
James Chen 1d2d2df1e9 issue #4165: Adds missing deprecated methods in Scheduler class. 2014-03-03 11:57:36 +08:00
James Chen 1aa9e35fb2 Merge pull request #5500 from dumganhar/scheduler-refactor 
closed #4165: Refactors Scheduler class.
 2014-03-03 11:20:06 +08:00
James Chen 04663b4a9c closed #4165: Updates comments. 2014-03-03 11:12:04 +08:00
James Chen 09c0bae4a1 closed #4165: Deprecates old methods: Scheduler::(un)scheduleSelector, Scheduler::isScheduleForTarget. 2014-03-03 11:07:48 +08:00
James Chen 757425c54b issue #4165: Scheduler::scheduleCallback -> Scheduler::schedule, Scheduler::scheduleSelector -> Scheduler::schedule. APIs are clear for c++ developers now. 2014-03-03 11:00:30 +08:00
James Chen e0178ae886 Update CHANGELOG [ci skip] 2014-03-03 10:08:47 +08:00
James Chen 104531c22e Merge pull request #5499 from heliclei/autotest-run 
add CCConosle [autotest run] command
 2014-03-03 10:06:25 +08:00
minggo 8189d153b6 add install.py 2014-03-03 10:01:41 +08:00
boyu0 c99b0a0b6a closed #4150: Fix missing "!" 2014-03-03 01:48:56 +08:00
cai wenzhi a6e4a5e5aa Adjust layout 2014-03-02 22:41:47 +08:00
cai wenzhi 683d3c9f14 Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-02 19:28:44 +08:00
James Chen dceb047ba6 TimerTargetCallback::initWithLambda -> TimerTargetCallback::initWithCallback. 2014-03-02 18:43:17 +08:00
James Chen f3949e078b [EventDispatcher] Adds 'pauseEventListenersForTarget', 'resumeEventListenersForTarget' and 'removeEventListenersForTarget'. 2014-03-02 17:41:18 +08:00
James Chen 91a3c6ad9d Merge pull request #5503 from dumganhar/iss4160-out-of-range 
closed #4160: Out of range exception in EventDispatcher
 2014-03-02 16:32:55 +08:00
James Chen 23f15ed9b5 closed #4160: Adds test case for issue 4160. 2014-03-02 16:22:57 +08:00
James Chen 30d7130eb0 closed #4160: Out of range exception in EventDispatcher 2014-03-02 16:16:03 +08:00
Ricardo Quesada cdc19eea1c Nodes: setAdditionalTransform() receives a pointer 
and not a const reference.
If the pointer is `NULL`, then it won't use the additionalTransform
 2014-03-01 08:26:54 -08:00
cai wenzhi 4f90676e92 Add method for editor 2014-03-01 22:34:25 +08:00
Ricardo Quesada 219ef6d897 removes CC_TEXTURE_ATLAS_USE_TRIANGLE_STRIP support 
It was never used. And it is slower.
 2014-02-28 22:09:18 -08:00
James Chen e6d2c4ec73 Refactors Scheduler class. 
* Timer is an abstract class now.
* Adds three new timers ( `TimerTargetSelector`, `TimerTargetCallback`, `TimerScriptHandler`) which are inherited from Timer.
* Adds new API 'scheduleCallback` / `unscheduleCallbackForKey', and callback's target could be any classes since we're using `void*` to identify target.
* `Scheduler::scheduleCallback` use `std::function`, therefore, it supports passing `lambda`, `member_function` and `global_function`.
* The old selector API is still kept since it's very useful when schedule callback is a member function, it doesn't need a `key` to identify the callback function. (+1 squashed commit)
* Adds relevant test cases.
 2014-03-01 14:09:09 +08:00
Ricardo Quesada b50a787f6d Adds new ParticleTest for auto-batching 2014-02-28 22:03:36 -08:00
Ricardo Quesada 3bacd45240 indentation fix in CHANGELOG 2014-02-28 21:47:11 -08:00
Ricardo Quesada 5a2697816f Updates CHANGELOG 2014-02-28 16:41:37 -08:00
Ricardo Quesada 3588041409 removed empty spaces 2014-02-28 16:39:04 -08:00
Ricardo Quesada 9d501479c1 removes unused ivar from ParticleSystemQuad 2014-02-28 16:19:27 -08:00
Ricardo Quesada da8e571862 shaders set in the correct position 2014-02-28 16:14:55 -08:00