Commit Graph

18 Commits

Author SHA1 Message Date
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
leda 80e102d475 add onResize interface for application on mac & win32 (#1452)
* add resize interface for application

* add dispatchResizeEvent interface

* improve function name, add comments

* add onResize for win32

* directly supply size info when dispatch resize event
2018-08-13 14:30:56 +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 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
minggo 467b0346ce editbox support mac (#1322) 2018-06-21 09:25:56 +08:00
James Chen d54f1943b8 Keyboard Event works. (#1267)
* Keyboard Event works.

* Adds todo.

* temp commit for keyboard event.

* Keyboard event handle all keys.
2018-05-28 18:53:57 +08:00
James Chen 5f4e814ade Supports mouse event for desktop platforms. (#1256) 2018-05-22 14:03:54 +08:00
minggo 8a76997242 adapt mac resolution (#1248) 2018-05-18 11:57:12 +08:00
minggo 4a13d0e15e Downsample (#1245)
* support render texture

* use texture unit 0

* add functions to set device pixel ratio

* add ccDeleteBuffers again

* fix according comments
2018-05-17 14:05:05 +08:00
James Chen 26e8259389 Merge branch 'new-renderer' of git://github.com/cocos-creator/cocos2d-x-lite into new-renderer 2018-03-12 15:34:45 +08:00
minggo c4c24c9d54 windows works with new renderer (#1137) 2018-03-07 14:31:46 +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 8fe4aabe20 don't invoke tick now. 2018-03-01 17:20:16 +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
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
minggo fee7afc74a mac main loop work (#1112)
* mac main loop work

* fix some issue
2018-02-11 14:25:14 +08:00