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

2577 Commits

Author SHA1 Message Date
Dhilan007 063bde51c3 fixed #4300:fixed Label:draw location and BBOX is incorrect. 2014-03-07 11:42:13 +08:00
minggo 69d445efca Merge pull request #5525 from andyque/bug3868 
fixed #3868. Add guard check to send method of HttpClient
 2014-03-07 11:31:32 +08:00
CaiWenzhi f9ea39bf81 Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-07 10:54:38 +08:00
CaiWenzhi 7cdfba088d Modify reader 2014-03-07 10:35:58 +08:00
minggo 5999811028 Merge pull request #5547 from nutty898/develop_nutty_modify_framework_for315 
Fixd bugs for editor
 2014-03-07 10:30:55 +08:00
Huabing.Xu 5c1be5f2ef Merge branch 'develop' into develop_fix_node_transform_bug 
* develop:
  Improved documentation
  better doctrings
  fixes for linux
  small setup.py fixes
  Update CHANGELOG [ci skip]
  closed #4291：open CCEditBox as modal dialog
  Fixes 'schedule test/issue#2268' crashes
  closed #4150:  fix physics position/rotation tag bug.
 2014-03-07 10:07:19 +08:00
Huabing.Xu 9fc6177570 fix bug for outdated transform status 2014-03-07 10:03:34 +08:00
Ricardo Quesada 57b6478de7 Improved documentation 2014-03-06 16:14:06 -08:00
Ricardo Quesada 77d19e9bc2 better doctrings 
improved documentation for Node
 2014-03-06 14:04:19 -08:00
CaiWenzhi 1d867d770b Modify Windows project 2014-03-06 22:27:57 +08:00
CaiWenzhi 94339312ba Modify text filed size control 2014-03-06 21:58:45 +08:00
CaiWenzhi fea75444a7 Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-06 21:43:33 +08:00
CaiWenzhi 8b7a5c3141 Add RichText sample 2014-03-06 20:52:29 +08:00
zhangbin 56a46892fe closed #3991, Remove the method CCTextureCache::updateTexture(). 2014-03-06 17:38:18 +08:00
zhangbin 822ef8d588 Merge branch 'develop' into issue3991 2014-03-06 17:28:20 +08:00
CaiWenzhi 03f5be47da Modify for editor 2014-03-06 17:21:09 +08:00
boyu0 b926e4efad closed #4150: fix physics position/rotation tag bug. 2014-03-06 17:04:54 +08:00
CaiWenzhi b02ed6fb1e Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-06 16:17:35 +08:00
CaiWenzhi bd5c11b5ee Modify mk file and solve warnings 2014-03-06 16:15:03 +08:00
CaiWenzhi 2a5ecc2376 Fixed bugs of Flipping 2014-03-06 13:40:46 +08:00
CaiWenzhi 3554dcd749 Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-06 11:22:33 +08:00
zhangbin fec04dd6ae Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 2014-03-06 11:03:49 +08:00
James Chen 87b657b5bb Merge pull request #5575 from dumganhar/iss4286-event-crash 
closed #4286: 'EventDispatcherTest/Issue 4129' crashes on Windows.
 2014-03-06 11:03:34 +08:00
Ricardo Quesada 273d0d22f1 little performance improvement in quad command 2014-03-05 18:50:09 -08:00
James Chen 183622c718 'EventDispatcherTest/Issue 4129' crashes on Windows. 2014-03-06 10:45:29 +08:00
heliclei 73a3011b11 fix comments 2014-03-06 10:31:29 +08:00
heliclei 08d0cde490 Merge remote-tracking branch 'upstream/develop' into node-string-tag 2014-03-06 10:02:50 +08:00
zhangbin 6da0afdd03 Solve the crash in CocoStudioComponentsTest. 2014-03-06 09:23:27 +08:00
Ricardo Quesada a0ab8fcdf3 onDraw() updated 
`onDraw()` receives `const kmMat4 &transform` and `bool
transformUpdated`.

`CC_NODE_DRAW_SETUP()` is no longer used in our code.
`_modelViewTransform` is only used as a cache.
 2014-03-05 15:49:08 -08:00
Ricardo Quesada 0cb759cab8 Better names for tests 2014-03-05 11:50:12 -08:00
CaiWenzhi 5e84c15812 Add RichText 2014-03-05 23:03:49 +08:00
CaiWenzhi cb5f9ad6dc Modify windows project 2014-03-05 22:34:24 +08:00
CaiWenzhi ad85d2c800 Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-05 21:20:26 +08:00
CaiWenzhi 4f9dfdbef8 Fixed build error except Windows 2014-03-05 21:18:51 +08:00
minggo b7df75745e Merge pull request #5562 from Dhilan007/develop_label 
issue #3629:new label support customize the effects such as Shadow[blur is unsupported], Outline
 2014-03-05 17:28:37 +08:00
