Commit Graph

4804 Commits

Author SHA1 Message Date
James Chen 318678be29 common js module fix. 2018-03-06 10:41:24 +08:00
James Chen 1cd2166684 continue. 2018-03-06 10:41:10 +08:00
James Chen 2bd4b4c3c4 Adds network ifiles to xcode project again. 2018-03-06 10:40:24 +08:00
James Chen faa3401f93 Adds window variable for all js vm. Adds se::ScriptEngine::getFileOperationDelegate interface. 2018-03-06 10:39:50 +08:00
James Chen 38cdd2b17d Adds const. 2018-03-05 18:11:08 +08:00
James Chen e83be4b12f fix missing getFileOperationDelegate for v8. 2018-03-05 17:42:50 +08:00
James Chen 88123dbb7b Updates opengl binding and module fix. 2018-03-05 11:00:02 +08:00
James Chen d6a8e1ca34 Merge branch 'new-renderer' of git://github.com/cocos-creator/cocos2d-x-lite into new-renderer
# Conflicts:
#	cocos/scripting/js-bindings/event/EventDispatcher.cpp
#	cocos/scripting/js-bindings/proj.ios_mac/cocos2d_js_bindings.xcodeproj/project.pbxproj
2018-03-02 11:07:11 +08:00
James Chen dc20cb8164 Adds opengl utils. 2018-03-02 11:04:21 +08:00
James Chen 235ad32f5e Updates opengl bindings 2018-03-02 11:02:13 +08:00
James Chen 8fe4aabe20 don't invoke tick now. 2018-03-01 17:20:16 +08:00
James Chen 154bbd29ce Removes code for debugging. 2018-03-01 13:49:47 +08:00
James Chen b9f7b812fe seval_to_EffectProperty and seval_to_std_vector_TechniqueParameter supports nullptr conversion. 2018-03-01 13:47:44 +08:00
James Chen 3af301306a Rename Effect.setDefineValue to Effect.define. 2018-03-01 13:46:57 +08:00
James Chen 983e87e9a6 module cache works. 2018-03-01 10:31:27 +08:00
minggo fd99785ef4 simplify xcode project (#1136) 2018-02-28 17:56:38 +08:00
minggo aa3d6f0cde remove unneed files (#1135) 2018-02-28 17:24:34 +08:00
minggo 6f54248b7f fix iOS scale issue (#1134) 2018-02-28 16:07:20 +08:00
minggo cd0e15cd7f refactor android with new renderer (#1133) 2018-02-28 14:55:33 +08:00
James Chen 3f88e14de9 require supports module.exports. 2018-02-27 17:03:28 +08:00
minggo a3dc57d9b7 js sample work on iOS (#1132)
* js sample work on iOS

* beautify codes
2018-02-26 16:58:10 +08:00
minggo e99f2401fd fix viewport issue on retina displays (#1130)
* fix viewport issue on retina displays

* remove include file
2018-02-24 18:13:03 +08:00
James Chen f001d1135d Adds swapBuffer to GLView, bunny test works again on Mac. (#1129) 2018-02-24 14:22:06 +08:00
James Chen 5453cbc99f Updates jswrapper to the latest version. (#1127) 2018-02-24 11:48:08 +08:00
minggo e575036b55 fix link template (#1126) 2018-02-24 11:47:02 +08:00
minggo 392f641cba invoke applicationDidFinishLaunching before main loop (#1125) 2018-02-24 10:48:09 +08:00
minggo 93090fea87 can run js on iOS and Mac (#1124) 2018-02-24 10:27:31 +08:00
minggo c01325313d refactor ios gl context setting process (#1123) 2018-02-23 11:18:16 +08:00
James Chen 4da873ecb8 Merge branch 'v1.8' into develop
# Conflicts:
#	cocos/scripting/js-bindings/script/jsb_cocos2d.js
2018-02-23 10:26:48 +08:00
James Chen e033dc5509 Fixes AnySDK framework crash after restarting game. (#1120) 2018-02-23 10:21:17 +08:00
James Chen cc1f3423d4 Reverts PR #1062 which may lead to other issues, fix it by another way. (#1117)
* Fixes custom listener returned by cc.eventManager.addCustomListener isn't attached to cc.eventManager.

* Reverts PR #1062 which may lead to other issues, fix it by another way.
1. JS LifeCycle control for GLProgram, GLProgramState.
2. jsb.registerNativeRef should be invoked in JS for cc.TMXTiledMap.getLayer/getObjectGroup/getObjectGroups, cc.TMXObjectGroup.getObject, cc.TMXObjectGroup.getObjects, cc.TMXObject.prototype.getNode.
2018-02-22 17:44:12 +08:00
James Chen 89509a9e53 [iOS] Potential crash fix in SE_BIND_CTOR macro. (#1116) 2018-02-12 17:03:03 +08:00
James Chen a2a28b3bfd PR #1114 fix is incorrect, fix it again. (#1115)
Potential crash fix in cc.callFunc binding.
2018-02-11 18:11:25 +08:00
James Chen 38c09d7afa Potential crash fix in cc.callFunc binding. (#1114) 2018-02-11 17:25:13 +08:00
CocosRobot 6c134875d7 [ci skip][AUTO]: updating jsbinding automatically (#1109) 2018-02-11 14:47:15 +08:00
minggo fee7afc74a mac main loop work (#1112)
* mac main loop work

* fix some issue
2018-02-11 14:25:14 +08:00
James Chen a195bffcad Ignore infinite loop in Exception handling. (#1110) 2018-02-11 13:54:37 +08:00
James Chen d4cfc6c37e Fix mouse scroll event dispatching issue. (#1108) 2018-02-09 17:31:17 +08:00
Jare Guo 1a24413ff3 gulp: auto bump version and push tag (#1100)
* gulp: automate push tag while publishing

* gulp: auto bump cpp version
2018-02-09 17:03:12 +08:00
minggo 695c26695c ios main loop work (#1107)
* ios main loop work

* fix compiling error
2018-02-09 16:44:46 +08:00
James Chen 94f73ad613 Updates version to 1.8.2 (#1105) 2018-02-09 14:04:36 +08:00
James Chen 380b27b02c fixed #1031: Potential Crash in JSB_WebSocketDelegate::onClose (#1103) 2018-02-09 12:53:29 +08:00
minggo 15b34c81dc dispatch touch event on iOS (#1101) 2018-02-09 09:26:44 +08:00
James Chen 31c25306bf Removes unused code in CallFunc. (#1099) 2018-02-08 15:50:24 +08:00
James Chen 5a14a7953b Crash fix for cc.spawn (#1098) 2018-02-08 15:11:42 +08:00
minggo 802e48080e New renderer (#1097)
* build work on mac

* build ok on iOS

* fix compiling error on android

* fix android link error
2018-02-08 10:40:29 +08:00
James Chen 5df0d63573 Adds JS interfaces for getting JSBinding object count. (#1095)
__jsc__.getJSBindingObjectCount returns the mapping size of Ref's sub class object and non-Ref class but lifecycle controlled by C++.
__jsc__.getJSBindingObjectCountNonRefCreatedInJS returns the mapping size of Non-Ref class object and JS object created in JS.
2018-02-07 19:02:01 +08:00
James Chen e7c6fc492b Fix memory leak which will cause slow down on games those use lot of actions. (#1094) 2018-02-07 18:29:03 +08:00
James Chen 409d1320b5 cocos2dx build.gradle fix. 2018-02-05 11:20:00 +08:00
James Chen 3e5f8dd0f2 API Level is minSDKVersion now. 2018-02-05 11:18:13 +08:00