Commit Graph

46 Commits

Author SHA1 Message Date
Jare Guo f054f504b6 fix typescript api 2017-04-26 17:17:59 +08:00
Nan Wang d9b5cef497 merge v1.4 2017-03-29 18:16:41 +08:00
pandamicro 2c6df80c42 Use containerStyle.margin instead of marginLeft for consistency 2017-03-23 18:00:22 +08:00
pandamicro d54555fee0 Remove useless checking 2017-03-16 16:40:18 +08:00
2youyouo2 dae0a14f41 Merge branch 'v1.4' of github.com:fireball-x/engine into physics 2017-03-08 16:41:00 +08:00
pandamicro 6dc195acc2 Fix adaptation issue in iframe nested game 2017-03-07 11:07:10 +08:00
Jare Guo 1f0b5503f0 Merge commit 'aaa2ac73b9dc0b05bf3d1b05342d10676e0ad432' into temp2
# Conflicts:
#	cocos2d/core/platform/CCClass.js
#	cocos2d/core/platform/CCView.js
#	cocos2d/core/platform/_CCClass.js
#	jsb/jsb-director.js
2017-03-02 14:30:09 +08:00
pandamicro afc2640127 Fix cc.view undefined issue 2017-02-10 17:10:49 +08:00
pandamicro 6a429365dc Improve screen adaptation logic 2017-02-10 16:23:33 +08:00
Jare Guo 42ba8c1fd3 reviewed 2017-02-03 14:40:05 +08:00
Jare Guo 36a7328f40 remove unused prototype properties 2017-02-03 13:53:54 +08:00
pandamicro d375942ca8 Small fixes 2017-01-22 19:01:09 +08:00
pandamicro 8ad9170410 Small improvements and fixes 2017-01-22 17:34:22 +08:00
pandamicro 839d5028d7 Open WebGL access for more browsers and forbid auto full screen in wechat 2017-01-22 17:34:22 +08:00
pandamicro d0850d0881 Fix scissor clipping issue 2017-01-22 17:34:22 +08:00
zilongshanren 0a84b7837b apply DRY 2017-01-17 15:39:26 +08:00
zilongshanren 4ebe2bc450 fix editbox landscape issue 2017-01-16 17:59:38 +08:00
pandamicro 85e6852b5b Improve orientation check 2016-12-30 10:17:19 +08:00
Nan Wang 4dea8e7a8a move all error logs to DebugInfos.js and only show error id in release build 2016-12-15 17:07:01 +08:00
knoxHuang 5cfc469e0b Repair loader._items.map to cc.loader._cache for enableAntiAlias 2016-12-05 09:43:41 +08:00
pandamicro dbb41b3633 Rerun screen adaptation logic when set orientation 2016-10-28 16:59:29 +08:00
pandamicro d76fa31ce2 Fix some browser orientation can't be forced issue 2016-09-21 02:01:31 +08:00
pandamicro eb8f888a74 Improve WebGL detection 2016-09-08 15:52:02 +08:00
pandamicro 502a2330ab Fix issue in orientationChange callback 2016-09-07 19:03:14 +08:00
knoxHuang e467bf1f58 add getAllTextures for CCTextureCache for fireball/issues/2836 2016-08-31 09:29:46 +08:00
Nan Wang 47c31b2346 fix ccview api comment 2016-08-24 11:36:15 +08:00
Wang Nan f5fec77ae6 Merge pull request #1059 from nantas/v1.2
merge enableAntiAlias, revert pause and resume event in CCGame
2016-08-23 09:31:48 +08:00
Nan Wang 112c91861d merged enableAntiAlias to v1.2 2016-08-22 18:31:46 +08:00
pandamicro cd6a4ba41b Only rotate the canvas when orientation changing 2016-08-22 11:33:39 +08:00
pandamicro 42b00ebcb9 Force update all scene after set design resolution policy 2016-08-19 16:25:06 +08:00
pandamicro 8e9016f362 Fix Orientation not supported in Fit height & Fit width mode 2016-08-19 16:06:55 +08:00
pandamicro a2766c3f77 Fix touch start point haven't been scaled issue 2016-08-01 18:16:17 +08:00
zilongshanren 99f6c6721a fix editbox can't input when fullscreen 2016-07-28 16:51:33 +08:00
pandamicro b3540f3fad Fix touch start point being updated issue 2016-07-21 10:38:33 +08:00
pandamicro c532c09eff Merge Cocos2d-html5 v3.12 webgl renderer 2016-07-12 16:33:51 +08:00
pandamicro 715f1d5f70 Fix orientation adaptation may fail when rotated size stays unchange 2016-05-26 19:25:07 +08:00
pandamicro 9880fc4cab Auto screen rotation: Fix margin set issue on some browser 2016-05-25 16:25:28 +08:00
pandamicro 9fc253e40f Avoid issues in Editor 2016-05-24 15:56:08 +08:00
pandamicro 222458f453 Fixed padding issue in View 2016-05-23 17:23:45 +08:00
pandamicro e86e846a74 Support auto rotate canvas when screen orientation isn't correct 2016-05-20 10:58:52 +08:00
Jare Guo 8a11d50099 inline redundant type cheching function 2016-04-25 14:33:47 +08:00
knoxHuang 9446e7f5b3 Synchronize Improve AudioEngine implementation. 2016-04-14 10:11:20 +08:00
pandamicro 4a5a57eb61 Fix resize event issue by avoiding adjust viewport meta multiple times 2016-04-07 18:28:30 +08:00
Nan Wang c8b95e65b2 fixed api doc error. 2016-03-25 16:22:12 +08:00
Jare Guo aa9304626d minor tweaks 2016-03-24 20:28:06 +08:00
pandamicro 6f530df13b Cleanup other modules 2016-03-14 21:46:13 +08:00