mogemimi
|
7b61aca64e
|
Fix indentation and remove trailing whitespaces
|
2016-05-19 03:42:34 +09:00 |
mogemimi
|
3a80e7d8fb
|
Change 2 spaces to 4 spaces indentation
|
2016-05-19 03:34:04 +09:00 |
mogemimi
|
03be0de2fa
|
Remove unnecessary trailing semicolons
|
2016-05-19 01:40:00 +09:00 |
zilongshanren
|
4f5b140c15
|
Merge pull request #15673 from fusijie/add_comments_for_ps
add comments for ps.
|
2016-05-18 22:33:21 +08:00 |
fusijie
|
36113f507e
|
add comments for ps.
|
2016-05-18 22:25:43 +08:00 |
zilongshanren
|
9223d1d917
|
Merge pull request #15668 from zilongshanren/fix-issue-of-tizen
fix tizen related issues
|
2016-05-18 17:20:19 +08:00 |
minggo
|
a68ff0c856
|
Merge pull request #15671 from minggo/remove-build_native_sh
[ci skip]remove unneeded files
|
2016-05-18 16:46:10 +08:00 |
minggo
|
ecf181036a
|
remove unneeded files
|
2016-05-18 16:44:06 +08:00 |
zilongshanren
|
c4e6db4e9b
|
fix tizen related issues
|
2016-05-18 16:26:13 +08:00 |
minggo
|
25fea656c7
|
update deps to support IPv6 only network
|
2016-05-18 15:45:46 +08:00 |
pandamicro
|
a03c45ce62
|
Update network licenses and reformat
|
2016-05-18 14:29:54 +08:00 |
minggo
|
c6034787e4
|
Merge pull request #15664 from mogemimi/replace-ccassert-macro
Replace CCAssert macros with CCASSERT
|
2016-05-18 11:57:18 +08:00 |
minggo
|
a54251b854
|
Merge pull request #15659 from mogemimi/use-const-reference
Use const references whenever possible
|
2016-05-18 11:55:55 +08:00 |
minggo
|
fc16a9bae9
|
Merge pull request #15662 from natural-law/v3
Update the reference of submodule cocos2d-console.
|
2016-05-18 11:55:04 +08:00 |
mogemimi
|
320ec027f7
|
Replace CCAssert macros with CCASSERT
|
2016-05-18 01:49:35 +09:00 |
zhangbin
|
d6ffb27a7a
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
|
2016-05-17 17:43:13 +08:00 |
zhangbin
|
2d00073653
|
Update the reference of submodule cocos2d-console.
|
2016-05-17 17:25:31 +08:00 |
minggo
|
50acf4c94b
|
Merge pull request #15660 from minggo/assetsmanager-test-issue
[ci skip]make AssetsManagerExTest can connect to the url
|
2016-05-17 17:15:45 +08:00 |
minggo
|
8c9138601c
|
make AssetsManagerExTest can connect to the url
|
2016-05-17 16:41:07 +08:00 |
minggo
|
3e396fedab
|
Merge pull request #15617 from pandamicro/v3
Some modifications merged from Creator
|
2016-05-17 13:43:41 +08:00 |
mogemimi
|
948f64631f
|
Use const references whenever possible
|
2016-05-17 13:17:56 +09:00 |
pandamicro
|
c96bd9a4df
|
Resolve local reference leak and function order
|
2016-05-17 12:06:28 +08:00 |
minggo
|
d7d52c1996
|
Merge pull request #15638 from MSOpenTech/v3-winrt-fix
V3: Winrt added updated .filters file for Windows 8.1 Universal cpp-tests project
|
2016-05-17 10:39:44 +08:00 |
minggo
|
f94a742c34
|
Merge pull request #15639 from Zropein/v3
Fixed APP_NAME for cpp, cpp-empty, js, and lua tests.
|
2016-05-17 10:32:47 +08:00 |
minggo
|
601460682e
|
Merge pull request #15641 from mogemimi/add-missing-references
Add missing references to avoid unnecessary copies
|
2016-05-17 10:28:08 +08:00 |
minggo
|
abe020e808
|
Merge pull request #15654 from minggo/ipv6-compatibility
Ipv6 compatibility
|
2016-05-17 09:25:14 +08:00 |
mogemimi
|
a1a8feed71
|
Add missing references to avoid unnecessary copies
|
2016-05-17 01:15:07 +09:00 |
zilongshanren
|
9203630583
|
Merge pull request #15651 from zilongshanren/fixNativeCotnrolIssuesV2
fix UI native control onEnter issue
|
2016-05-16 16:58:32 +08:00 |
zilongshanren
|
3ae5b1075b
|
fix native control onEnter issue
|
2016-05-16 16:14:16 +08:00 |
minggo
|
e5f1090dc1
|
Merge pull request #15633 from mogemimi/fix-msvc-warning-c4800
Suppress MSVC warning C4800
|
2016-05-16 15:46:30 +08:00 |
minggo
|
88db5d3660
|
use AF_UNSPEC to support ipv6
|
2016-05-16 15:15:29 +08:00 |
minggo
|
2b480a75bf
|
use AF_UNSPEC to support ipv6
|
2016-05-16 14:45:09 +08:00 |
minggo
|
251ee4e85a
|
Add web engine feature in release note (#15648)
|
2016-05-16 14:01:55 +08:00 |
Ryan Davis
|
8ca09f7c2a
|
Fix crash due to reallocation of shared indices memory
|
2016-05-15 12:30:30 +10:00 |
Xpol Wan
|
a7d9dd9a75
|
Print as Lua 5.1 does and remove duplicate code.
|
2016-05-14 14:09:58 +08:00 |
Wilson E. Alvarez
|
f0343bf219
|
Fixed APP_NAME for cpp, cpp-empty, js, and lua tests.
|
2016-05-13 22:13:05 -04:00 |
Dale Stammen
|
cad762a4f9
|
added updated .filters file
|
2016-05-13 07:33:51 -07:00 |
mogemimi
|
16878a53b1
|
Suppress MSVC warning C4800
|
2016-05-13 11:44:17 +09:00 |
minggo
|
0403541693
|
Merge pull request #15625 from minggo/merge-v311-back-to-v3
Merge v311 back to v3
|
2016-05-12 16:58:06 +08:00 |
minggo
|
794759f76d
|
Merge pull request #15626 from pandamicro/v3.11
[ci skip] Add web engine feature in release note
|
2016-05-12 11:02:00 +08:00 |
pandamicro
|
1c1fc53255
|
Add web engine feature in release note
|
2016-05-12 10:56:51 +08:00 |
minggo
|
74af3b5232
|
merge v3.11 back to v3
|
2016-05-12 09:50:03 +08:00 |
ViusualSJ
|
ada1d1dfe8
|
audio search path (android)
|
2016-05-11 17:24:14 +08:00 |
pandamicro
|
6b59dc24c7
|
Add Image::setPNGPremultipliedAlphaEnabled
|
2016-05-11 16:36:21 +08:00 |
minggo
|
ae7c91c1b8
|
update changelog
|
2016-05-11 16:12:18 +08:00 |
minggo
|
072424e296
|
update changelog
|
2016-05-11 16:10:58 +08:00 |
minggo
|
93e4de1d39
|
Merge pull request #15611 from minggo/disable-memory-model
disable new JSB memory model by default
|
2016-05-11 15:36:27 +08:00 |
minggo
|
ac3e6428bb
|
Merge pull request #15612 from MSOpenTech/v3-winrt-fix
V3: Win10 UWP removed missing files from project
|
2016-05-11 15:05:25 +08:00 |
minggo
|
aef85fe05e
|
Merge pull request #15615 from minggo/update-release-note
[ci skip]update release note
|
2016-05-11 15:02:02 +08:00 |
minggo
|
1c77d8fd5c
|
update release note
|
2016-05-11 14:59:15 +08:00 |