minggo
cac05fefd1
Merge pull request #16241 from mogemimi/avoid-casting-overhead
...
Avoid overhead of casting between float and double
2016-07-28 10:04:34 +08:00
CocosRobot
9096e19ec7
[AUTO][ci skip]: updating cocos2dx_files.json
2016-07-28 01:59:39 +00:00
Vladimir Perminov
09aa7d9cf4
Win32 move unicode utils global. ( #16234 )
...
* Win32 move unicode utils global.
It need for easy converting utf-8 string in all code.
And use it api in user code also WinRT version.
* Move to CCUtils-win32
Also in WinRT version.
* Copyright
2016-07-28 09:57:29 +08:00
minggo
b8f530afd0
Merge pull request #16240 from CocosRobot/update_lua_bindings_1469651785
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-28 08:24:00 +08:00
mogemimi
bf35e0f6b5
Avoid overhead of casting between float and double
2016-07-28 06:49:41 +09:00
CocosRobot
6b3454e9c6
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-27 20:38:57 +00:00
Ricardo Quesada
47e6b0cf3d
Merge pull request #16237 from ricardoquesada/issue_16220
...
Compile on macOS 10.10 and lower
2016-07-27 13:30:59 -07:00
Ricardo Quesada
1e1fad8b04
Merge pull request #16232 from perminovVS/gl-program-link-status
...
GLProgram::link always check link status
2016-07-27 10:48:02 -07:00
Vladimir Perminov
5498bdb32b
Add ricardoquesada info
2016-07-27 18:48:10 +03:00
Ricardo Quesada
9dcc1f8193
Compile on macOS 10.10 and lower
2016-07-27 07:44:00 -07:00
Vladimir Perminov
3734668d17
GLProgram::link always check link status
...
Fix issues #16231
2016-07-27 15:31:32 +03:00
halx99
3a14388087
#improve node sort performance by std::sort + long long (_localZOrder) ( #16126 )
...
* #improve node sort performance by std::sort + unsigned long long (_localZOrder)
* Use bit field for make _localZOrder storage more clearly.
* #Comment _localZOrder members for meaningful.
* fix issues
* #use explicit bits integer of localZOrder storage
* #Fix compile error, add include <cstdint> to CCNode.h
* use the optimization for 64bit and no optimization solution for 32bit
2016-07-27 16:58:51 +08:00
minggo
b74900fe70
fix js template
2016-07-27 16:57:03 +08:00
minggo
30118aff6b
Merge pull request #16226 from dumganhar/fix/iss16192-smallaudio-crash
...
fixed #16192 : Crash while decoding small MP3 file on Android.
2016-07-27 15:39:57 +08:00
minggo
e6b42d486b
Merge pull request #16218 from cezheng/fix/etc_premultiplied_alpha_value
...
fix CCImage premultipliedAlpha for ETC format
2016-07-27 15:38:48 +08:00
yanli.huang
3e33b7a1ca
update cocos2d-console commit ( #16222 )
...
* update cocos2d-console commit
* update cocos2d-console commit:
fix: Interrupt to compile when cocos package prompted user to update
2016-07-27 15:37:12 +08:00
minggo
1a1241c3fc
Merge pull request #16221 from Microsoft/winrt-v3.13
...
WinRT: update libcocos2d version to v3.13
2016-07-27 15:36:43 +08:00
minggo
a0d099f87a
Merge pull request #16219 from halx99/patch-1
...
Update AUTHORS
2016-07-27 15:36:21 +08:00
James Chen
6efcf87b93
fixed #14148 : Got an error while pressing home button at launch, after resuming from background, SimpileAudioEngine::playEffect will not be mute.
...
The error is: ERROR: [0x19e5fa000] >aurioc> 807: failed: '!pla' (enable 2, outf< 2 ch, 44100 Hz, Float32, non-inter> inf< 2 ch, 0 Hz, Float32, non-inter>)
2016-07-27 15:33:02 +08:00
Ricardo Quesada
4e278183ad
Merge pull request #16122 from ricardoquesada/issue_16100
...
testcase: add test case for issue #16100
2016-07-26 23:21:25 -07:00
James Chen
8eb30769a1
Adds test case.
2016-07-27 14:00:34 +08:00
James Chen
bd1d630f93
fixed #16192 : Crash while decoding small MP3 file on Android.
2016-07-27 13:54:39 +08:00
minggo
ad25873821
Merge pull request #16223 from minggo/template-compiling-issue
...
[ci skip]explicitly set app-abi to armeabi
2016-07-27 10:11:17 +08:00
minggo
67ec4521e5
explicitly set app-abi to armeabi
2016-07-27 10:10:09 +08:00
Ricardo Quesada
b336aa3219
testcase: add test case for issue #16100
...
delays camera creation
fix issue #16100
2016-07-26 19:03:54 -07:00
Dale Stammen
d5809129c4
update libcocos2d version to v3.13
2016-07-26 12:34:36 -07:00
halx99
00f0f72bef
Update AUTHORS
2016-07-26 21:55:06 +08:00
Ce Zheng
9903d31031
fix CCImage premultipliedAlpha for ETC format
...
translucent part of ETC format textures are rendered too bright due to
the fact that v3.12 sets PremultipliedAlpha to true by default. This
commit sets default value of _hasPremultipliedAlpha = false, deletes
unnecessary `_hasPremultipliedAlpha = false` code in multiple places,
making ETC format's _hasPremultipliedAlpha false while keeping other
formats unchanged.
2016-07-26 19:17:10 +09:00
minggo
6109ca6e4b
Merge pull request #16216 from mogemimi/remove-unnecessary-extern
...
Remove unnecessary 'extern' to prevent compiler warnings
2016-07-26 15:19:11 +08:00
minggo
6fb4410232
Merge pull request #16213 from CocosRobot/update_lua_bindings_1469498667
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-26 15:12:48 +08:00
mogemimi
0894662eff
Remove unnecessary 'extern' to prevent compiler warnings
2016-07-26 12:42:43 +09:00
CocosRobot
9566a0cb24
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-26 02:06:58 +00:00
minggo
e1204c6138
Merge pull request #16210 from dumganhar/fix/std-bind
...
Remove unneeded std::bind, and use const & for input parameters.
2016-07-26 09:58:01 +08:00
minggo
afc054ea2d
Merge pull request #16211 from mogemimi/fix-variable-name
...
Fix typos in variable names
2016-07-26 09:57:12 +08:00
mogemimi
093ef3a14f
Fix typos in variable names
2016-07-26 04:06:01 +09:00
James Chen
bf80f10dfd
Remove unneeded std::bind, and use const & for input parameters.
2016-07-26 00:55:32 +08:00
minggo
662a1636c3
replace __system_property_get ( #16205 )
...
* replace __system_property_get
* fix comment
2016-07-25 18:30:47 +08:00
minggo
8693db38ac
Merge pull request #16209 from CocosRobot/update_lua_bindings_1469439400
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-25 18:30:22 +08:00
minggo
23d9b9b9d4
Merge pull request #16206 from CocosRobot/update_cocosfiles_1469439224
...
[AUTO][ci skip]: updating cocos2dx_files.json
2016-07-25 18:29:56 +08:00
CocosRobot
e0abb981d5
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2016-07-25 09:39:34 +00:00
CocosRobot
588ac1c70d
[AUTO][ci skip]: updating cocos2dx_files.json
2016-07-25 09:33:45 +00:00
minggo
acddbf1284
Merge pull request #16202 from natural-law/v3
...
Update the submodule cocos2d-console.
2016-07-25 17:32:58 +08:00
minggo
aa4e82c475
Merge pull request #16204 from CocosRobot/update_cocosfiles_1469433601
...
[AUTO][ci skip]: updating cocos2dx_files.json
2016-07-25 17:32:36 +08:00
halx99
bf996c5bac
Add ETC1 builtin alpha support. ( #16118 )
...
* Add ETC1 builtin alpha support.
* Rename setETC1AlphaFileEndix to setETC1AlphaFileSuffix
* Check whether etc1 alpha suffix is empty
* fix Code ident & Add etc1 alpha test case to SpriteTest.
* Remove unused ETC1AA shader programs
* Fix all review issues and endl issues
* Add a new TriangleCommand::init() with Texture2D* instead of GLuint textureID
* #fix issues
2016-07-25 17:31:54 +08:00
CocosRobot
dfda0e9e67
[AUTO][ci skip]: updating cocos2dx_files.json
2016-07-25 08:00:03 +00:00
minggo
8c537ed209
add issue tempalte
2016-07-25 15:58:04 +08:00
minggo
cc14a06800
Issue 14206 ( #16201 )
...
* don't trigger applicationWillEnterForeground at first time to be the same as iOS
* rename first to firstTime
2016-07-25 14:25:48 +08:00
zhangbin
361a94e920
Update the submodule cocos2d-console.
...
Solve the crash problem of cocos console on some Mac machines. Related issue: #16138
2016-07-25 11:38:03 +08:00
yanli.huang
5b3eae7be8
update cocos2d-console commit ( #16196 )
2016-07-25 11:19:11 +08:00
minggo
7fed88038b
Merge pull request #16200 from mogemimi/fix-logging-typos
...
Fix typos in log messages
2016-07-25 10:32:06 +08:00