CaiWenzhi 7a4ba91f29 Modify project file 2014-03-05 17:08:59 +08:00
heliclei 55080d713b refactor string tag to name 2014-03-05 17:03:25 +08:00
CaiWenzhi ab47cafb31 Merge branch 'develop' into develop_nutty_modify_framework_for315 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
	cocos/gui/UIButton.cpp
	cocos/gui/UIButton.h
	cocos/gui/UIWidget.h
 2014-03-05 16:52:31 +08:00
Dhilan007 dfdf19daff remove unused shader and also did adjust FontAtlas::getTexture 2014-03-05 16:51:16 +08:00
Dhilan007 23501b40aa issue #3629:new label support customize the effects such as Shadow[blur is unsupported], Outline 2014-03-05 15:54:40 +08:00
James Chen 06cd98076a Merge pull request #5560 from dumganhar/develop 
Some warning fixes in cpp-tests.
 2014-03-05 15:26:56 +08:00
James Chen 20146c3ecb Merge pull request #5558 from Dhilan007/develop_label 
close #4276:fixed crash on CocoStudioGuiTest->LabelBMFontTest.
 2014-03-05 15:24:36 +08:00
James Chen 8e28400725 Some warning fixes in cpp-tests. 2014-03-05 15:04:47 +08:00
James Chen 9652da06f8 Merge pull request #5554 from koowolf/#5550_win 
closed #4278: Upgrading kazmath to the latest version.
 2014-03-05 14:58:24 +08:00
James Chen ec70d067d7 Merge pull request #5556 from boyu0/v3.0_final_test 
Fix particle test->AddAndRemove test crash.
 2014-03-05 14:53:05 +08:00
Dhilan007 c3c3e12ee6 close #4276:fixed crash on CocoStudioGuiTest->LabelBMFontTest. 2014-03-05 14:41:59 +08:00
boyu0 06faad7020 Fix partical test->add and remove particle system crash. 2014-03-05 14:32:22 +08:00
koowolf 3365280a0a build kazmath on win32 2014-03-05 14:30:55 +08:00
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 02572da9dc Adds EventListenerTouchOneByOne::isSwallowTouches, fixes a typo for Director::EVENT_AFTER_UPDATE. 2014-03-05 11:28:21 +08:00
Ricardo Quesada 0d69617a6c Adds CC_DLL to kazmath for windows compatibility 2014-03-04 18:07:03 -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 f269ec1f8f Compiles on Linux 2014-03-04 17:24:04 -08:00
Ricardo Quesada c63f210e26 Compiles on Android 2014-03-04 16:59:39 -08:00
Ricardo Quesada 4fe3b16287 Updates to latest version of kazmath 2014-03-04 16:33:00 -08:00
Ricardo Quesada 7ac663e02c GL Program API fixes 2014-03-04 13:51:43 -08:00
CaiWenzhi 353f6fb42c Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-05 01:09:51 +08:00
heliclei cbec0f9a15 CCNode:Add String tag, to support runtime manipulation 2014-03-05 00:15:01 +08:00
heliclei 728d5f34de CCConsole: add script support 2014-03-05 00:07:30 +08:00
CaiWenzhi 5108d276b6 Modify trigger 2014-03-04 23:55:36 +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 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
Huabing.Xu 3d0cd62e12 add comment to make interface clearer 2014-03-04 17:34:48 +08:00
CaiWenzhi 8b9d572961 Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-04 16:59:06 +08:00
CaiWenzhi 4a2dc4a607 Add custom widget and reader 2014-03-04 16:51:35 +08:00
James Chen 98e1099370 Fixes crash of PerformanceTest/EventDispatcherTest. 2014-03-04 16:43:04 +08:00
Huabing.Xu 99d0ce160a rename setVirtualViewPort->setVirtualViewport 2014-03-04 15:41:36 +08:00
Huabing.Xu ec397611f6 remove blank line，adjust indent 2014-03-04 15:30:05 +08:00
Huabing.Xu 756024e9f1 implement interface setKeepMatrix, setVirtualViewPort 2014-03-04 15:07:28 +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
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
Huabing.Xu 7949cb2cd9 add interface for keep Matrix 2014-03-04 10:41:03 +08:00
andyque 629c6b9a89 fixed #3868. Add guard check to send method of HttpClient 2014-03-04 10:07:49 +08:00
Ricardo Quesada 8bdfce9bbe Merge branch 'develop' into visit_draw_improved 2014-03-03 17:31:29 -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 d0f8dbd4be Fix Timer::cancel always call Director::getInstance()->getScheduler() even in another Scheduler; 2014-03-03 19:12:59 +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
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
James Chen bd3efebb26 Merge pull request #5513 from 2youyouo2/develop 
fixed CocoStudioTest/ArmatureTest crashes.
 2014-03-03 16:15:51 +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
CaiWenzhi 23a51c7c84 Merge branch 'develop' into develop_nutty_modify_framework_for315 2014-03-03 13:45:53 +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
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