Commit Graph

4804 Commits

Author SHA1 Message Date
pandamicro a3039798cf Fix reversed code 2017-07-19 18:09:15 +08:00
pandamicro d67ef36f36 Merge pull request #714 from pandamicro/develop
Improve iOS project in templates
2017-07-19 18:07:59 +08:00
pandamicro 2c7e127539 Rearrange anysdk files in iOS project 2017-07-19 17:59:54 +08:00
pandamicro 7ac7251fee Change iOS deployment target to iOS8 2017-07-19 17:49:27 +08:00
knoxHuang 1779f7a585 fix evalString error for fireball/issues/6062 2017-07-19 13:10:42 +08:00
knoxHuang ae7232bf63 fix evalString error for fireball/issues/6062 2017-07-19 12:00:50 +08:00
James Chen e026c60b4e Sync bug fix: https://github.com/cocos2d/cocos2d-x/pull/18083 2017-07-19 10:37:06 +08:00
pandamicro 2cf6175ba4 Merge pull request #711 from pandamicro/develop
Fix new Uint8Array failure on iOS armv7
2017-07-18 23:23:38 +08:00
pandamicro 0c40e69d50 Fix new Uint8Array failure on iOS armv7 2017-07-18 23:22:12 +08:00
pandamicro 75efb10020 Merge pull request #710 from pandamicro/develop
Fix iOS mmap and TypedArray issue
2017-07-18 09:56:35 +08:00
pandamicro ed103db2e3 Fix iOS mmap and TypedArray issue 2017-07-18 09:55:40 +08:00
Wang Nan 171c35292a Merge pull request #709 from dumganhar/fix/binary-template-link-error
Fixes binary template compilation fairlure.
2017-07-14 17:43:13 +08:00
James Chen 070c1aabb7 Fixes binary template compilation fairlure.
https://github.com/cocos-creator/fireball/issues/6028
2017-07-14 17:36:26 +08:00
knoxHuang dfb9e9fa9d fix js_cocos2dx_TMXTiledMap_getPropertiesForGID error for fireball/issues/6035 2017-07-14 15:15:24 +08:00
Wang Nan 66e67e84de Merge pull request #707 from 2youyou2/physics
fixed some physics jsb bugs
2017-07-13 09:40:10 +08:00
2youyouo2 e76f7837e3 fixed some physics jsb bugs 2017-07-12 17:36:53 +08:00
2youyouo2 373ee72e58 add const to getFixtures 2017-07-12 17:36:20 +08:00
pandamicro 71298100c0 Merge pull request #706 from pandamicro/develop
Remove SimpleAudioEngine dependency on android
2017-07-12 16:23:42 +08:00
pandamicro 807854ee7a Remove SimpleAudioEngine dependency on android 2017-07-12 16:16:38 +08:00
James Chen b3db0a842a add modules register 2017-07-12 11:15:46 +08:00
pandamicro 3f535277b6 Merge pull request #705 from pandamicro/develop
Avoid restart crash in spidermonkey
2017-07-11 18:34:33 +08:00
pandamicro 856de64714 Avoid restart crash in spidermonkey 2017-07-11 18:33:39 +08:00
pandamicro 9234bdf0bc Merge pull request #704 from pandamicro/develop
Small fixes
2017-07-11 15:36:37 +08:00
pandamicro 09cb88821b Fix small issues in simulator win32 project 2017-07-11 15:36:04 +08:00
pandamicro cbe4dc6f6d Fix java oc reflection issue 2017-07-11 15:35:31 +08:00
James Chen 2808497a88 clearException after manually registration. 2017-07-11 13:40:04 +08:00
James Chen ed74c36888 JavaScriptJavaBridge works. 2017-07-11 11:42:42 +08:00
Nan Wang 09d90d5dea Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into develop 2017-07-11 10:05:21 +08:00
Nan Wang 9c118706d4 updated version to 1.6.0 2017-07-11 10:05:04 +08:00
James Chen f7b488baf1 Adds JavaScriptObjCBridge 2017-07-11 09:39:16 +08:00
pandamicro 869ee6c185 fix vs 2017 compilation issue with spidermonkey 2017-07-11 00:52:37 +08:00
pandamicro d32214f0d2 Fix simulator crash during app close 2017-07-10 18:30:55 +08:00
pandamicro 144c49a6d7 Fix js oc reflection issue 2017-07-10 18:30:33 +08:00
James Chen b8c1493850 socketio bindings ok, and fix some bugs of socketio. 2017-07-10 16:40:33 +08:00
pandamicro 9765d2d039 Fix win32 simulator issue 2017-07-10 14:26:50 +08:00
pandamicro 9e65519899 Readd ide support for win32 simulator 2017-07-10 10:38:45 +08:00
pandamicro 22109f8e8d Fix gc crash during app closing 2017-07-09 14:34:02 +08:00
pandamicro 66897d4f3f Add back ide-support and fix compilation issues 2017-07-09 10:52:37 +08:00
James Chen 5c9c90bbc4 logic error fix. 2017-07-07 16:04:51 +08:00
pandamicro 1ad2d9f6f5 Fix git-archive-all for real 2017-07-07 16:01:47 +08:00
James Chen b8fe0d3674 Updates box2d bindings. 2017-07-07 15:16:27 +08:00
pandamicro 9864309625 Merge pull request #697 from pandamicro/develop
Fix git archive all
2017-07-07 11:14:48 +08:00
pandamicro 006b570479 Fix git archive all 2017-07-07 10:58:15 +08:00
James Chen 04f827e059 editbox, videoplayer, webview work. 2017-07-06 16:21:37 +08:00
pandamicro 1bb26ebd37 Merge pull request #696 from pandamicro/develop
Fix android gen libs issue
2017-07-06 16:02:14 +08:00
pandamicro 7194ea7611 Fix android gen libs issue 2017-07-06 16:01:35 +08:00
James Chen 7a2da39b16 updates bindings-generator 2017-07-06 15:40:46 +08:00
James Chen e992e1fcef dragonbones will not crash now. 2017-07-06 15:33:53 +08:00
James Chen 1fd2936ab9 Adds dragonbones manual bindings. 2017-07-06 14:30:23 +08:00
pandamicro 8d9633824d Merge pull request #695 from pandamicro/develop
Fix simulator win32 debug post build event
2017-07-06 11:24:40 +08:00