owen
2c31d09fa5
Fix 213 spine auto file generate error ( #1828 )
2019-09-04 11:11:27 +08:00
Arnold
1914ef6d17
update binding generator ( #1819 )
2019-08-30 18:42:51 +08:00
Arnold
e29a43baff
fix travis ( #1818 )
2019-08-30 18:07:24 +08:00
Arnold
f3f5f4b7b6
Prevent connection objects from being GC, when they are not done yet. ( #1716 )
...
* prevent connections from being GC, when they are not yet.
* run genbindings
* triggle ci
2019-04-19 10:17:41 +08:00
Knox
e99ea056a9
update simulator screen size config ( #1705 )
2019-03-21 13:53:58 +08:00
owen
0acb69851b
optimize spine memory ( #1694 )
...
* Optimize spine memory
* roll back genbindings.py
Remove unused function
* visual studio project config
* modify Android mk
* Modify default project config
* Fix restart vm crash
* Fix if listen spine dispose event, will triggle crash bug
* Move some function to private
* move release skeletondata behind depose skeleton
* optimize spine load file
* Add dragon bones and spine global time scale api
* clear tracks and listener
* change tab to 4 spaces
* optimized code logic
2019-03-12 11:51:51 +08:00
owen
a9887b4638
Fix vertex exceed 65535 error and dragonbones leak ( #1669 )
...
* fix exceed native-renderer
* fix dragonbones memery leak
* fix native db leak
* fix native db leak
* indent issue
* add MeshBuffer into vs project
* modify cocos2d_files template
* optimize spine
2019-02-12 17:14:03 +08:00
Knox
ad58cdda5b
update simulator devices config ( #1675 )
2019-02-01 10:31:04 +08:00
leda
c792623707
improve module register logic, include simulator config ( #1665 )
...
* add Configuration settings for simulator, too
* improve module register logic
2019-01-16 11:29:47 +08:00
吴智明
2f6b44a2fc
Change network module ( #1655 )
...
* change USE_NET_WORK to USE_SOCKET and add xmlhttprequest default for ios platform
* change USE_NET_WORK to USE_SOCKET and add xmlhttprequest default for android platform
2019-01-14 16:26:32 +08:00
owen
788244869f
Spine upgrade ( #1652 )
...
* upgrade spine
* upgrade spine
* upgrade spine
* upgrade spine
* upgrade spine
* upgrade spine
* upgrade spine
* gulp: auto retry when git ref locked
* upgrade spine
* upgrade spine
* upgrade spine
* upgrade spine
* upgrade spine
2019-01-11 11:48:38 +08:00
吴智明
aca87582d3
change macro setting to xcconfig on ios and mac platform ( #1653 )
...
* change macro setting to xcconfig on ios an mac platform
* remove unuse files
2019-01-08 11:48:21 +08:00
leda
626e4a2344
fix simulator relaunch memory free bugs ( #1646 )
...
* improve terminate logic on Simulator
* fix win32 simulator relaunch, error
2018-12-27 16:04:27 +08:00
owen
af028c94d3
fix simulator compile error ( #1616 )
2018-12-10 11:01:12 +08:00
owen
c9ebdd81c3
Change bindings-generator sub modules ( #1623 )
...
* Change bingdings-generator sub modules
2018-12-07 18:27:21 +08:00
owen
c9c6634e7e
v2.0 skeleton optimize ( #1603 )
...
* v2.0 skeleton optimize
* v2.0 skeleton offical source file
* Rename jsbDragonBones to dragonbones
Rename jsbSpine to spine
Rename editor to middleware
Rename EditorManager to MiddlewareManager
* Rename Macro.h to MiddlewareMacro to avoid duplication of name
* Middleware update by js
* recover other ini generate
* Update cocos2dx-file.json
* createArrayBuffer support null point
* Rename MiddlewareMacro
* skeleton windows 工程
* add checkspace before write buffer
* add math include
* modify dragonBones to dragonbones
* modify dragonBones to dragonbones
* modify dragonBones to dragonbones
* remove useless code
* Change copyright time
2018-12-03 19:58:00 +08:00
Jare Guo
4da7c8b39c
Merge commit '19b1757cfaf25cdc441fe4c8639bb1bef039a325' into v2.1-release
2018-11-09 16:27:38 +08:00
吴智明
19b1757cfa
changer version of cocos2d-console ( #1583 )
2018-11-05 14:46:33 +08:00
leda
2b4f711fea
update-console, include apk install logic improve ( #1571 )
2018-10-30 14:59:35 +08:00
leda
71d8cf11ad
refine native module separate ( #1547 )
...
* refine module separate -> gfx renderer
* refine module separate
* modify Application.mk, add macro
* “#if USE_GFX_RENDERER” means “#if USE_GFX_RENDERER > 0”
* improve macro define in binding code
2018-10-18 09:10:05 +08:00
Jare Guo
9002aa2941
Merge commit 'd7bd6fd369b09f6146e4e7ac93894864b87fb582' into v2.0-release
2018-10-15 17:34:45 +08:00
leda
448b88cd49
update cocos2dx_files.json rules, reduce copy ( #1541 )
...
* update cocos2dx_files.json rules
* reduce files copy
2018-10-12 10:24:56 +08:00
leda
89af43e38f
switch video player bind code from "manual" to "auto" ( #1537 )
...
* refine video bind, tested on iOS
* adapt Android.mk
2018-10-10 17:22:19 +08:00
leda
c8e145dadb
Re-added WebView on iOS & Android for Creator 2.1 ( #1535 )
...
* init add webview files form creator 1.10
* refine header & namespace to compile works
* add webview auto bindings, need check manually
* update webview auto bind
* add setFrame interface to support set View Rect
* uniform file name with other ui modules
* adapt to iOS
2018-10-10 16:03:23 +08:00
leda
d7bd6fd369
update-2.0-console-to-1.10 ( #1525 )
2018-09-28 22:54:53 -07:00
leda
beb45454ad
support parse waitForConnect and debugPort from simulator/config.json ( #1521 )
...
* revert v8 debugger ip to 0.0.0.0 for simulator
* parse isWaitForConnect and debug port from config.json
* remove macro useless, since we parse the options from config.json
2018-09-26 18:57:56 -07:00
leda
a5391aaabd
add macro to support custom v8 debug option for creator ( #1518 )
...
* add macro to support custom v8 debug option for creator
* update console with version compare fixed
* revert debugger ip to 0.0.0.0 for template
2018-09-25 21:49:55 -07:00
leda
674614720e
add v8 optional on macOS ( #1515 )
...
* add v8 libs into mac project
* update xcode simulator project config
* add v8 header into template
* add SCRIPT_ENGINE_V8 optional on macOS
2018-09-26 09:21:18 +08:00
Jare Guo
bf7a01bdd5
Merge pull request #1508 from cocos-creator/v2.0-release
...
sync branch
2018-09-12 14:50:13 +08:00
leda
c74745eee4
add "getSafeAreaEdge" interface to get SafeArea edge insets ( #1502 )
...
* try to resume iPhone X support
* gen binding code
* only get SafeAreaEdge on native
* add getSafeAreaEdge for others
* update binding-generator
2018-09-10 10:14:23 +08:00
leda
4ca166e109
dispatch show/hide event to js, included "cocos simulator" ( #1500 )
...
* add dispatchEnterBackgroundEvent for simulator
* more stable when set canvas size on win32
* add isNan check for float & double
* simplify event dispatch on AppDelegate
2018-09-06 16:39:45 +08:00
Jare Guo
63d7ba61e8
bump to 2.1 and merge commit v2.0-release into develop
2018-09-06 15:33:43 +08:00
wdzhangchukong
21377fdb74
Remove names about Cocos ( #1494 )
2018-09-04 13:41:02 +08:00
Jare Guo
caee68b1ff
Merge pull request #1490 from cocos-creator/v2.0-release
...
sync branch
2018-08-30 15:09:48 +08:00
minggo
b642e0fcc7
Merge branch 'v2.0-release-rename' of github.com:cocos-creator/cocos2d-x-lite into merge-rename
2018-08-28 14:39:40 +08:00
wdzhangchukong
b44c2a68dc
Change cocos2dx_auto to jsb ( #1479 )
2018-08-24 20:26:11 +08:00
wdzhangchukong
bf27fdd955
Rename cc in JSB ( #1476 )
...
* Rename __ccgl to __gl
* Rename __CCPrivateData to __PrivateData
* Change CanvasRenderingContext2D to global
* Change CanvasRenderingContext2D to global
* Change getDeviceMotionValue into Device
* Change FileUtils to global
* Change AudioEngine to global
* Change AudioEngine into Audio
* Remove cc in c++
* Remove __jsc__
* Change auto file template
* Name jsb_cocos2d_global to auto
* Reset jsb_cocos2dx_auto
* Register jsb_cocos2dx_global_auto
2018-08-24 17:03:50 +08:00
Jare Guo
548ae4380d
Merge branch 'v2.0-release' into next
2018-08-16 14:05:09 +08:00
leda
a7f266b9e8
resume View Menu for simulator on mac & win32 ( #1456 )
...
* start add menu back
* simulator resume works
* readded scale feature, fix exit bug
* free SetupUI, and fix compile only
* adapt to CustomEvent from struct to class
* resume show/hide FPS feature
* Revert "free SetupUI, and fix compile only"
This reverts commit fd8cf5ca0a17ba62ae5dec46fefea3b58c267c9d.
* Revert "Revert "free SetupUI, and fix compile only""
This reverts commit 6e5934a583db286508d00a61a22e11a3325090f1.
* correct EXIT logic
* scale works
* show/hide fps works
* remove unneed menu, replace tab with space
* remove debug output info
* no need _isShowFPS member
* fix NSError init error
2018-08-16 09:34:47 +08:00
Jare Guo
5701671310
Merge branch 'develop' into v2.0-release
...
# Conflicts:
# README.md
# cocos/2d/CCLabelTextFormatter.cpp
# cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxEditBox.java
# cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxEditBoxHelper.java
# gulpfile.js
# package.json
# templates/js-template-binary/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
2018-08-14 10:30:57 +08:00
leda
19ab61b252
refine TODO & FIXME flag ( #1450 )
...
* change TODO to REFINE
* change REFINE:cjh to REFINE
* change FIXME to IDEA
* improve format
2018-08-10 12:52:00 +08:00
leda
86122c859a
close audio device when destruct Application ( #1442 )
...
* close audio device when destruct Application
* added android
* correct header include
* remove TODO: destroy DeviceGraphics
2018-08-08 08:55:26 +08:00
吴智明
a2468e5d16
update cocos2d-console ( #1432 )
2018-08-01 13:36:36 +08:00
leda
3bdbe8dc87
remove proj.android(-studio) files on tools/simulator ( #1420 )
...
* update external config for android libs switch to clang
* remove proj.android(-studio) files on tools/simulator
2018-07-25 11:35:50 +08:00
leda
b3b37cf457
Add AssetsManager to iOS & Mac & Android & win32 ( #1405 )
...
* Add incomplete AssetsManager to iOS & Mac
* remove Android.mk refer on Xcode project config
* re-add assetmanager for android
* re-add assetmanager for win32 project config
* remove unused macro define for win32
* remove unused marco define COCOS2D_JAVASCRIPT
* added header include for assetsManager
* Add CCAsyncTaskPool
* Fix AssetsManager event trigger issue
* update win32 project config, added CCAsyncTaskPool
* add CCAsyncTaskPool to extensions Android.mk
2018-07-23 17:50:04 +08:00
Jare Guo
bfd187d5e3
should not use config.json anymore ( #1394 )
2018-07-17 17:09:52 +08:00
leda
968678775c
remove proj.android files for creator2.0 ( #1352 )
...
* remove proj.android files
* sync cocos-console changes
2018-07-03 10:46:40 +08:00
Jare Guo
be4c60343a
fix simulator error ( #1357 )
...
* fix windows sdk version of simulator
* gulp: remove update-simulator-script
2018-07-03 09:55:52 +08:00
leda
c9d7f54668
fix build error on win32/ios when using console ( #1340 )
2018-06-28 16:37:28 +08:00
PP
7e6ca8a445
change jsb.js load path ( #1335 )
2018-06-27 15:52:50 +08:00