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

19664 Commits

Author SHA1 Message Date
James Chen 61c52dd242 Merge pull request #5533 from natural-law/develop 
Update the reference of submodule "plugin".
 2014-03-04 15:38:45 +08:00
Huabing.Xu ec397611f6 remove blank line，adjust indent 2014-03-04 15:30:05 +08:00
Huabing.Xu 0d4783dd39 set scaleY to -1 for test case, because renderTexture result is not the same as texture load from file 2014-03-04 15:24:06 +08:00
Huabing.Xu 3e9e33a46b add new test cases 2014-03-04 15:07:54 +08:00
Huabing.Xu 756024e9f1 implement interface setKeepMatrix, setVirtualViewPort 2014-03-04 15:07:28 +08:00
zhangbin d1190ecb87 Update the reference of submodule "plugin". 2014-03-04 14:47:28 +08:00
James Chen 26eb807c1a Merge pull request #5532 from dumganhar/iss4234-bind-event-dispatcher 
issue #4234: Some fixes when binding event dispatcher.
 2014-03-04 13:51:47 +08:00
James Chen 5d1113aeea issue #4234: Fixes linking error in UI. 2014-03-04 13:49:54 +08:00
James Chen 387174d633 issue #4234: Acceleration -> const Acceleration& 2014-03-04 13:42:36 +08:00
James Chen 5c70548742 issue #4234: 'Event* event' needs to be in 'TouchScriptData' struct. 2014-03-04 13:42:06 +08:00
James Chen bd0f342692 Merge pull request #5531 from lmskater/remove-unuse-code 
[Jenkins] remove unused code
 2014-03-04 13:39:26 +08:00
lm 16d872f2e3 [Jenkins] remove unused code 2014-03-04 12:12:04 +08:00
minggo 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
minggo 5ff304edfb change environment variable name from NDK_ROOT1 to NDK_ROOT 2014-03-04 12:04:29 +08:00
James Chen 6c83c333c6 Merge pull request #5529 from lmskater/fix-repos-url 
[Jenkins] fix the url of repos
 2014-03-04 11:56:29 +08:00
lm e208e1918f [Jenkins] fix the url of repos 2014-03-04 11:50:46 +08:00
Huabing.Xu 68130fb4d0 fix matrix push/pop bug 2014-03-04 11:06:39 +08:00
Huabing.Xu a759d9ae60 calculate viewport based on _fullRect _rtRect and _fullRectViewport 2014-03-04 10:57:57 +08:00
minggo 53f924ec5a Merge pull request #5526 from samuele3hu/develop_new_fix 
fix: Update the RELEASE_NOTES.md
 2014-03-04 10:49:31 +08:00
Huabing.Xu 7949cb2cd9 add interface for keep Matrix 2014-03-04 10:41:03 +08:00
samuele3hu 987afe2272 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_fix 2014-03-04 10:27:25 +08:00
samuele3hu ca3d6efffe fix:Update RELEASE_NOTES.md 2014-03-04 10:26:12 +08:00
andyque 629c6b9a89 fixed #3868. Add guard check to send method of HttpClient 2014-03-04 10:07:49 +08:00
James Chen cf9f1038b1 Merge pull request #5515 from lmskater/develop 
[jenkins] Add [ci rebuild] command via pr comments
 2014-03-04 10:06:16 +08:00
James Chen 16b4ed3c7c Merge pull request #5524 from dumganhar/develop 
Removes unused templates.
 2014-03-04 09:49:14 +08:00
James Chen 33a5be526c Removes unused templates. 2014-03-04 09:46:32 +08:00
James Chen 62ffb8e995 Renames 'template' to 'templates' 2014-03-04 09:45:08 +08:00
Ricardo Quesada 4df204448d Merge pull request #5491 from ricardoquesada/visit_draw_improved 
visit and draw improved.
 2014-03-03 17:45:01 -08:00
Ricardo Quesada 8bdfce9bbe Merge branch 'develop' into visit_draw_improved 2014-03-03 17:31:29 -08:00
Ricardo Quesada 0cfb5169a4 Merge pull request #5523 from ricardoquesada/remove_setnormalized 
Removes setNormalizedPosition
 2014-03-03 16:39:27 -08:00
Ricardo Quesada 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
Ricardo Quesada c386f88e32 Merge branch 'develop' into visit_draw_improved 
Conflicts:
	CHANGELOG
	cocos/gui/UILayout.h
 2014-03-03 11:27:42 -08:00
CaiWenzhi c09b139fee Fixed bug of loadingbar 2014-03-03 23:46:47 +08:00
CaiWenzhi c615811124 Modify methods of Changing color and opacity. 2014-03-03 23:24:57 +08:00
bmanGH 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
bmanGH d0f8dbd4be Fix Timer::cancel always call Director::getInstance()->getScheduler() even in another Scheduler; 2014-03-03 19:12:59 +08:00
bmanGH 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
lm e0a9020de7 [Jenkins] User regex pattern to parse comment body 2014-03-03 18:36:32 +08:00
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