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

36424 Commits

Author SHA1 Message Date
mogemimi 2b9ac2c950 Remove redundant semicolons (#16558) 2016-09-12 09:45:34 +08:00
mogemimi eca7b2392d Remove unnecessary inline keywords (#16562) 2016-09-12 09:44:21 +08:00
minggo 86de22a008 fix crash if FontAtlas pointer is the same (#16555) 2016-09-09 11:39:00 +08:00
Sachin Garg 84f6863214 getSlidBallRenderer methods to allow more customization of UISlider (#16532) 
* getSlidBallRenderer methods to allow more customization of UISlider look and feel.

* Added const to declaration of getSlidBallRenderer methods for UISlider.
 2016-09-09 10:01:14 +08:00
minggo 4056f24d71 update console (#16553) 2016-09-09 09:35:39 +08:00
minggo 02e943075b update changelog and release note (#16548) 2016-09-08 18:36:25 +08:00
Dale Stammen 1c27c12327 updated libcocos2d dll version to 3.13.1 (#16542) 2016-09-08 10:38:16 +08:00
minggo 1d7d803882 update submodule (#16540) 2016-09-07 18:00:34 +08:00
minggo e394c05c51 update console submodule (#16539) 2016-09-07 17:30:25 +08:00
minggo 569681f6bd use api level 13 (#16538) 2016-09-07 14:50:03 +08:00
minggo e122b902a9 update changelog and release note (#16537) 2016-09-07 13:58:48 +08:00
Ricardo Quesada 282959cc0f fix: uses correct design resolution (#16534) 
fixes github issue #16485
 2016-09-07 12:01:40 +08:00
Peter Siegmund 9449e687af fixed compile error for android-studio build (with-controller) (#16529) 2016-09-07 12:01:11 +08:00
Ricardo Quesada 2d1048bd00 fix: uses default designResolution if not set previosly (#16533) 
fixes github issue #16485
and re fixes github issue #16003
 2016-09-07 11:11:52 +08:00
minggo b014720f64 only build linux and android since it will met timeout issue on other platforms (#16536) 2016-09-07 11:10:12 +08:00
minggo fa15ab8212 3.13.1 text color (#16516) 
* fix: Label updateColor() and underline color work as expected (#16486)

fixes Github issue #15214 correctly. underline uses _displayColor
and not _textColorF. _textColorF is only for the text.
This also emulates the SystemFont underline behavior

fixes Github issue #16471

* fix conflict

* Issue 16471 (#16489)

* fix: Label updateColor() and underline color work as expected

fixes Github issue #15214 correctly. underline uses _displayColor
and not _textColorF. _textColorF is only for the text.
This also emulates the SystemFont underline behavior

fixes Github issue #16471

* docs: added more internal doc for issue_16471
 2016-09-07 09:44:58 +08:00
minggo c233a5bdf7 [ci skip]V3.13.1 doc (#16528) 
* update release note and changelog

* update engine version
 2016-09-06 17:01:23 +08:00
minggo 937525a4de prevent restarting activity on some events (#16525) 2016-09-06 16:12:49 +08:00
minggo c51605971f fixed #16490: [android, audio] AudioEngine::stop() triggers 'finished' callback (#16491) (#16524) 2016-09-06 10:58:43 +08:00
Allen Lee 7c298bdcd7 misspelling check on cocos directory (#16522) 
Misspelling fix on some comments,
cocos/editor-support/cocostudio/CSParseBinary_generated.h
fix misspelling postion -> position
 2016-09-06 10:14:14 +08:00
James Chen 50a1e75373 fixed #16502: SPINE color bug (temporary storage of color was wrong in SkeletonRenderer) (#16503) 2016-09-06 10:11:54 +08:00
CocosRobot 8d2b645a96 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16519) 
* fixed #16473: OpenSLES error while play background music in writable path or sdcard. (#16475) (#16517)

* [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically
 2016-09-06 10:11:11 +08:00
minggo 9dc737901b fixed #16473: OpenSLES error while play background music in writable path or sdcard. (#16475) (#16521) 2016-09-06 09:41:53 +08:00
minggo a6c398ec95 Fixes jsval_to_std_string could not convert number to string. (#16504) (#16515) 
Don't use deprecated method in ActionsProgressTest.
 2016-09-05 17:42:34 +08:00
CocosRobot 8947ff722e [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16514) 2016-09-05 13:48:58 +08:00
CocosRobot 6f4551cdad [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16513) 2016-09-05 10:19:41 +08:00
Steve Tranby b48bcc9579 Ease Actions Code De-Duplication 
* ease action class macros to reduce code duplication

- update bindings for ease actions
- reorder clone method
- add back in create/etc methods to allow for EaseRateAction instances
- fix wrong clone return type

* Add note and minor cleanup

* use create in clone instead of new/init as in latest EaseBezierAction

* fix reverse for EaseIn/Out to match original code

* add assert for null

* refactor to match original code flow

* fix missing CC_DLL for windows builds

* fix win build issues due to abstract methods

* remove unused overrides
 2016-09-05 10:18:30 +08:00
mogemimi 857b2143a6 Remove deprecated attribute on Node::_setLocalZOrder() function (#16470) 2016-09-05 10:06:42 +08:00
James Chen 93322eb728 Fixes lua template in release mode. (#16501) 2016-09-05 10:02:42 +08:00
James Chen 5bfd110424 Fixes jsval_to_std_string could not convert number to string. (#16504) 
Don't use deprecated method in ActionsProgressTest.
 2016-09-05 10:02:05 +08:00
minggo ba82ce2863 add language property (#16500) 2016-09-02 10:51:02 +08:00
CocosRobot b6536e8d9f [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16499) 2016-09-02 10:44:55 +08:00
Rubonnek d5b5ecd886 Fix memory leak when loading Cocos Studio file (#16487) 2016-09-02 10:33:00 +08:00
minggo 57bf4a923b fix secure (#16497) 2016-09-02 10:32:36 +08:00
pyrosphere 0cd365dd2e Fix MenuItemSprite::unselected() on disabled items showing _normalImage instead of _disabledImage (#16482) 2016-09-02 09:51:47 +08:00
minggo 978f9f99de generate binding codes and cocos_file.json (#16496) 2016-09-01 18:54:49 +08:00
Ricardo Quesada c32000250c Issue 16471 (#16489) 
* fix: Label updateColor() and underline color work as expected

fixes Github issue #15214 correctly. underline uses _displayColor
and not _textColorF. _textColorF is only for the text.
This also emulates the SystemFont underline behavior

fixes Github issue #16471

* docs: added more internal doc for issue_16471
 2016-09-01 16:59:40 +08:00
minggo db21e5f349 [ci skip]Travis enable pull request (#16494) 
* refactor travis and build pull request

* delete unneeded file
 2016-09-01 16:25:47 +08:00
Renato Almeida 1c40d5e16d Fix MessageBox inverted params on Android (#16484) 2016-09-01 16:10:02 +08:00
James Chen 64c62d37c2 fixed #16490: [android, audio] AudioEngine::stop() triggers 'finished' callback (#16491) 2016-09-01 16:06:29 +08:00
James Chen 6d27868918 fixed #16473: OpenSLES error while play background music in writable path or sdcard. (#16475) 2016-09-01 11:47:33 +08:00
James Chen 01e67f6203 fixed #16477: [android, audio] Deadlock if preload the same file more than 3 times in preload callback. (#16478) 
And added test case.
 2016-09-01 11:46:27 +08:00
James Chen 35f937cd40 AudioMixerController::initTrack should not setState for track. Otherwise, it may trigger Track state mess-up. (#16476) 
* Warning fixes in AudioDecoder.cpp

* AudioPauseResumeAfterPlay test case should start in onEnter.
And add a loop to pause & resume many times.

* AudioMixerController::initTrack should not setState for track. Otherwise, it may trigger Track state mess-up.
 2016-09-01 11:43:37 +08:00
Ricardo Quesada e57c30c83b fix: Label updateColor() and underline color work as expected (#16486) 
fixes Github issue #15214 correctly. underline uses _displayColor
and not _textColorF. _textColorF is only for the text.
This also emulates the SystemFont underline behavior

fixes Github issue #16471
 2016-08-31 20:20:13 -07:00
minggo e0900e09dd Update CHANGELOG 2016-08-31 14:40:29 +08:00
minggo 5e6822d50b [AUTO][ci skip]: updating cocos2dx_files.json (#16468) 2016-08-31 09:37:55 +08:00
CocosRobot e33aa63226 [AUTO][ci skip]: updating cocos2dx_files.json 2016-08-30 09:20:13 +00:00
minggo b569f87d3f Update .travis.yml 2016-08-30 17:18:18 +08:00
mogemimi 58ede40ed9 Add missing definition of PhysicsBody::getFirstShape (Revert part of #13923) (#16458) 2016-08-29 19:23:14 -07:00
Rubonnek 91efab2ba7 Fix memory leak caused by packetOut in SocketIO.cpp (#16451) 2016-08-29 19:22:38 -07:00