XiaoFeng
036585ef95
Fix ActionManagerEx some times crash when reload action frames.
2015-10-26 10:38:17 +08:00
CocosRobot
5760e43387
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-10-26 01:45:38 +00:00
Michael Kösel
561b15e260
Fix memory leak in Enhance-API
2015-10-24 14:26:59 +02:00
mogemimi
9df30d2454
Fix typos in documentation
2015-10-23 16:59:51 +09:00
pandamicro
ade1d0ef8d
Merge pull request #14214 from pandamicro/spriteframecache
...
Fixed memory leak in CCSpriteFrameCacheHelper
2015-10-23 09:29:37 +08:00
fuyifan
5065a542f7
fix the issue #14113
2015-10-23 00:00:18 +08:00
pandamicro
530321fe70
#14124 Improved JSCallbackWrapper with generational GC and fix the issue
2015-10-22 17:00:57 +08:00
pandamicro
175f4c02ad
Merge pull request #14197 from xiaofeng11/v3_xf
...
Fix CCDownloader-curl will crash in js-test & Fix broken image link in TextureCacheTest.js
2015-10-22 14:45:20 +08:00
pandamicro
0a6360eee0
Merge pull request #14196 from geron-cn/v3
...
AnchorPointFrame animation performance diffrent
2015-10-22 14:37:26 +08:00
XiaoFeng
6beb982665
Adjust code execute order, used a simple and safe way to avoid access fail bug.
2015-10-22 14:36:26 +08:00
pandamicro
65fafef044
Merge pull request #14209 from pandamicro/v3
...
Disable bitcode for all targets
2015-10-22 12:55:25 +08:00
pandamicro
4633a93631
Disable bitcode for all targets
2015-10-22 12:18:51 +08:00
pandamicro
05b277752c
Merge pull request #14105 from WenhaiLin/v3.9-rc
...
ParticleSystemQuad:Fixed incorrectly generate errors "Particle system not enough memory"
2015-10-22 10:36:02 +08:00
pandamicro
a7e5946b7d
Merge pull request #14154 from Dimon4eg/fix-crash-in-web-view-on-android
...
Fix crash in web view on android
2015-10-22 10:35:00 +08:00
pandamicro
f98d0cc115
Merge pull request #14166 from webcrawler/my_fix_branch
...
remove duplicate include
2015-10-22 10:33:05 +08:00
pandamicro
6925e423e3
Merge pull request #14204 from mogemimi/fix-naming-typos
...
Fix naming typos
2015-10-22 10:25:07 +08:00
pandamicro
f2898ecf30
Merge pull request #14207 from super626/terrain
...
fix shader on pc
2015-10-22 10:10:10 +08:00
yangxiao
cca25f5b5c
fix shader on pc
2015-10-22 09:29:12 +08:00
pandamicro
d3664b9616
#14128 Fix cc.loader.getRes crash caused by null type
2015-10-22 01:16:56 +08:00
pandamicro
43c19fd1e7
Merge pull request #14205 from pandamicro/v3
...
Fix Scheduler API inconsistency
2015-10-21 22:11:16 +08:00
pandamicro
9eeda122e9
Fix Scheduler API inconsistency
2015-10-21 22:10:48 +08:00
dimon4eg
27d5ad920e
Update comment
2015-10-21 16:55:45 +03:00
dimon4eg
7e43e28ca2
Fix crash in java code only
2015-10-21 16:55:25 +03:00
dimon4eg
82bcbb0325
Revert: Fix crash in web view on android
2015-10-21 16:54:41 +03:00
pandamicro
558ac3cfa0
Made CC_CONSTRUCTOR_ACCESS public only when script binding is enabled
2015-10-21 16:05:31 +08:00
mogemimi
4012dd8455
Fix naming typos
2015-10-21 15:56:47 +09:00
pandamicro
d8baf75748
Merge pull request #14195 from liamcindy/v3.9_light
...
fix light3D reader error
2015-10-21 13:45:37 +08:00
Dale Stammen
d8e10981db
added check to see if app is already visible
2015-10-20 10:38:42 -07:00
Dimon4eg
6581954b5b
Merge pull request #1 from Dimon4eg/v3
...
merge
2015-10-20 12:48:16 +03:00
pandamicro
7466c4c71e
Merge pull request #14194 from super626/v3
...
check light enable or not when switching shader
2015-10-20 17:09:37 +08:00
XiaoFeng
428db9c458
update js binding version info
2015-10-20 17:04:31 +08:00
XiaoFeng
18b7b533ce
Update 3.9 beta0 change log & version info
2015-10-20 16:46:31 +08:00
XiaoFeng
7e54a91ee6
Fix CCDownloader-curl will crash in js-test
...
Fix broken image link in TextureCacheTest.js
2015-10-20 16:28:03 +08:00
pandamicro
7443cf915d
Merge pull request #14185 from mogemimi/fix-memory-leak
...
Fix some memory leaks
2015-10-20 15:56:39 +08:00
geron-cn
be8a158bd7
fix bug: #23532 AnchorPointFrame animation performance diffrent with cocos studio
2015-10-20 15:49:12 +08:00
Liam
7280a963b3
fix light3D reader error
2015-10-20 15:24:34 +08:00
yangxiao
a4d67867d7
check light enable or not when switching shader
2015-10-20 15:11:39 +08:00
CocosRobot
6a0e1b323f
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-10-20 02:42:17 +00:00
mogemimi
c3194ac34d
Fix memory leak in TMXLayer
2015-10-19 19:47:36 +09:00
mogemimi
34831d48ce
Fix memory leak in GLViewImpl
2015-10-19 19:46:45 +09:00
pandamicro
f4a2a53f6d
Merge pull request #14184 from xiaofeng11/v3_xf
...
Fix EventListenerCustom registered by UILabel never has been released bug
2015-10-19 17:13:25 +08:00
XiaoFeng
762e25ad33
Remove unused parameter
2015-10-19 16:06:39 +08:00
XiaoFeng
ffb2cfa9e0
Fix EventListenerCustom registered by UILabel never has been released bug
2015-10-19 14:07:50 +08:00
pandamicro
82881bf92f
Merge pull request #14109 from loadrunner/label3
...
Added line spacing/leading feature to Label
2015-10-19 10:55:53 +08:00
pandamicro
be45e0bc50
Merge pull request #14174 from noshbar/v3
...
CPPCheck fixes, correct deallocation, array size.
2015-10-19 10:05:01 +08:00
pandamicro
4395886133
Merge pull request #14175 from MSOpenTech/v3-winrt-angle
...
V3 winrt angle update to fix issue #9980
2015-10-19 01:27:03 +08:00
pandamicro
e8a22237e6
Merge pull request #14173 from njh0602/somefix
...
Simple merge() version
2015-10-18 22:59:23 +08:00
pandamicro
cde67d1261
Merge pull request #14162 from mogemimi/fix-warnings
...
Fix warnings on Xcode 7
2015-10-18 22:56:12 +08:00
pandamicro
c365fc5883
Merge pull request #14180 from pandamicro/v3
...
Fix issue for web engine upgrade
2015-10-18 22:48:16 +08:00
pandamicro
cfb1ee2b11
Improved logic of jsb_boot.js to sync with the web engine behavior
2015-10-18 22:45:53 +08:00
pandamicro
11890d6c4b
Fix issue for web engine upgrade
2015-10-18 00:19:02 +08:00
Dale Stammen
fdebb373b1
updated cocos2d-x/angle template files to version 0edf96a2f54a43d068244a86aaf9133c1bf71fe5
2015-10-16 15:36:34 -07:00
Dale Stammen
ce88dbdee4
removed WP8.1 shader code
2015-10-16 14:48:03 -07:00
Dale Stammen
414a34f3f9
removed old WP8.1 shaders for gl_PointSize
2015-10-16 14:47:02 -07:00
남준현
f47f4aa00e
Simple merge() version
2015-10-17 04:59:07 +09:00
Dirk de la Hunt
88bcaad518
General fixes:
...
- changed some delete operations to be deletions of arrays where applicable
- changed some "free" operations to "delete" where memory was allocated with "new"
CCPUScriptCompiler.cpp:
- added checks to see if temp1 and temp2 are non-null before dereferencing them
FileServer.cpp:
- changed the size of startFlag to be 13, seeing as the strcpy into it copies a string, "RuntimeSend:",
is already 12 characters long, but strcpy() attempts to copy the NULL terminator too.
2015-10-16 21:43:09 +02:00
fjut
4c3d0c62bb
remove duplicate include
...
duplicate include: #include "ui/CocosGUI.h"
2015-10-16 21:41:40 +08:00
dimon4eg
d317cd75e1
Improved code a bit
2015-10-16 11:28:34 +03:00
mogemimi
8af6531c94
Replace deprecated CCApplication with Application
2015-10-16 15:02:06 +09:00
mogemimi
4600c41f9b
Add override keywords
2015-10-16 15:01:10 +09:00
pandamicro
efeb6a44fb
Merge pull request #14143 from MSOpenTech/v3-win10-curl
...
V3 win10 curl
2015-10-16 13:35:48 +08:00
남준현
5118a31faf
// cross pro'c'uct of 2 vector. A->B X C->D
...
// cross pro'd'uct of 2 vector. A->B X C->D
2015-10-16 03:24:54 +09:00
dimon4eg
ee3c000b43
Fix crash in web view on android
2015-10-15 16:43:53 +03:00
yangxiao
907189ed14
correct wrong presion, which leads to failed on some devices
2015-10-15 11:59:38 +08:00
Dale Stammen
3e3e47de10
added Win10 UWP curl support
2015-10-14 16:47:52 -07:00
pandamicro
07c2ec49db
Merge pull request #14140 from xiaofeng11/v3
...
Bug fix
2015-10-14 21:12:06 +08:00
mogemimi
59d7868d4c
Fix minor typos
2015-10-14 15:12:22 +09:00
pandamicro
40aa4187be
Merge pull request #14138 from songchengjiang/cocos2d-v3-bugfix2
...
fix the #23272 bug
2015-10-14 14:05:09 +08:00
XiaoFeng
a6a3e24fdd
Fix when image size of variable button status texture are different, Helper::restrictCapInsetRect result may cause pressed & disabled status picture won't display.
2015-10-14 13:58:58 +08:00
songchengjiang
02f20db82a
fix the #23272 bug
2015-10-14 13:24:38 +08:00
yangxiao
4c7edd457e
set _hasPremultipliedAlpha to false
2015-10-13 15:45:24 +08:00
pandamicro
b19bf82170
Merge pull request #14108 from loadrunner/label2
...
Changed label font size type to float
2015-10-13 11:55:14 +08:00
pandamicro
5e43cfa129
Merge pull request #14107 from loadrunner/label1
...
Removed scale factor for label shadow
2015-10-13 11:54:14 +08:00
pandamicro
5b35796093
Merge pull request #14091 from yangws/v3
...
Fix textfield input Chinese error with specific IME on Android.
2015-10-12 14:54:56 +08:00
mogemimi
daa29752db
Fix typo in UIEditBox
2015-10-12 13:57:50 +09:00
pandamicro
3dde02ba93
Merge pull request #14106 from loadrunner/tilemap
...
TMXLayer cast bug
2015-10-11 18:43:24 +08:00
Danut Chereches
471c23930c
added line spacing/leading
2015-10-10 19:15:45 +03:00
Danut Chereches
019b549a20
changed font size type to float
2015-10-10 19:15:22 +03:00
Danut Chereches
aeb268f3cd
cast tile coordinates to int before calculating index
2015-10-10 19:05:51 +03:00
WenhaiLin
05c235f9fe
ParticleSystemQuad:Fixed incorrectly generate errors "Particle system: not enough memory"
2015-10-10 17:55:05 +08:00
pandamicro
f64105b3dc
Merge pull request #14047 from liamcindy/v3.9
...
update for light3d reader
2015-10-10 11:43:05 +08:00
pandamicro
376180c1d6
Merge pull request #14093 from cpascal/fix_audioplayer
...
Fixed AudioPlayer crash in Win32
2015-10-10 11:32:46 +08:00
pandamicro
c2571f950c
Merge pull request #14003 from zilongshanren/fixWebViewCallback
...
fix ui::WebView callback operate OpenGL issue.
2015-10-10 11:32:02 +08:00
pandamicro
8b0a6a6c29
Merge pull request #14099 from pandamicro/v3
...
[ci skip]Sync with CCBoot for web
2015-10-10 10:16:16 +08:00
pandamicro
5ae2812bf8
Sync with CCBoot for web
2015-10-10 10:15:36 +08:00
pandamicro
bf35655ce3
Merge pull request #14100 from CocosRobot/update_lua_bindings_1444440864
...
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-10-10 09:44:51 +08:00
pandamicro
ee3399a4a4
Merge pull request #14097 from TheCodez/patch-1
...
Add missing getChildByTag<>() api
2015-10-10 09:43:46 +08:00
CocosRobot
216438fb9b
[ci skip][AUTO]: updating luabinding & jsbinding automatically
2015-10-10 01:40:55 +00:00
pandamicro
db0d23ede4
Merge pull request #14087 from geron-cn/v3
...
fix code error, redundant interface
2015-10-10 09:39:35 +08:00
pandamicro
27fc6b24ee
Merge pull request #14080 from 1scaR1/v3
...
Fixed enabling of scale9 background in ccui.Layout
2015-10-10 09:39:09 +08:00
pandamicro
7d4988f43f
Merge pull request #14095 from mogemimi/fix-typo
...
Fix typos
2015-10-10 09:29:53 +08:00
Michael Kösel
493d95c3f6
Add missing getChildByTag<>() api
2015-10-10 00:08:38 +02:00
pandamicro
bc9b59b7f7
Merge pull request #14096 from pandamicro/v3
...
[ci skip]Add opacity/color cascade test case for Scale9Sprite
2015-10-09 21:07:27 +08:00
pandamicro
0ea54868e2
Add opacity/color cascade test case for Scale9Sprite
2015-10-09 21:01:49 +08:00
mogemimi
5993304e06
Fix typos
2015-10-09 17:59:11 +09:00
cpascal
13c1258f9d
Fixed AudioPlayer crash in Win32
2015-10-09 15:03:05 +09:00
Vincent Yang
90ef4be103
Fix textfield input chinese error with specific IME on Android.
2015-10-09 12:06:22 +08:00
子龙山人
cdf6fa8a54
Merge pull request #14052 from neokim/fix_listview_center_magnetic_issue
...
Fix an issue that list view's Magnetic::CENTER is not working well when non-bounceable.
2015-10-09 08:27:18 +08:00
pandamicro
4b66caaed8
Merge pull request #14084 from super626/v3
...
correct spot light init value
2015-10-08 17:15:03 +08:00
geron-cn
6b9890472b
fix code error, redundant interface
2015-10-08 14:14:49 +08:00