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

37221 Commits

Author SHA1 Message Date
Knox 78a167fec1 [ci skip]when keyboard is popup, engine should not continue to handle touch events 2017-09-28 10:25:25 +08:00
minggo f2db054edb [ci skip]fix android violation (#18309) 2017-09-25 09:28:03 +08:00
halx99 e5d19429b8 [ci skip]Make the sort behavior is same on 32bit and 64bit (#18301) 
* Make the sort behavior is same on 32bit and 64bit

* Update CCNode.h

* Update CCNode.cpp

* Update ccMacros.h

* Use std::int32_t to for zOrder

* Update CCNode.cpp
 2017-09-25 09:27:33 +08:00
minggo cb3c0853e1 [ci skip]Remove win10 and tizen support 
* remove win10 sln

* remove win10 porj from template

* remove win10 and tizen support
 2017-09-22 17:54:37 +08:00
minggo 54572e7571 Update README.md 2017-09-22 17:39:31 +08:00
minggo d92de77ce7 Update README.md 2017-09-22 17:36:09 +08:00
minggo 42b45c4ad6 [ci skip]update changelog and release note (#18312) 2017-09-22 17:33:24 +08:00
James Chen b633260020 Should use setTextColor for editbox placeholder. (#18311) 2017-09-22 16:06:13 +08:00
Jeff Wang bd59575468 fix #18296 (#18299) 
fix #18296
 2017-09-22 11:56:51 +08:00
pandamicro 247921c08a [ci skip] update web ref and fix test case issues (#18310) 2017-09-22 10:54:53 +08:00
minggo f94fee793c [ci skip] update changelog and readme 2017-09-21 16:54:21 +08:00
minggo 5736863c74 update changelog and readme 2017-09-21 16:52:41 +08:00
minggo 19a038bd5b update CHANGELOG 2017-09-21 16:43:33 +08:00
minggo a1ef303f47 Merge pull request #18294 from minggo/sync-v316 
Sync v316
 2017-09-21 11:07:20 +08:00
Thorbjørn Lindeijer 7350aeca8c TMX: Added support for reading the object.rotation attribute (#11540) 
Introduced with Tiled 0.10, this attribute stores the rotation of an
object in degrees clockwise.

Closes bjorn/tiled#921
 2017-09-20 14:31:15 +08:00
minggo b275a3e2f0 fix conflict 2017-09-20 09:11:35 +08:00
minggo 66471154b0 do not compile unneeded file (#18290) 2017-09-20 09:05:27 +08:00
mogemimi a5374d0411 Fix minor typos (#18289) 2017-09-20 09:05:00 +08:00
James Chen 0c5ba220b1 Supports full screen for iPhone X and uses Storyboard for launch screen. (#18276) 
* Supports full screen for iPhone X and uses Storyboard for launch screen.
cpp-empty-tests done.

* Supports full screen for iPhone X and uses Storyboard for launch screen.
cpp-tests, js-tests, lua-empty-test, lua-tests done.

* Removes unused UILaunchImages for test projects.

* Removes unused UILaunchImages for template projects.

* Adds LaunchScreen.storyboard / LaunchScreenBackground for template projects.

* Fixes lua template.
 2017-09-19 15:01:19 +08:00
yycmmc edd81d3528 use error macro to replace constant value 1410L (#18264) 2017-09-19 10:05:46 +08:00
minggo bbc3eaaa4d fix gravity direction (#18282) 2017-09-19 09:41:44 +08:00
minggo bb21a206a9 update vertex buffer to update color (#18283) 2017-09-19 09:41:10 +08:00
minggo 186e05f7c5 adjust z order (#18284) 2017-09-18 17:18:20 +08:00
minggo 99f5fbb63f Fix VAO in CameraBackgroundBrush (#18278) (#18279) 2017-09-18 15:47:50 +08:00
James Chen a73d5893b4 [android] Fixes AppAcitivity (Sub class of Cocos2dxActivity) is re-created which causes crash if launching app first time and re-opening from icon. (#18271) 
* [android] Fixes AppAcitivity (Sub class of Cocos2dxActivity) is re-created which causes crash if launching app first time and re-opening from icon.

* Update AppActivity.java

* Update AppActivity.java
 2017-09-18 15:12:30 +08:00
pyrosphere 80c9292969 Fix VAO in CameraBackgroundBrush (#18278) 2017-09-18 10:50:00 +08:00
minggo c4042c220b [ci skip]fix issue that can not change position style, can not add new emitter (#18272) 2017-09-15 10:49:04 +08:00
minggo c66694cf20 adjust to make wrap mode take effect (#18259) 
* adjust to make wrap mode take effect

* make description more clear
 2017-09-15 09:01:56 +08:00
minggo 19962a3b59 [ci skip]don't clean layer when switch to another layer (#18267) 2017-09-14 17:42:56 +08:00
minggo 164cb98fe9 fix linking error on mac (#18266) 2017-09-14 17:27:41 +08:00
minggo dc8502edc1 make description more clear (#18263) 2017-09-14 09:26:04 +08:00
minggo d092e1c877 fix output bin path (#18258) 2017-09-13 16:38:50 +08:00
minggo ed8417ae48 Merge pull request #18255 from minggo/syn-v316 
Syn v316
 2017-09-13 16:31:06 +08:00
minggo 26272b2026 use update instead of run action because Sequence has issue when work with RepeatForever (#18257) 2017-09-13 15:36:11 +08:00
pandamicro c9fb0b5c03 [ci skip] update web ref (#18256) 2017-09-13 11:46:32 +08:00
minggo 42b596c7f4 sync v3.16 to v3 2017-09-13 11:19:13 +08:00
minggo 36f7f3c37e Merge branch 'v3.16' of github.com:cocos2d/cocos2d-x into syn-v316 2017-09-13 11:18:39 +08:00
James Chen 2fbb6fe32a [ci skip][lua] Bug fix in xhr:getResponseHeader("xxx") and better coding particle. (#18252) 
* [lua] Bug fix in xhr:getResponseHeader("xxx") and better coding particle.

* More const auto &.
 2017-09-13 10:54:35 +08:00
pandamicro 1929265a7c [ci skip] Fix web engine issues for 3.16 QA (#18251) 
* Fix web test case issue in UIListView

* imgLoader callback use texture instead of image

* Update web ref
 2017-09-11 21:03:22 -05:00
James Chen 3468ff6c33 [js-tests] Fixes no image display in OpenGLTest (#18241) 2017-09-12 09:39:49 +08:00
pandamicro 402be527a7 Fix web test case issue in UIListView (#18245) 2017-09-12 09:39:33 +08:00
minggo afe4016618 fix crash of CaptureScreenTest (#18242) 2017-09-12 09:39:15 +08:00
James Chen 6318324f4d [android] Fixes Cocos2dxActivity is re-created which causes crash if launching app first time and re-opening from icon (#18247) 2017-09-12 09:38:54 +08:00
James Chen ec83cc99cc [ci skip] [lua-tests] fix wrong position of 'save' button in renderTextureTest. (#18244) 2017-09-08 16:42:12 +08:00
pandamicro 3603ace449 Merge pull request #18240 from pandamicro/v3.16 
Fix Label cutting issue in web test case
 2017-09-08 16:39:28 +08:00
James Chen bcee395f6e [js-tests] Fixes UISceneManager.js:830:TypeError: test is undefined (#18243) 2017-09-08 15:34:54 +08:00
pandamicro 97325298c5 Fix Label cutting issue in web test case 2017-09-08 14:52:27 +08:00
James Chen d13c01230f Fixes ShaderRetroEffect crashes. (#18237) 2017-09-08 14:10:40 +08:00
CocosRobot 46e70d3c71 [ci skip][AUTO]: updating luabinding & jsbinding & cocos_file.json automatically (#18236) 2017-09-08 10:49:17 +08:00
minggo 2fe40dba68 make uifocustest the same behavior as cpp (#18238) 2017-09-08 10:35:15 +08:00