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

35800 Commits

Author SHA1 Message Date
pandamicro 466053b740 Fix JS AssetsManagerTest and Improve scheduler wrapper (#16605) 
* Fix tests for v3.12 web

* Improve scheduler wrapper

* Update web engine ref
 2016-09-26 14:44:32 +08:00
Wilson E. Alvarez 59574f95e0 Fix mismatched memory deallocators (#16596) 
* Fix mismatched memory deallocator in CCFastTMXLayer.cpp

* Fix mismatched memory deallocator on SkeletonRenderer.cpp

* Fix mismatched memory deallocator in CCTMXLayer.cpp
 2016-09-26 14:18:48 +08:00
Steve Tranby b22efc9115 Features: add events for window resize, focus, and unfocus (#16578) 
* add events for window resize, focus, and unfocus

* fix typo
 2016-09-20 20:32:33 -07:00
TankorSmash f93c6edb1f tidy up TextureAtlas::resizeCapacity (#16588) 
My intent is to reduce clutter and improve readability, so that going forward it's a little easier to edit this.

No behaviour change.
 2016-09-20 20:31:24 -07:00
mogemimi e8c3082229 Move skipBOM function outside to prevent shadowing warning (#16585) 2016-09-20 14:52:15 +08:00
colajam93 1d3a40f8be Fix warning (#16591) 2016-09-20 14:50:47 +08:00
colajam93 e7f739897c Fix deprecated warning (#16592) 2016-09-20 14:48:00 +08:00
mogemimi 63b3043dc0 Remove extra semicolon after member function definition (#16595) 2016-09-20 14:43:48 +08:00
halx99 a46b30f8a6 use more plain API FileUtils::getStringFromFile (#16586) 2016-09-19 11:49:35 +08:00
minggo 0960ffe64f Merge pull request #16584 from minggo/merge-v3.13.1 
Merge v3.13.1
 2016-09-19 09:49:49 +08:00
minggo 4dd1af5485 fix compiling error 2016-09-18 11:34:01 +08:00
minggo 84a102edf8 merge v3.13.1 back to v3 2016-09-15 10:08:28 +08:00
mogemimi 91cdb3394b Suppress warning C4101 on MSVC (#16573) 2016-09-14 10:49:14 -07:00
Steve Tranby 2776d1e715 XCode sometimes gets confused with multiple 'Rect' types (#16579) 2016-09-14 10:46:17 -07:00
mogemimi 63637139dc Fix -Wpessimizing-move warning when using Xcode 8 (#16580) 2016-09-14 10:45:26 -07:00
mogemimi afe8b05da8 Remove semicolons before method bodies (#16566) 2016-09-14 10:44:00 -07:00
Jun Hyeon, Nam 4342aabe28 remove unnecessary comments (#16572) 2016-09-14 10:42:25 -07:00
Ricardo Quesada 5f4fb66f61 fix: staggered hex maps returns correct tile (#16552) 
* fix: staggered hex maps returns correct tile

order was fixed in the array that contains the GIDs.

fixes Github issue #16512

* fix: add fix validation code for issue #16512
 2016-09-13 21:47:36 -07:00
Slack-Moehrle 290a124f2f edited Cocos command modifications (#16567) 2016-09-13 16:13:31 +08:00
CocosRobot 7410bdd981 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16563) 2016-09-12 10:03:21 +08:00
Wilson E. Alvarez 74fd5ae3ba Fix mismatched memory deallocator (#16560) 2016-09-12 10:02:48 +08:00
Steve Tranby 16781b00e8 change EaseBounce to real class instead of typedef (#16557) 2016-09-12 09:51:27 +08:00
minggo 3075108f1c get sdk version from java (#16546) 2016-09-12 09:49:39 +08:00
Dale Stammen c6f6952258 added missing COCOS2D_DEBUG=1 to debug preprocessor defines (#16551) 2016-09-12 09:48:56 +08:00
James Chen b8f127e601 fixed #16547: [ios, mac] Protencial memory leak in AudioPlayer.mm. (#16556) 
If playing a large audio and its loop flag is set to false, after the audio is played over, there will be 4 or 8 bytes memory leak by _rotateBufferThread variable.

Resolution:

The `isDestroy` flag should not be set to true in rotate buffer thread, to exiting the thread, we need another varible for this purpose.

Thanks @nicolechen819 for the feedback.
 2016-09-12 09:48:27 +08:00
CocosRobot ced81f3527 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#16554) 2016-09-12 09:46:19 +08:00
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