Commit Graph

4804 Commits

Author SHA1 Message Date
zilongshanren 89d5f99d46 fix richtext custom font issue 2016-12-12 17:07:39 +08:00
Wang Nan 2bfff1359a Merge pull request #438 from cocos-creator/v1.3
merge V1.3
2016-12-12 10:18:20 +08:00
James Chen 21d032b62d iOS project configuration fix.
AudioDecoder.mm was added to macOS, but it’s missing on iOS, therefore, a linking error will be triggered.
2016-12-12 10:04:38 +08:00
Wang Nan cfb2f1b1b9 Merge pull request #436 from cocos-creator/v1.3
merge V1.3
2016-12-09 18:27:32 +08:00
Wang Nan 4e44ec12b3 Merge pull request #435 from knoxHuang/v1.3
add const for getListeners
2016-12-09 14:51:54 +08:00
knoxHuang 0de43f6ba6 add const for getListeners 2016-12-09 14:50:28 +08:00
CocosRobot d0363349ed [ci skip][AUTO]: updating jsbinding automatically 2016-12-09 06:14:17 +00:00
Wang Nan 821e45c3cb Merge pull request #432 from cocos-creator/v1.3
merge V1.3
2016-12-09 14:08:38 +08:00
CocosRobot 46d146d388 [ci skip][AUTO]: updating jsbinding automatically 2016-12-09 06:06:13 +00:00
Nan Wang 061d8d81fd Merge branch 'v1.3' of github.com:cocos-creator/cocos2d-x-lite into v1.3 2016-12-09 13:59:37 +08:00
Nan Wang 3b50b32187 update bindings generator 2016-12-09 13:59:21 +08:00
Wang Nan 9d9822f4b0 Merge pull request #430 from CocosRobot/update_js_bindings_1481248202
[ci skip][AUTO]: updating jsbinding automatically
2016-12-09 10:55:00 +08:00
CocosRobot 4ab7572d5f [ci skip][AUTO]: updating jsbinding automatically 2016-12-09 01:53:33 +00:00
CocosRobot d6b5521e5a [ci skip][AUTO]: updating jsbinding automatically 2016-12-09 01:52:06 +00:00
Wang Nan 3bcfa13098 Merge pull request #429 from cocos-creator/v1.3
merge V1.3
2016-12-09 09:47:34 +08:00
Wang Nan c45af4dbca Merge pull request #427 from CocosRobot/update_cocosfiles_1481014635
[AUTO][ci skip]: updating cocos2dx_files.json
2016-12-09 09:45:49 +08:00
Wang Nan 65b6f86f9f Merge pull request #425 from knoxHuang/v1.3
add hasEventListener for CCEventDispatcher
2016-12-09 09:45:39 +08:00
knoxHuang 86817f5d51 add hasEventListener for CCEventDispatcher 2016-12-07 13:48:36 +08:00
CocosRobot a180aa28d0 [AUTO][ci skip]: updating cocos2dx_files.json 2016-12-06 08:57:16 +00:00
Wang Nan 17e4d99f26 Merge pull request #424 from hylthink/develop
Upgrade AnySDK2.2.5
2016-12-06 16:51:26 +08:00
Wang Nan 4499b5fd5c Merge pull request #426 from natural-law/issue4863
Output more information of jscompile command as default.
2016-12-06 16:50:13 +08:00
zhangbin 63d39f4d14 Output more information of jscompile command as default. 2016-12-06 16:26:32 +08:00
yanli.huang b467f5294a Upgrade AnySDK jar file 2016-12-05 15:09:11 +08:00
yanli.huang 8fec3b277b update external/config.json,version is v3-deps-18 2016-12-05 14:58:40 +08:00
James Chen f33abbaa74 Updates license years and deletes tailing white spaces. 2016-12-02 10:22:49 +08:00
James Chen 51a5cda2b7 Sync Pull Request https://github.com/cocos2d/cocos2d-x/pull/16946 2016-12-02 10:06:22 +08:00
Nan Wang 384cfa8b6b fix CocosDenshion namespace compile error 2016-12-01 13:45:51 +08:00
Nan Wang 9ff81c656b fix CocosDenshion namespace compile error 2016-12-01 09:58:33 +08:00
Wang Nan 6a85ff24a1 Merge pull request #420 from cocos-creator/v1.3
merge V1.3
2016-11-29 10:10:54 +08:00
Wang Nan 0da97d57cd Merge pull request #415 from dumganhar/fix/remove-simple-audio-invocation
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-29 10:08:00 +08:00
Wang Nan a2b0928073 Merge pull request #418 from jareguo/v1.3
bind new language codes
2016-11-28 16:32:31 +08:00
Jare Guo 341a2973c4 bind new language codes 2016-11-28 16:18:02 +08:00
knoxHuang 4226ad9416 should check validation of _stencil 2016-11-28 15:57:28 +08:00
zhangbin 8ae2cda989 Support using specified python by environment 'COCOS_PYTHON_HOME'. 2016-11-28 15:52:30 +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
James Chen bd757e6232 Updates lite audio engine sources from upstream (cocos2d-x). 2016-11-25 15:27:42 +08:00
Wang Nan 8eda1dcfc8 Merge pull request #411 from zilongshanren/improve-jsb-label-content-size
fix label size in EditBox
2016-11-25 14:49:13 +08:00
Wang Nan 2eed6d93c0 Merge pull request #412 from zilongshanren/improve-jsb-label-content-size
fix label size in EditBox
2016-11-25 14:49:02 +08:00
zilongshanren dde96c63df fix label size 2016-11-25 14:33:26 +08:00
Wang Nan c98eb67f19 Merge pull request #410 from cocos-creator/v1.3
merge V1.3
2016-11-25 11:32:55 +08:00
knoxHuang 346d6505f5 reset stencil program when alpha threshold is set to 1 2016-11-24 17:41:52 +08:00
Wang Nan b9b08608c6 Merge pull request #408 from zilongshanren/improve-jsb-label-content-size
make jsb label content size compatiable with web
2016-11-23 15:20:54 +08:00
zilongshanren 238de22b34 make jsb label content size compatiable with web 2016-11-23 14:49:50 +08:00
zhangbin 9ccb58a3f2 Add binding field DragonBonesData::name. 2016-11-22 10:27:25 +08:00
Wang Nan f529515f72 Merge pull request #406 from pandamicro/v1.3
Fix function wrapper using js object during its gc
2016-11-21 09:14:25 +08:00
pandamicro 8de8748595 Fix function wrapper using js object during its gc 2016-11-17 18:32:37 +08:00
Wang Nan 9054b40b32 Merge pull request #405 from cocos-creator/v1.3
merge V1.3
2016-11-17 10:11:49 +08:00
zhangbin 0dc977649f Update submodule cocos2d-console.
Changes: Add option '--ap' for command gen-libs.
2016-11-16 14:17:46 +08:00
CocosRobot 18a9a3c6eb [ci skip][AUTO]: updating jsbinding automatically 2016-11-16 03:47:03 +00:00
CocosRobot c08d684b86 [ci skip][AUTO]: updating jsbinding automatically 2016-11-16 03:43:36 +00:00