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

16893 Commits

Author SHA1 Message Date
James Chen d1a0218a3b Merge pull request #5542 from pandamicro/myfix 
Feature #4236: Refactor is/setFlipX/Y to is/setFlippedX/Y in gui classes
 2014-03-05 12:45:41 +08:00
James Chen b2c13ee2e3 Merge pull request #5552 from dumganhar/develop 
Adds EventListenerTouchOneByOne::isSwallowTouches, fixes a typo for Director::EVENT_AFTER_UPDATE.
 2014-03-05 11:31:34 +08:00
James Chen 02572da9dc Adds EventListenerTouchOneByOne::isSwallowTouches, fixes a typo for Director::EVENT_AFTER_UPDATE. 2014-03-05 11:28:21 +08:00
minggo 574d8554e8 Merge pull request #5545 from lihex/develop 
add sln file
 2014-03-05 10:33:07 +08:00
James Chen 6404623be5 Merge pull request #5551 from samuele3hu/bug_fix 
fix:make TimerScriptHandler do nothing in the `cancel` function
 2014-03-05 10:21:23 +08:00
samuele3 3edeba5001 Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug_fix 2014-03-05 09:52:37 +08:00
samuele3 53851151d9 fix:TimerScriptHandler can’t do anything in the `cancel` function 2014-03-05 09:51:57 +08:00
Ricardo Quesada bf1413e71f Merge pull request #5549 from ricardoquesada/changelog_updates 
Updates CHANGELOG with GLProgram changes
 2014-03-04 15:01:33 -08:00
Ricardo Quesada cdab088fc5 Updates CHANGELOG with GLProgram changes 2014-03-04 15:01:02 -08:00
Ricardo Quesada 273a42a234 Merge pull request #5548 from ricardoquesada/glprogram_api_fixes 
Glprogram api fixes
 2014-03-04 14:38:32 -08:00
Ricardo Quesada 0bbc1cf5c3 fixes more warnings 2014-03-04 14:00:32 -08:00
Ricardo Quesada 7ac663e02c GL Program API fixes 2014-03-04 13:51:43 -08:00
lihex c4cad757c4 add sln file 2014-03-05 00:26:22 +08:00
pandamicro 364317b532 Feature #4236: Refactor is/setFlipX/Y to is/setFlippedX/Y in gui classes 2014-03-04 23:42:58 +08:00
James Chen ed32cd0e15 Update AUTHORS [ci skip] 2014-03-04 22:13:36 +08:00
James Chen 066a6a3577 Update CHANGELOG [ci skip] 2014-03-04 22:11:50 +08:00
James Chen bb86a9e350 Merge pull request #5517 from bmanGH/feature/fix_timer_cancel_bug 
closed #4272: Timer::cancel always call Director::getInstance()->getScheduler() even in another Scheduler
 2014-03-04 22:08:55 +08:00
minggo 6cb665b637 Merge pull request #5534 from dabingnn/develop_RenderTextureImprovement 
Develop render texture improvement
 2014-03-04 18:30:37 +08:00
minggo 84f97fdd32 Merge pull request #5539 from lihex/develop 
update cocos2dx_files.json
 2014-03-04 18:30:25 +08:00
minggo b6832aa59f Merge pull request #5541 from minggo/release-note 
update release note
 2014-03-04 18:17:57 +08:00
minggo d68848dde7 update release note 2014-03-04 18:15:30 +08:00
Huabing.Xu 3d0cd62e12 add comment to make interface clearer 2014-03-04 17:34:48 +08:00
lihex c3d7d1f1bc Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-03-04 16:54:15 +08:00
lihex a5e0c08583 update cocos2dx_files.json 2014-03-04 16:53:26 +08:00
minggo 76961b799a Merge pull request #5538 from minggo/develop 
update console to latest version
 2014-03-04 16:48:33 +08:00
minggo e044cbb12b update console to latest version 2014-03-04 16:47:56 +08:00
minggo a3c2f4336f Merge pull request #5537 from minggo/develop 
update console to latest version
 2014-03-04 16:45:39 +08:00
minggo 224b3220eb update console to latest version 2014-03-04 16:45:02 +08:00
James Chen 11d6f3d5bd Merge pull request #5536 from dumganhar/develop 
Fixes crash of PerformanceTest/EventDispatcherTest.
 2014-03-04 16:44:15 +08:00
James Chen 98e1099370 Fixes crash of PerformanceTest/EventDispatcherTest. 2014-03-04 16:43:04 +08:00
minggo 7339970b0d Merge pull request #5535 from lihex/develop 
add console support files
 2014-03-04 16:39:48 +08:00
lihex ce3f527ebf add console support files 2014-03-04 16:27:59 +08:00
Huabing.Xu 99d0ce160a rename setVirtualViewPort->setVirtualViewport 2014-03-04 15:41:36 +08:00
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