Commit Graph

226 Commits

Author SHA1 Message Date
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 9765d2d039 Fix win32 simulator issue 2017-07-10 14:26:50 +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 1ad2d9f6f5 Fix git-archive-all for real 2017-07-07 16:01:47 +08:00
pandamicro 006b570479 Fix git archive all 2017-07-07 10:58:15 +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 adb33e711a Update cocos2d-console ref 2017-07-03 11:06:22 +08:00
pandamicro 65a71c1c73 Remove duplicated jsb generation in travis task 2017-07-01 17:39:47 +08:00
pandamicro 6e7e614b84 Remove chipmunk backup logic in travis scripts 2017-06-30 18:49:47 +08:00
pandamicro 154e3cf863 Support windows Spidermonkey v52 2017-06-30 18:02:08 +08:00
pandamicro cdf2b39412 Remove js_get_type_from_native usage as many as possible 2017-06-30 18:02:08 +08:00
pandamicro 32f9c7dc1f Remove debugger 2017-06-30 18:02:05 +08:00
pandamicro 0768865461 Fix non ref finalize crash during app close 2017-06-30 18:02:05 +08:00
pandamicro a9c5e50745 Remove simple audio engine 2017-06-30 18:02:05 +08:00
pandamicro 1762e86956 Fix compilation issues after rebase 2017-06-30 18:02:04 +08:00
knoxHuang 7b23aa6b92 Manual merge v1.5 jsb modification 2017-06-30 18:02:04 +08:00
pandamicro ae2de458d8 Cleanup preprocess macro and update binding generator 2017-06-30 18:02:02 +08:00
pandamicro c774cb9791 Upgrade to Spidermonkey v52. pass 9: Fix compilation warnings 2017-06-30 18:02:01 +08:00
pandamicro 27d681a1a8 Upgrade to Spidermonkey v52. pass 3: Compilation pass 2017-06-30 18:01:54 +08:00
pandamicro 9f321538cf Upgrade to Spidermonkey v52. pass 2 2017-06-30 18:01:53 +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
pandamicro 67c46cc22b Improve function wrapper 2017-05-16 15:07:21 +08:00
Wang Nan 8e7c661291 Merge pull request #628 from 2youyou2/physics
add rigidbody.getJointList
2017-05-15 18:00:15 +08:00
2youyouo2 c8918d17dd add rigidbody.getJointList 2017-05-15 17:16:13 +08:00
2youyou2 2c0465b8e1 update submodule 2017-05-11 11:04:49 +08:00
2youyou2 30af1a3736 update submodule 2017-05-10 13:57:00 +08:00
2youyou2 8a60346382 fixed bzero error 2017-05-10 13:56:23 +08:00
knoxHuang 9319dd7002 fix DeviceMotion bug for fireball/issues/5679 2017-05-08 15:32:40 +08:00
pandamicro bbec08eebb Merge pull request #612 from pandamicro/am
Enhance functionalities of AssetsManager
2017-05-04 23:32:52 +08:00
pandamicro e37196f41d Fix issues with AssetsManager new features 2017-05-04 23:32:08 +08:00
2youyouo2 166923e174 update submodule 2017-05-04 11:01:58 +08:00
2youyouo2 d7b3bc096b fixed windows commands char length too long 2017-04-27 17:31:32 +08:00
Wang Nan 875e646809 Merge pull request #604 from 2youyou2/android-studio
add simulator android-studio project
2017-04-25 15:47:03 +08:00
2youyouo2 bc068518ef add simulator android-studio project 2017-04-25 15:09:02 +08:00
Nan Wang 97ccfb6f4c update console repo, update external tag to 27 2017-04-25 10:13:06 +08:00
pandamicro eb55b59f14 Fix crash caused by some action create functions not referencing sub action 2017-04-24 12:05:36 +08:00
pandamicro 7df074e172 Reverse pure JS Action, reuse JSB Action 2017-04-22 14:57:16 +08:00
2youyouo2 c1643c4dec update submodule 2017-04-21 09:47:32 +08:00
2youyouo2 25a0b03c79 update bindings-generator 2017-04-01 17:40:40 +08:00
2youyouo2 c2dac69880 Merge branch 'develop' of github.com:cocos-creator/cocos2d-x-lite into physics
# Conflicts:
#	cocos/scripting/js-bindings/auto/api/jsb_creator_auto_api.js
2017-04-01 17:33:32 +08:00
2youyouo2 cff21d0aa1 revert changes 2017-04-01 16:32:29 +08:00