Commit Graph

43 Commits

Author SHA1 Message Date
mmyduckx 76d15cafa4 send close event to JS (#3527) 2021-05-21 11:37:13 +08:00
PP 7b2ef5d882 remove header cocos2d-x.h on win32 (#3259) 2021-01-28 15:02:19 +08:00
PP c2ac849d31 update config.json parsing && remove view menu for simulator (#3131)
* update config.json parsing

* remove setupUI

* synchronous change on win32 platform
2020-12-19 13:38:44 +08:00
PP d03a29fc9c support window event on native desktop platform (#3058)
* support window event on Mac

* support window event on Win32
2020-11-24 09:59:58 +08:00
PP b52654268c fix bug on simulator (#3048)
* fix simulator window size

* fix crash when simulator exit
2020-11-19 16:14:08 +08:00
PP 72ec8be7cb update gen-simulator workflow (#2971) 2020-11-05 09:46:21 +08:00
江战 b96a725238 Update tools/simulator with CMake / 3dgfx (#2496)
* update mac simulator

* remove template files

* rm build/
2020-05-29 10:44:22 +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 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 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
Jare Guo d9bd3d763c update license (#1089)
* updating license

* update license
2018-02-01 15:20:01 +08:00
2youyou2 790ae1fcf4 fixed windows project 2017-10-18 10:26:26 +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
2youyou2 40812d7000 support debug windows simulator 2017-08-15 17:54:03 +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
pandamicro 09cb88821b Fix small issues in simulator win32 project 2017-07-11 15:36:04 +08:00
pandamicro 869ee6c185 fix vs 2017 compilation issue with spidermonkey 2017-07-11 00:52:37 +08:00
pandamicro 9e65519899 Readd ide support for win32 simulator 2017-07-10 10:38:45 +08:00
pandamicro 66897d4f3f Add back ide-support and fix compilation issues 2017-07-09 10:52:37 +08:00
pandamicro 449002a431 Fix simulator win32 debug post build event 2017-07-06 11:23:59 +08:00
pandamicro 56899393c9 Fix simulator win32 post build event 2017-07-06 11:04:07 +08:00
pandamicro 794245e844 Fix win32 simulator build issue 2017-07-06 10:53:23 +08:00
pandamicro 154e3cf863 Support windows Spidermonkey v52 2017-06-30 18:02:08 +08:00
zilongshanren 3f1b33258c improve system label wrap option 2017-05-22 17:14:28 +08:00
2youyouo2 61c76e0d8b support vs 2017 2017-05-17 18:02:57 +08:00
2youyou2 fc7de34ab0 fixed windows physics compile error 2017-03-14 16:29:40 +08:00
knoxHuang 4ee224b05a add Show FPS for simulator #fireball/issues/4944 2016-12-22 15:12:27 +08:00
natural-law a240bef9bc Add dragonbones project for win32. 2016-08-30 15:21:48 +08:00
2youyouo2 47f7f34117 default support resize window in simulator desktop 2016-06-06 11:54:08 +08:00
2youyou2 5f83d4a2e3 update win32 config 2016-04-14 11:46:16 +08:00
2youyouo2 6ca97fef49 add simulator 2016-04-13 16:43:49 +08:00