16d872f2e3
[Jenkins] remove unused code
2014-03-04 12:12:04 +08:00
99d3bf3b0a
Merge pull request #5530 from minggo/install
...
change environment variable name from NDK_ROOT1 to NDK_ROOT
2014-03-04 12:05:15 +08:00
5ff304edfb
change environment variable name from NDK_ROOT1 to NDK_ROOT
2014-03-04 12:04:29 +08:00
6c83c333c6
Merge pull request #5529 from lmskater/fix-repos-url
...
[Jenkins] fix the url of repos
2014-03-04 11:56:29 +08:00
e208e1918f
[Jenkins] fix the url of repos
2014-03-04 11:50:46 +08:00
68130fb4d0
fix matrix push/pop bug
2014-03-04 11:06:39 +08:00
a759d9ae60
calculate viewport based on _fullRect _rtRect and _fullRectViewport
2014-03-04 10:57:57 +08:00
53f924ec5a
Merge pull request #5526 from samuele3hu/develop_new_fix
...
fix: Update the RELEASE_NOTES.md
2014-03-04 10:49:31 +08:00
7949cb2cd9
add interface for keep Matrix
2014-03-04 10:41:03 +08:00
987afe2272
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_fix
2014-03-04 10:27:25 +08:00
ca3d6efffe
fix:Update RELEASE_NOTES.md
2014-03-04 10:26:12 +08:00
629c6b9a89
fixed #3868 . Add guard check to send method of HttpClient
2014-03-04 10:07:49 +08:00
cf9f1038b1
Merge pull request #5515 from lmskater/develop
...
[jenkins] Add [ci rebuild] command via pr comments
2014-03-04 10:06:16 +08:00
16b4ed3c7c
Merge pull request #5524 from dumganhar/develop
...
Removes unused templates.
2014-03-04 09:49:14 +08:00
33a5be526c
Removes unused templates.
2014-03-04 09:46:32 +08:00
62ffb8e995
Renames 'template' to 'templates'
2014-03-04 09:45:08 +08:00
4df204448d
Merge pull request #5491 from ricardoquesada/visit_draw_improved
...
visit and draw improved.
2014-03-03 17:45:01 -08:00
8bdfce9bbe
Merge branch 'develop' into visit_draw_improved
2014-03-03 17:31:29 -08:00
0cfb5169a4
Merge pull request #5523 from ricardoquesada/remove_setnormalized
...
Removes setNormalizedPosition
2014-03-03 16:39:27 -08:00
81f5254e15
Removes setNormalizedPosition
...
This funciton is useful, but the code is buggy.
In should check the parents' position instead of Director::Size()
Let's do it correctly, and then re-add this function
2014-03-03 16:08:30 -08:00
c386f88e32
Merge branch 'develop' into visit_draw_improved
...
Conflicts:
CHANGELOG
cocos/gui/UILayout.h
2014-03-03 11:27:42 -08:00
c09b139fee
Fixed bug of loadingbar
2014-03-03 23:46:47 +08:00
c615811124
Modify methods of Changing color and opacity.
2014-03-03 23:24:57 +08:00
d64daec33b
Merge branch 'feature/fix_timer_cancel_bug' of https://github.com/bmanGH/cocos2d-x into feature/fix_timer_cancel_bug
2014-03-03 19:15:06 +08:00
d0f8dbd4be
Fix Timer::cancel always call Director::getInstance()->getScheduler() even in another Scheduler;
2014-03-03 19:12:59 +08:00
95208d7543
Merge remote-tracking branch 'upstream/develop' into develop
...
* upstream/develop:
modify autotest.py in tools/jenkins-scripts
Adjust layout
[EventDispatcher] Adds 'pauseEventListenersForTarget', 'resumeEventListenersForTarget' and 'removeEventListenersForTarget'.
Add method for editor
fixed incorrect effect of Gaussian Blur.
Add "override"
optimize scissor clipping
Fixed bug of label
Add clone method to LayoutParameter
Fixed bug of reader.
Fixed bugs.
Fixed bug of reader
Fixed bugs
2014-03-03 19:12:34 +08:00
e0a9020de7
[Jenkins] User regex pattern to parse comment body
2014-03-03 18:36:32 +08:00
2fe329199b
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2014-03-03 18:29:51 +08:00
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
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
754603e1c6
Fix Timer::cancel always call Director::getInstance()->getScheduler() even in another Scheduler;
2014-03-03 18:02:40 +08:00
01dd962cb6
Merge pull request #5495 from Dhilan007/develop_gblur
...
fixed incorrect effect of Gaussian Blur.
2014-03-03 18:01:29 +08:00
2def8d018b
Merge pull request #5516 from shujunqiao/develop
...
modify autotest.py in tools/jenkins-scripts
2014-03-03 17:58:07 +08:00
594342ea3e
Merge pull request #5505 from dumganhar/event-dispatcher-refactor
...
[EventDispatcher] Adds 'pauseEventListenersForTarget', 'resumeEventListenersForTarget' and 'removeEventListenersForTarget'.
2014-03-03 17:56:57 +08:00
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
b5cd820be2
Fix Timer::cancel always call Director::getInstance()->getScheduler() even in another Scheduler;
2014-03-03 17:51:27 +08:00
f2e9ae97e2
modify autotest.py in tools/jenkins-scripts
2014-03-03 17:47:55 +08:00
e6c6381039
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2014-03-03 17:40:44 +08:00
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
7650cbc8c1
[jenkins]Add [ci rebuild] command via pr comments
2014-03-03 17:32:29 +08:00
aeecee86a4
Update CHANGELOG [ci skip]
2014-03-03 17:14:16 +08:00
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
bd3efebb26
Merge pull request #5513 from 2youyouo2/develop
...
fixed CocoStudioTest/ArmatureTest crashes.
2014-03-03 16:15:51 +08:00
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
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
8f1ba73a52
fixed add ParticleSystem display crashed
2014-03-03 14:56:56 +08:00
fdcbfa2eca
closed #4150 : add const to getPosition/RotationOffset method.
2014-03-03 14:35:44 +08:00
336dc9f7fc
check validation of ndk root
2014-03-03 14:11:28 +08:00
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
23a51c7c84
Merge branch 'develop' into develop_nutty_modify_framework_for315
2014-03-03 13:45:53 +08:00
lm