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
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
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
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
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
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
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
113ef05feb
fix win32 simulator compile/link error, no fix when running ( #1326 )
...
* update simulator win
* add libcocos2d depend for simulator
* compile and link success
* update simulator win, add part window control
2018-06-22 17:26:53 +08:00
leda
723f52a472
win32 link/default template compile and link pass, but not works when run ( #1321 )
...
* modify file changes on project config
* correct libcocos2d compile
* add win32 props back
* Revert "fix windows link template (#1138 )"
This reverts commit 332d95e5b8 .
* correct compile error
* many link errors need to be solved
* added part lack methods
* add empty impl for canvas rendering context 2d
* update main.cpp
* correct audio/network compile and link error
* sync win32 application logic with mac
* remove wrong change on application-win32
* correct win32 default-template compile and link error
* win32 simulator part compile error fixed
* editbox define changes
2018-06-22 10:19:31 +08:00
leda
19552e0dd4
gen-simulator works on mac, but not full features ( #1313 )
...
* fix part of warnings
* avoid all compile errors
* remove part lua related
* remove useless comment
* add function to get glfwWindow
* improve comment
* correct group files at platform folder
* update gulp simulator script copy
2018-06-14 14:23:16 +08:00
Jare Guo
58f7ea35c4
Merge v1.8 into develop
2018-04-04 17:09:49 +08:00
Jare Guo
fe87896bb3
fix simulator link error ( #1162 )
2018-03-23 16:03:38 +08:00
James Chen
3e5f8dd0f2
API Level is minSDKVersion now.
2018-02-05 11:18:13 +08:00
James Chen
52154d5f04
Best gradle configuration for Android.
2018-02-05 11:09:29 +08:00
Jare Guo
d9bd3d763c
update license ( #1089 )
...
* updating license
* update license
2018-02-01 15:20:01 +08:00
James Chen
901f4fa50c
Auto hide home indicator for iPhoneX. ( #1013 )
2017-11-28 13:36:14 +08:00
James Chen
cdad6b5868
Some Android Simulators don't support SSE instruction, so disable it for x86 arch. ( #1011 )
2017-11-23 15:13:34 +08:00
James Chen
7739e2c47d
Updates template AndroidManifest.xml.
2017-11-07 16:05:44 +08:00
James Chen
2a229fd195
Updates simulator configruation for android.
2017-11-06 15:15:51 +08:00
2youyou2
5a8b02df27
Merge branch 'native-modules' of github.com:2youyouo2/cocos2d-x-lite into native-modules
2017-10-18 10:27:37 +08:00
2youyou2
790ae1fcf4
fixed windows project
2017-10-18 10:26:26 +08:00
yinkaile
5ee73c6864
fixed simulator project
2017-10-17 12:08:37 +08:00
James Chen
632448d64b
Removes COCOS2D_DEBUG definition in release mode. Adds APP_CFLAGS.
...
RuntimeJsImpl doesn't depend on COCOS_DEBUG macro.
Warning fix in bzero.
2017-10-11 14:11:41 +08:00
James Chen
e1ac3249a2
jsb_enable_debugger() uses local IP "0, 0, 0, 0", then Android debugging doesn't need to change IP.
2017-10-11 12:30:08 +08:00
James Chen
0548edd7f4
Adds Simulator.entilements for mac simulator project.
2017-10-10 16:44:14 +08:00
James Chen
f3ea953638
compilation error fix for simulator.
2017-10-10 15:14:19 +08:00
James Chen
b4d7eda372
Updates simulator.
2017-10-10 14:55:20 +08:00
James Chen
1fe5cee080
Updates win32 simlator project to link libuv.
2017-10-10 14:37:55 +08:00
James Chen
3c74a04612
Fix compilation error while enabling libuv. Updates win32 template to remove include path of spidermonkey.
2017-10-09 17:29:13 +08:00
James Chen
b4b07dbf99
Duplicated which will cause simulator compilation failed in release mode. ( #833 )
...
* Duplicated which will cause simulator compilation failed in release mode.
It comes from https://github.com/cocos-creator/cocos2d-x-lite/pull/700
* Simulator project fix for android.
* Updates cocos2d-console.
2017-09-20 22:08:42 -05:00
James Chen
b3018f029d
update win32 simulator project configuration. ( #831 )
2017-09-20 05:07:03 -05:00
James Chen
f19fb0b1f8
[android] Fixes AppAcitivity (Sub class of Cocos2dxActivity) is re-created which causes crash if launching app first time and re-opening from icon.
2017-09-15 10:41:32 +08:00
James Chen
4889a7f358
updates simulator project configuration.
2017-08-29 18:01:53 +08:00
James Chen
9f16c51b4e
Simulator works for jsb2.0
2017-08-29 18:00:07 +08:00
pandamicro
d96dd13300
Merge pull request #769 from pandamicro/v1.6
...
Fix issue with ScriptingCore::getFileScript modif
2017-08-21 11:20:39 +08:00
pandamicro
935b7a94db
Fix issue with ScriptingCore::getFileScript modif
2017-08-21 11:10:39 +08:00
2youyou2
40812d7000
support debug windows simulator
2017-08-15 17:54:03 +08:00
pandamicro
b39dba1c63
Fix simulator restart crash issue
2017-08-02 18:14:29 +08:00
2youyouo2
a2d0955bed
should use v140 for 15.0 VisualStudioVersion
2017-07-26 16:08:01 +08:00
pandamicro
9234bdf0bc
Merge pull request #704 from pandamicro/develop
...
Small fixes
2017-07-11 15:36:37 +08:00