Commit Graph

36 Commits

Author SHA1 Message Date
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 99206af737 Remove useless module and preprocess macros 2017-07-04 16:35:17 +08:00
pandamicro 2b08a2e352 Fix compilation issues of mac simulator 2017-07-03 15:34:17 +08:00
pandamicro 154e3cf863 Support windows Spidermonkey v52 2017-06-30 18:02:08 +08:00
pandamicro 32f9c7dc1f Remove debugger 2017-06-30 18:02:05 +08:00
2youyouo2 6de5145845 change simulator Xcode product out dir 2017-06-19 16:10:29 +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
2youyouo2 d7b3bc096b fixed windows commands char length too long 2017-04-27 17:31:32 +08:00
2youyouo2 bc068518ef add simulator android-studio project 2017-04-25 15:09:02 +08:00
2youyou2 fc7de34ab0 fixed windows physics compile error 2017-03-14 16:29:40 +08:00
zilongshanren c3896621c8 add show FPS on mac simulator 2016-12-22 16:12:56 +08:00
knoxHuang 4ee224b05a add Show FPS for simulator #fireball/issues/4944 2016-12-22 15:12:27 +08:00
Nan Wang 9ff81c656b fix CocosDenshion namespace compile error 2016-12-01 09:58:33 +08:00
James Chen 5996fe0866 Don’t invoke simple audio engine stuff in AppDelegate. And send missing game_on_hide & game_on_show event for Appdelegate in Simulator. 2016-11-28 11:51:37 +08:00
zhangbin 119fec9efe Merge branch 'develop' into dragonbones
# Conflicts:
#	external/config.json
2016-09-13 16:29:59 +08:00
pandamicro f581b673eb Fix Android compilation issues for simulator 2016-09-08 15:40:01 +08:00
zhangbin ed591faa19 Merge branch 'develop' into dragonbones
# Conflicts:
#	build/cocos2d_libs.xcodeproj/project.pbxproj
#	external/config.json
2016-09-08 09:52:09 +08:00
pandamicro 651551055a Fix mac simulator 2016-09-02 10:57:21 +08:00
natural-law a240bef9bc Add dragonbones project for win32. 2016-08-30 15:21:48 +08:00
zhangbin b397ac686e Solve the errors in simulator project. 2016-07-12 14:00:09 +08:00
2youyouo2 ea3f6634e0 fixed simulator http request 2016-06-24 17:52:33 +08:00
2youyouo2 47f7f34117 default support resize window in simulator desktop 2016-06-06 11:54:08 +08:00
Nan Wang b47e5bf5ea add prebult mk to output 2016-05-12 17:59:42 +08:00
2youyouo2 fd876c82f9 fixed mac simulator 2016-04-15 10:36:44 +08:00
2youyou2 4cabfc4e45 update win32 project 2016-04-14 18:56:00 +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