Michael Kösel
|
493d95c3f6
|
Add missing getChildByTag<>() api
|
2015-10-10 00:08:38 +02:00 |
mogemimi
|
5993304e06
|
Fix typos
|
2015-10-09 17:59:11 +09:00 |
pandamicro
|
a68d07b968
|
Merge pull request #14075 from TheCodez/getname_byref
Node::getName() now returns string by reference
|
2015-10-08 11:43:03 +08:00 |
pandamicro
|
5c816b5d9b
|
Merge pull request #14063 from kammy/improve_spriteframecache
Inprove SpriteFrameCache::addSpriteFramesWithDictionary
|
2015-10-08 11:23:21 +08:00 |
TheCodez
|
eb747cf808
|
Node::getName() returns string by reference
|
2015-10-05 21:42:07 +02:00 |
pandamicro
|
1e298a2c1a
|
Merge pull request #14064 from MSOpenTech/v3-win10-fix
V3: fixed Windows 10 UWP app manifest by correcting image asset paths
|
2015-10-04 10:53:52 +08:00 |
Dale Stammen
|
32eeb560c3
|
clean up include files for WINRT platforms
|
2015-10-02 18:49:41 -07:00 |
KURA Shuichi
|
0469632cf8
|
Inprove addSpriteFramesWithDictionary
- Moved initialization of image to an appropriate
location, because it always called twice in
SpriteFrameCache::addSpriteFramesWithFile()
|
2015-10-03 03:18:07 +09:00 |
mogemimi
|
9f768bc1ab
|
Add missing override keyword
|
2015-10-02 18:18:23 +09:00 |
Joachim Grill
|
c49b60ae40
|
SpriteFrameCache: added plist file format documentation, fixed broken link
|
2015-10-01 10:36:18 +02:00 |
Joachim Grill
|
9a0ea79b61
|
remove set/get/hasPolygonInfo methods from js / lua api; fixed C++11 issue
|
2015-09-30 15:20:53 +02:00 |
Joachim Grill
|
79656ffe13
|
fixed typo, indentation
|
2015-09-29 16:50:14 +02:00 |
Joachim Grill
|
ac24612e98
|
extend SpriteFrameCache to load PolygonInfo from plist file
|
2015-09-29 15:42:04 +02:00 |
Liam
|
87a406febe
|
update for light3d reader
|
2015-09-29 11:27:01 +08:00 |
Danut Chereches
|
8944f9e1cd
|
removed scale factor for label shadow
|
2015-09-28 16:27:20 +03:00 |
pandamicro
|
7b85211cfe
|
Remove ScriptComponent
Because windows platform can't successfully compile in previous architecture
|
2015-09-27 22:18:59 +08:00 |
pandamicro
|
ddb636a022
|
Add ScriptComponent and ComponentJS
|
2015-09-26 19:43:36 +08:00 |
minggo
|
26632ec69a
|
linjia demo finish
|
2015-09-26 19:43:35 +08:00 |
pandamicro
|
95379c5dc2
|
Merge pull request #13995 from xiaofeng11/v3
Fix issue http://punchbox.info:3000/issues/23146
|
2015-09-24 13:03:59 +08:00 |
XiaoFeng
|
6db2cd7b9c
|
Fix issue : http://punchbox.info:3000/issues/23182
When time scale set to negative value, it will cause emitCounter been set to negative value and cause render crash
|
2015-09-23 18:37:12 +08:00 |
Martin Taylor
|
62e36e8006
|
fix typos and syntax error. A thorough check by tool VSSpellChecker.
|
2015-09-22 16:08:23 +08:00 |
pandamicro
|
08204ec0bd
|
Merge pull request #13991 from MSOpenTech/v3-win10-fix
V3 Win10 UWP fixes
|
2015-09-22 02:44:45 +08:00 |
Dale Stammen
|
6a5db06115
|
added missing CCMotionStreak3D files. Re-added all Physics and 3D files to project
|
2015-09-21 11:11:34 -07:00 |
pandamicro
|
b54a06a55e
|
Merge pull request #13987 from Dimon4eg/Fix-crash-in-FontFreeType
Fix crash in destructor of FontFreeType
|
2015-09-22 01:59:34 +08:00 |
pandamicro
|
deacab9222
|
Merge pull request #13990 from MSOpenTech/v3-win10-fix
V3 Win10 UWP fixes
|
2015-09-22 01:57:53 +08:00 |
Dale Stammen
|
70e157a44a
|
removed CCComponentPhysics2d from Win10 UWP project
|
2015-09-21 10:44:30 -07:00 |
dimon4eg
|
09b5b7fcc3
|
Fix crash in destructor of FontFreeType
|
2015-09-21 18:18:58 +03:00 |
pandamicro
|
5511d42cd4
|
Merge pull request #13716 from fusijie/particle_performance
Refactory particle system update.
|
2015-09-21 14:19:55 +08:00 |
fusijie
|
d871b1aa8a
|
Refactory particle system.
|
2015-09-20 16:46:09 +08:00 |
pandamicro
|
0cbc1e5f40
|
Merge pull request #13923 from WenhaiLin/v3-physics-refine
Refine components to improve physics performance
|
2015-09-18 21:56:36 +08:00 |
pandamicro
|
add24ccf95
|
Merge pull request #13913 from fusijie/revert-12889-fix_clippingRectangle_bug
Revert "remove CCClippingRectangleNode transform error support."
|
2015-09-18 21:43:42 +08:00 |
pandamicro
|
13f3d46ad4
|
Merge pull request #13897 from super626/v3
SkyboxBrush : Make the shader parameter take effect at once
|
2015-09-18 16:14:06 +08:00 |
WenhaiLin
|
a17a702cd1
|
Refine components to improve performance
|
2015-09-18 14:34:02 +08:00 |
fusijie
|
23246b006b
|
fixed region x,y scale bug.
|
2015-09-18 13:39:22 +08:00 |
偶尔e网事
|
eb480fb021
|
Revert "remove CCClippingRectangleNode transform error support."
|
2015-09-18 11:31:37 +08:00 |
yangxiao
|
757209e59e
|
make the shader parameter take effect at once
|
2015-09-17 18:14:17 +08:00 |
yangxiao
|
572ee3adb2
|
merge cocos
|
2015-09-17 14:24:01 +08:00 |
pandamicro
|
0479cca364
|
Merge pull request #13832 from yangws/downloader
Restructure CCDownloader implement on iOS and Android don't use libcurl.
|
2015-09-16 14:01:28 +08:00 |
Vincent Yang
|
848fa2c0d0
|
Merge cocos2d.
|
2015-09-15 18:30:45 +08:00 |
子龙山人
|
73d2c5d1b8
|
Merge pull request #13577 from fusijie/fix_13454
Fixed sprite debug draw.
|
2015-09-15 14:24:23 +08:00 |
pandamicro
|
f281ae31b0
|
Merge pull request #13725 from WenhaiLin/v3-comonent-refine
Refine ComponentContainer to improve performance
|
2015-09-10 18:04:26 +08:00 |
pandamicro
|
7611f99ee4
|
Merge pull request #13746 from WenhaiLin/v3-menuitemtoggle-refine
Uncoupling the implementation of MenuItemToggle dependence on tag.
|
2015-09-10 16:15:18 +08:00 |
pandamicro
|
98f29e4dee
|
Merge pull request #13764 from fusijie/fix_autopolygon_comments
[ci skip]Fixed autopolygon comments
|
2015-09-10 15:22:55 +08:00 |
fusijie
|
d957e0c032
|
Fixed auto polygon comments out of date.
|
2015-09-10 15:18:04 +08:00 |
WenhaiLin
|
e251866d23
|
Uncoupling the implementation of MenuItemToggle dependence on tag.
|
2015-09-09 15:32:44 +08:00 |
WenhaiLin
|
34be2065e4
|
Refine ComponentContainer to improve performance
|
2015-09-09 11:53:55 +08:00 |
Martin Taylor
|
e592a1a02d
|
fix typos
|
2015-09-09 11:37:41 +08:00 |
pandamicro
|
dc607a1784
|
Merge pull request #13726 from jianglong0156/actionExtendSquash
support custom action, and rewrite update function
|
2015-09-09 10:25:56 +08:00 |
江龙
|
badd80bf3a
|
support custom action, and rewrite update function
support custom action in js, and developer can rewrite the update function in custom action class.
useage:
// custom action sample code
var customMoveBy = cc.MoveBy.extend({
ctor:function (duration, deltaPos, deltaY) {
this._super(duration, deltaPos, deltaY);
},
update:function (dt) {
this._super(dt);
if (this.getTarget()) { // rand color
this.getTarget().setColor(cc.color(cc.rand()%255, cc.rand()%255, cc.rand()%255));
}
}
});
|
2015-09-09 10:08:07 +08:00 |
minggo
|
8326ed6535
|
add physics component
|
2015-09-08 09:54:01 +08:00 |
pandamicro
|
00abec6c2c
|
Merge pull request #13707 from pandamicro/fix_layerrgba
[ci skip] Fix compile error in __LayerRGBA
|
2015-09-07 17:27:46 +08:00 |
TheCodez
|
d77045818c
|
Fix compile error in __LayerRGBA
|
2015-09-07 17:25:56 +08:00 |
Dale Stammen
|
030157ded0
|
update libcococs2d name to v3.9 for WinRT platforms
|
2015-09-04 08:46:08 -07:00 |
WenhaiLin
|
5fdb041856
|
Use string::empty() to check whether string is empty.
|
2015-09-01 11:26:09 +08:00 |
yangxiao
|
c23805889f
|
add motionstreak3d
|
2015-09-01 11:02:22 +08:00 |
yangxiao
|
6fa6f1f0da
|
enable depth write
|
2015-08-28 11:46:11 +08:00 |
fusijie
|
5f527bfc1d
|
Fixed sprite debug draw.
|
2015-08-26 18:18:58 +08:00 |
yangxiao
|
2f72a88a20
|
depth test always
|
2015-08-26 16:37:48 +08:00 |
yangxiao
|
7884138dcc
|
disable blend when drawing skybox
|
2015-08-25 14:32:25 +08:00 |
Dale Stammen
|
43687bf7a0
|
moved CCTextureCube from 3D to renderer
|
2015-08-24 03:45:55 -07:00 |
pandamicro
|
0c5b377f00
|
Merge pull request #13531 from pandamicro/texturecube
Move CCTextureCube From 3d to renderer to solve compilation issue
|
2015-08-24 14:06:08 +08:00 |
yangxiao
|
7dcc3dd982
|
Move CCTextureCube From 3d to renderer to solve compilation issue
|
2015-08-24 14:01:50 +08:00 |
songchengjiang
|
be24586f4b
|
fix crash of CameraBackgroundColorBrush
|
2015-08-24 10:23:59 +08:00 |
Dale Stammen
|
b4f2fb0928
|
added missing CCCameraBackgroundBrush files
|
2015-08-21 09:23:01 -07:00 |
pandamicro
|
486af79a47
|
Merge pull request #13511 from fusijie/fix_13509
fixed renderTexture crash bug.
|
2015-08-21 18:24:27 +08:00 |
fusijie
|
cbd7eed9c4
|
fixed renderTexture crash bug.
|
2015-08-21 17:38:56 +08:00 |
pandamicro
|
006f300ac9
|
Add JS and Lua bindings for CCCameraBackgroundBrush
|
2015-08-21 12:42:36 +08:00 |
pandamicro
|
350182c1aa
|
Refactor BackGround to Background
|
2015-08-21 10:43:59 +08:00 |
yangxiao
|
3e2001bdb1
|
Add CCCameraBackgroundBrush
including Color, Depth, SkyBox brushes
Squashed from https://github.com/cocos2d/cocos2d-x/pull/13490
|
2015-08-21 10:43:59 +08:00 |
Dale Stammen
|
d55bc653e0
|
update c++ debug info settings
|
2015-08-20 13:25:17 -07:00 |
pandamicro
|
7bd5cc4e34
|
Merge pull request #13486 from fusijie/fix_11677
Fixed SpriteProgressToRadialMidpointChanged bug.
|
2015-08-20 18:06:38 +08:00 |
fusijie
|
f133e5a754
|
Fixed SpriteProgressToRadialMidpointChanged bug.
|
2015-08-20 17:07:53 +08:00 |
XiaoFeng
|
f26509efe4
|
Fix when picture file used by TMX map file missing or broken, create TMX object will cause program crashed
|
2015-08-19 14:02:12 +08:00 |
子龙山人
|
4f9a81198b
|
Merge pull request #13456 from WenhaiLin/v3.8-label-globalZOrder
Fixed `Label::setGlobalZOrder ` is invalid if label create with system font.
|
2015-08-19 13:46:00 +08:00 |
pandamicro
|
31bc04a301
|
Merge pull request #13455 from MSOpenTech/v3-win10
Windows 10 UWP and WP8.1 app certification fixes
|
2015-08-19 13:36:29 +08:00 |
WenhaiLin
|
827f05c5e1
|
Fixed `Label::setGlobalZOrder ` is invalid when label create with system font.
|
2015-08-19 10:22:48 +08:00 |
Dale Stammen
|
47b72ba30e
|
Merge branch 'v3' into v3-win10
|
2015-08-18 11:07:38 -07:00 |
Dale Stammen
|
8493365be7
|
updates to pass Windows App Certification tests
|
2015-08-18 11:06:47 -07:00 |
子龙山人
|
593eb0737f
|
Merge pull request #13440 from WenhaiLin/v3.8-rc0
Fixed `Label::getLetter(index)->setVisible(true)` cause draws duplicate letters.
|
2015-08-18 17:06:37 +08:00 |
WenhaiLin
|
6bf15885b8
|
Fixed `Label::getLetter(index)->setVisible(true)` cause draws duplicate letters.
|
2015-08-18 15:42:05 +08:00 |
fusijie
|
223d5a7a5c
|
fix copy construct & assignment operator memory leakage.
|
2015-08-18 14:48:16 +08:00 |
pandamicro
|
d2bc03f80f
|
Merge pull request #13424 from WenhaiLin/v3.8-rc0
Label:Fixed display not as expected(Redmine issue:22133).
|
2015-08-18 10:00:36 +08:00 |
WenhaiLin
|
990a25f759
|
Label:Fixed display not as expected(Redmine issue:22133).
|
2015-08-17 22:46:19 +08:00 |
肖峰
|
0473b08dbb
|
Fix gamenode3d parse failed error
- Fix the parser issue
- Add GameNode3DReader to win8 universal project
- Add GameNode3d reader to Android & Linux project
Squashed from https://github.com/cocos2d/cocos2d-x/pull/13369
|
2015-08-17 22:42:21 +08:00 |
子龙山人
|
83de0e798e
|
Merge pull request #13365 from WenhaiLin/v3-label-ignore-r
Label:ignore '\r' character.
|
2015-08-14 17:22:33 +08:00 |
WenhaiLin
|
d25decb414
|
Label:ignore '\r' character.
|
2015-08-14 11:07:34 +08:00 |
Ricardo Quesada
|
d2cf4bfc79
|
Squashed commit of the following:
commit 2c810a8e931e07b06498c07db37cbf20a2bcfc92
Merge: 61788a0 082caaf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Aug 13 00:13:38 2015 -0700
Merge branch 'v3' into downloader_decouple
commit 61788a0b34188fed5367cab121817db97198bcd8
Merge: 8c1e211 5e21580
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 12 20:45:12 2015 -0700
Merge branch 'v3' into downloader_decouple
commit 8c1e2119a5c671c00da5ce1fb244029f2bfab09f
Merge: 2ea66af 8d73883
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 12 20:42:04 2015 -0700
Merge pull request #6 from minggo/downloader_decouple
fix js binding error
commit 8d7388302ff1d8da575b277e47a3f8ceb1017e98
Author: minggo <ming@cocos2d-x.org>
Date: Thu Aug 13 11:09:58 2015 +0800
fix js binding error
commit 2ea66af7684f5ec8a20067b1a49347920dbbbb40
Merge: 8cdb0b6 bc964e8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 12 09:14:22 2015 -0700
Merge branch 'v3' into downloader_decouple
commit 8cdb0b6e4b83210b1f68b4568c74ccb36f504806
Merge: 9272765 08eeca9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 11 20:11:46 2015 -0700
Merge pull request #5 from minggo/downloader_decouple
fix lua-binding error
commit 08eeca9d99b5160c48bac1bfecf03b459d05ed15
Author: minggo <ming@cocos2d-x.org>
Date: Wed Aug 12 10:34:05 2015 +0800
fix lua-binding error
commit 927276589d57432477f8ffc033e19a21a215b246
Merge: 8252464 6f4ed8a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 11 10:39:22 2015 -0700
Merge branch 'v3' into downloader_decouple
commit 8252464020dbe86da4e5e5aa6e4e45f6997f6b9b
Merge: 5dddbb6 138df42
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 11 06:53:48 2015 -0700
Merge pull request #4 from minggo/downloader_decouple
fix linking error in lua-tests on Android
commit 138df42a3acfdcfae29eeab1b03ef5dd062f0145
Author: minggo <ming@cocos2d-x.org>
Date: Tue Aug 11 16:23:53 2015 +0800
fix link error in lua-tests
commit 5dddbb61a1bcda96aa93bfcbe78f42c639eb6247
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 23:22:50 2015 -0700
works for real on win32
commit ddadaf82231b60c8e343718561c0d78657afe7c2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 22:26:59 2015 -0700
compiles on win32
commit 733f1d4c2e4f8382ff19f1793f7f09950774fe78
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 21:57:49 2015 -0700
compiles on iOS!!
commit f706f97962eb393bf7dfec79739ff8dfdec103d5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 21:27:03 2015 -0700
compiles and runs Ok on windows.
Tested all downloadertests + assetmanagertest
commit 5e333f4407952d9c2e71e18cb9393d8b6cd170b4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 20:24:28 2015 -0700
updates windows projects
commit e77fd8a278594fefc24ff13cbee038508429294d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 19:56:10 2015 -0700
compiles on Android
commit 5f515e3519a0688d11476ea6ef235007e8378c96
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 18:34:33 2015 -0700
trying to fix a compile issue on iOS
WIP
commit b144ea67dfe7a06e7bfb515adf16f536ba2ead98
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 18:25:11 2015 -0700
make bug fixes
adds public `getHeader`
commit a228799ba74eb8642c43d215a802f811a576a4aa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 17:42:19 2015 -0700
some linux fixes
commit 2cab23d87acc138823ebe9dcec9d42f827690d99
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 16:58:53 2015 -0700
Squashed commit of the following:
commit 86227e9138c1fb523bd28186d355de65cc64c588
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 16:55:17 2015 -0700
works %100
and uses less memory than before
commit a9cafa6f2fe7847e279934d2c162287680760dda
Merge: 0bbc62e 0cbd71f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 15:49:33 2015 -0700
Merge branch 'v3' into cocos_net
commit 0bbc62ee1fbfd107a935131d5d93994e87865afa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 15:46:55 2015 -0700
more tests... and works
but there is huge bug.
ProgData <vector> needs the position of DownloadUnits <unordered_map>
but <unordered_map> does not guaranty the order.
So in my next commit I"ll merge DownloadUnit with ProgressData
commit 389ed8639a1942f628773616a8e340bc66a0c1d7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 13:47:07 2015 -0700
debugging info
commit af0dc45bb9c4705934ced2c1d67e5afc06b6f317
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 11:47:31 2015 -0700
sync and async tests working ok
commit 999fa7a7bfb28565492f47b39caef7f1a079c183
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 11:38:38 2015 -0700
adding tests
commit 91ee294942510718400edc0d00d3c744d00339ee
Merge: 76ab703 7f215e9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 10:03:50 2015 -0700
Merge branch 'v3' into cocos_net
commit 76ab7032d3a21156f05395a021391a16649f755a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Aug 7 00:22:20 2015 -0700
Downloader tests
commit b65c4dad7089660bfe697c0dab3e9290d1a6d013
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Aug 6 21:34:54 2015 -0700
compiles on Xcode 7
commit ec0d66340b8daf0b042d36333dff759cd424f465
Merge: 878e4b5 0d77838
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Aug 6 11:02:24 2015 -0700
Merge branch 'v3' into cocos_net
commit 878e4b5d0f87bc6d5d6e507102ab15e2c24a1c8f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 18:07:02 2015 -0700
working, yeah!
commit ad1e7637a5ac2e6bff44d35429f5556ea1cb8a4c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 17:49:59 2015 -0700
code is more thread-safe friendly
commit 8c6baaee6b898d4b90e5d8988a174d8a33702f60
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 16:39:02 2015 -0700
fixes callbacks
commit ddab4d753106c6ff11304c1c69739c5611e3f20a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 15:43:51 2015 -0700
cleaner code
runs callbacks in cocos2d thread only if needed
commit ef75844aaa010633e6e27ae6e69460174460d5c7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 11:58:04 2015 -0700
removed weak_ptr<> from ProgressData
that logic of the code is added in the callbacks
commit d9c7436cbadc611592b3c80ca2a3a9edeaa00853
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 11:54:07 2015 -0700
checks whether or not the callbacks are in the cocos2d thread
commit ae6594a6f866f6b5015ba293db23343887063d2f
Merge: 4c61069 6831e24
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Aug 5 10:48:34 2015 -0700
Merge branch 'v3' into cocos_net
commit 4c61069a7e0e33fa0332df700cc8df4807178caf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 4 21:36:50 2015 -0700
almost there...
Downloader has std::vector<FILE*> instead of FileDescriptors
code cleaner...
commit c34d04a8218d2be5c316e0487e5ac46792bbed76
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 4 20:38:44 2015 -0700
passes progressData to batch
no need to alloc memory for each ProgressData
commit f7e8bbd8b85f214b919bce6118d4158dd6d26368
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 4 17:47:23 2015 -0700
tidier code and more optimizations
commit a486dc78aedcf9c6178e490292edd572f8a7b374
Merge: 4178327 a06421b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Aug 4 14:03:22 2015 -0700
Merge branch 'v3' into cocos_net
commit 417832705910a6ebd16a876cd98064ea16f0f45c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Aug 3 18:13:13 2015 -0700
not finished yet...
...but trying to have a common inteface with batched and non-batched
downloads
commit 1d0e4652763c2e1511ac102a62defae6c6a89220
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Aug 3 16:29:39 2015 -0700
ErrorCallback compiles
starting the batching code
commit 6645a287c47dc01cbf1f2d80e9c0fdd2b16e3e18
Merge: c180425 8d836da
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Aug 3 10:28:51 2015 -0700
Merge branch 'v3' into cocos_net
commit c180425d8181b8e6f53be766d8d2b94f908ae168
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jul 31 15:35:53 2015 -0700
More progress on migrating multiple-file downloader
to the implementation file
commit 5fa273e265963af3c0cb6338bf49dc5e1b54173b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jul 31 14:00:02 2015 -0700
Dowloader moved to `cocos2d::network`
commit 14b1d0825106701b5435a266b255f09291b6486b
Merge: 13cfc8d f744383
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jul 31 11:13:55 2015 -0700
Merge branch 'v3' into cocos_net
commit 13cfc8de4eb4835ffb8f8d671d3d070c411b0a2e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Jul 31 11:11:45 2015 -0700
DownloadUnits belong to network
commit e6e17564ead1fb7f6f7df343b0627a104cd756f8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Jul 30 12:23:36 2015 -0700
adds `check for option`
commit 5cb76dfaaed42011a0c536d01b82a0a94487d6aa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Jul 30 10:37:51 2015 -0700
Downloader: using URLDownload in one case.
3 more to go. Not tested yet
commit 9b26e9cfac425635027189ccab835054b68bc83d
Merge: 20fe063 253d9c4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Jul 30 08:35:53 2015 -0700
Merge branch 'v3' into cocos_net
commit 20fe0636e36ae7f1da048545b3345f526d5b64de
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Jul 29 17:36:07 2015 -0700
URLDownload: initial commit
HttpAsyncConnection -> HttpAsyncConnection-apple: follows the cocos2d
guidelines
Adds `CCIRULDownload` interface.
Adds `CCURLDownload` implementation based on libcurl. Not working yet.
`Downloader` uses `URLDownload` for some of its functions.
WIP
commit 3a5d3b83838bee53e3bbea182f3ad09d7bec32d0
Merge: e408fe0 642ccac
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Jul 29 14:00:43 2015 -0700
Merge remote-tracking branch 'cocos2d/v3' into cocos_net
commit e408fe0b9303813d20bab2f7bf548f3b7af416a6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Jul 29 13:59:46 2015 -0700
Adds more files to Xcode project
...even if they are not being compiled. Much easier to add missing
functionality to the rest of the platforms
commit 11d86acebeb61348e4ccf7e6af9a2eaf1b6bb534
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Jul 29 11:36:57 2015 -0700
removes unneeded headers
|
2015-08-13 00:14:10 -07:00 |
WenhaiLin
|
c06994de34
|
Label:Fixed display incorrect if label content is changed after invoking `getLetter(letterIndex)`
|
2015-08-13 10:29:58 +08:00 |
WenhaiLin
|
eeb4a38715
|
Label:Fixed letter can be flipped.
|
2015-08-11 10:06:14 +08:00 |
Wenhai Lin
|
2983aed0a9
|
Label:Fixed crash cause by access an invalid address
|
2015-08-10 16:50:59 +08:00 |
pandamicro
|
3cc06d3f9b
|
Merge pull request #13267 from yangws/bug_21796
Fix bug: #21796 [Android 5.0][Cpp-Tests] Node::Scene3D menu unusable.
|
2015-08-10 12:40:32 +08:00 |
pandamicro
|
f4440f5613
|
Merge pull request #13229 from fusijie/fix_13228
Fixed SpriteBatchNode setFlipped bug.
|
2015-08-10 11:53:30 +08:00 |
Vincent Yang
|
56204dbef9
|
Fix bug: #21796 [Android 5.0][Cpp-Tests] Node::Scene3D menu unusable.
|
2015-08-07 16:30:22 +08:00 |
fusijie
|
9b148b08cd
|
Fixed SpriteBatchNode setFlipped bug.
|
2015-08-06 10:53:22 +08:00 |
WenhaiLin
|
e81d5af12d
|
Spaces should not be lost if label created with Fingerpop.ttf
|
2015-08-05 23:46:41 +08:00 |
WenhaiLin
|
2c220092e6
|
Fixed FontAtlasCache::purgeCachedData might cause crash.
|
2015-08-05 14:12:02 +08:00 |
WenhaiLin
|
b9edd6fc29
|
Fixed transform
|
2015-08-05 00:21:06 +08:00 |
WenhaiLin
|
2363622a67
|
Label:support auto batch with bitmap font or char map.
|
2015-08-04 21:49:14 +08:00 |
fusijie
|
8d2da20e5f
|
fix spelling mistake.
|
2015-08-04 09:36:33 +08:00 |
pandamicro
|
4b7b85f113
|
Merge pull request #12889 from fusijie/fix_clippingRectangle_bug
remove CCClippingRectangleNode transform error support.
|
2015-08-03 18:01:01 +08:00 |
fusijie
|
aaa5793b86
|
add IF-CASE to fix debug draw under SpriteBatchNode.
|
2015-08-03 10:47:58 +08:00 |
pandamicro
|
3c2e66e425
|
Merge branch 'v3.7.1' of https://github.com/cocos2d/cocos2d-x into v3
# Conflicts:
# .travis.yml
# build/cocos2d_js_tests.xcodeproj/project.pbxproj
# build/cocos2d_tests.xcodeproj/project.pbxproj
# cocos/2d/CCFont.h
# cocos/2d/CCFontAtlas.cpp
# cocos/2d/CCFontAtlas.h
# cocos/2d/CCFontFreeType.cpp
# cocos/2d/CCFontFreeType.h
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Windows/libcocos2d_8_1.Windows.vcxproj
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.WindowsPhone/libcocos2d_8_1.WindowsPhone.vcxproj
# cocos/2d/libcocos2d_win10/libcocos2d.vcxproj
# cocos/cocos2d.cpp
# cocos/platform/android/jni/Java_org_cocos2dx_lib_Cocos2dxHelper.cpp
# cocos/scripting/js-bindings/auto/jsb_cocos2dx_studio_auto.cpp
# templates/cpp-template-default/proj.ios_mac/HelloCpp.xcodeproj/project.pbxproj
# templates/js-template-default/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/js-template-runtime/frameworks/runtime-src/proj.ios_mac/HelloJavascript.xcodeproj/project.pbxproj
# templates/lua-template-default/frameworks/runtime-src/proj.ios_mac/HelloLua.xcodeproj/project.pbxproj
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.cpp
# tests/cpp-tests/Classes/LabelTest/LabelTestNew.h
# tools/bindings-generator
# tools/simulator/frameworks/runtime-src/proj.ios_mac/simulator.xcodeproj/project.pbxproj
# tools/travis-scripts/generate-bindings.sh
# tools/travis-scripts/generate-cocosfiles.sh
# tools/travis-scripts/travis_mac.yml
|
2015-08-02 22:28:27 +08:00 |
pandamicro
|
0ca48a32f5
|
Merge pull request #13110 from WenhaiLin/v3.8-label-cropped-fix
Label:Fixed the edge of character may be cropped.
|
2015-08-01 15:36:47 +08:00 |
pandamicro
|
3bdc7e4e1e
|
Merge pull request #13138 from fusijie/fix_spritepolygon_setflip
fix polygon sprite setFlipped bug.
|
2015-08-01 09:59:25 +08:00 |
fusijie
|
dcef1e9d31
|
fix polygon sprite setflipped bug.
|
2015-07-31 15:49:44 +08:00 |
pandamicro
|
ede9195d14
|
Merge pull request #13073 from super626/fixtest
Bug Fix
|
2015-07-31 09:58:14 +08:00 |
yangxiao
|
fc14efa034
|
update comment
|
2015-07-31 09:55:57 +08:00 |
pandamicro
|
39721c6eb6
|
Merge pull request #13105 from fusijie/fix_10487
fix Sprite/Label/FastTMX auto-culling bug.
|
2015-07-30 17:12:37 +08:00 |
Wenhai Lin
|
bce279c52e
|
Label:Fixed the edge of character may be cropped.
|
2015-07-30 16:24:47 +08:00 |
fusijie
|
17c7848e62
|
fix FastTiledMap auto-culling bug.
|
2015-07-30 15:07:03 +08:00 |
fusijie
|
f91a58c8ff
|
fix Label auto-culling bug.
|
2015-07-30 13:59:50 +08:00 |
子龙山人
|
cd4d8b7880
|
Merge pull request #13101 from WenhaiLin/v3.8-label-code-style
Improve coding style
|
2015-07-30 13:44:53 +08:00 |
fusijie
|
ee5e64825a
|
fix Sprite auto-culling bug.
|
2015-07-30 12:00:57 +08:00 |
WenhaiLin
|
964e7103b5
|
Improve coding style
|
2015-07-30 11:33:18 +08:00 |
子龙山人
|
c039c7a9bd
|
Merge pull request #13084 from WenhaiLin/v3.8-label-df-contentsize-fix
Fixed the content size of Label is incorrect with GLOW effect.
|
2015-07-30 11:29:48 +08:00 |
WenhaiLin
|
a9f27865d3
|
Fixed the content size of Label is incorrect with GLOW effect.
|
2015-07-29 16:30:07 +08:00 |
pandamicro
|
16b03f0ebe
|
Merge pull request #13065 from pandamicro/widget_onEnter
Ensure C++ classes onEnter, onExit can be safely override in JS
|
2015-07-29 15:36:12 +08:00 |
子龙山人
|
96d44e1078
|
Merge pull request #13076 from WenhaiLin/v3.8-label-gb2312
Label:support font that contains GB2312 char map.
|
2015-07-29 14:51:17 +08:00 |
yangxiao
|
5d677d49bb
|
clamp sin value to -1, 1
|
2015-07-29 10:35:01 +08:00 |
pandamicro
|
cca95c3c51
|
Merge pull request #13041 from yangws/issue_10386
Fixed #10386 : ui::TextField hitTest not working as expected.
|
2015-07-29 09:52:06 +08:00 |
pandamicro
|
9fea134de1
|
Use sendNodeEventToJSExtended instead of sendNodeEventToJS in sub classes
|
2015-07-28 18:24:03 +08:00 |
Wenhai Lin
|
c4112e1ce5
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3.8-label-gb2312
|
2015-07-28 17:02:30 +08:00 |
WenhaiLin
|
9edd66d4a7
|
Label:support font that contains GB2312 char map.
|
2015-07-28 16:28:32 +08:00 |
pandamicro
|
89c722ed4b
|
Add script invocation for onEnter, onExit etc in other classes
|
2015-07-28 16:07:14 +08:00 |
pandamicro
|
0d7f1e3672
|
Reorder the logic of script invocation for onEnter, onExit etc to the beginning of the function
|
2015-07-28 16:05:47 +08:00 |
子龙山人
|
3a58668d71
|
Merge pull request #12744 from fusijie/fix_pageturndown
Fix PageTurn3D
|
2015-07-28 11:35:15 +08:00 |
Damien
|
7fb4dabcb7
|
Fixed a compile error when CC_SPRITE_DEBUG_DRAW is on
|
2015-07-27 14:46:15 -07:00 |
Vincent Yang
|
2f996b24ef
|
Fixed #10386 : ui::TextField hitTest not working as expected.
|
2015-07-27 16:59:35 +08:00 |
pandamicro
|
fa46a0abb4
|
Merge pull request #12992 from yangws/v3.7.1
Fixed #12962 : Scene can't have std::vector member.
|
2015-07-25 09:52:00 +08:00 |
WenhaiLin
|
b1bd8338aa
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3.8-label-gb2312
|
2015-07-24 21:30:28 +08:00 |
Dale Stammen
|
8940eb829f
|
added missing cocostudio files
|
2015-07-24 04:48:14 -07:00 |
WenhaiLin
|
37a174ee4a
|
Label:refine the implementation about text layout and support debug draw
|
2015-07-24 18:38:45 +08:00 |
geron-cn
|
0b09fd5bcb
|
Merge branch 'v3.7.1' of github.com:cocos2d/cocos2d-x into 3.7.1
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.h
|
2015-07-24 11:38:09 +08:00 |
Vincent Yang
|
e4a8aeee45
|
Fixed #12962 : Scene can't have std::vector member.
|
2015-07-24 11:16:45 +08:00 |
pandamicro
|
5ffa8efee6
|
Merge pull request #12977 from chengstory/OptimizationExtensionData
Optimization extension data
|
2015-07-24 11:01:56 +08:00 |
zhangcheng
|
be08de6780
|
Update libcocos2d_8.1 vs project.
|
2015-07-24 09:32:39 +08:00 |
Dale Stammen
|
13149a0bc5
|
updated version to 3.7.1
|
2015-07-23 13:26:32 -07:00 |
Dale Stammen
|
c3935b921c
|
updated version to 3.7.1
|
2015-07-23 13:02:42 -07:00 |
Dale Stammen
|
72427a0a64
|
updated version to 3.8
|
2015-07-23 12:46:47 -07:00 |
Dale Stammen
|
f91e812924
|
updated version to 3.8
|
2015-07-23 12:40:36 -07:00 |
fusijie
|
e9cbb6b084
|
fix compile on iOS/Android/Linux/Win8Universal.
|
2015-07-23 17:32:52 +08:00 |
zhangcheng
|
4b8248c015
|
Optimization of Custom Data.
replace ComExtensionData to ObjectExtensionData.
|
2015-07-23 16:30:23 +08:00 |
geron-cn
|
915cefa208
|
bone node
|
2015-07-23 11:51:49 +08:00 |
Vincent Yang
|
19c8f337da
|
Fixed #12918 : TMXXMLParser.cpp -- In the function getRectForGID have small errors
|
2015-07-23 11:01:51 +08:00 |
pandamicro
|
6029ca3edd
|
Merge pull request #12949 from yangws/issue_12906
Fixed #12906 : Can't add custom member to cocos2d::Scene subclass.
|
2015-07-22 16:17:14 +08:00 |
pandamicro
|
741163db40
|
Merge pull request #12938 from WenhaiLin/v3.8-deps70
Update deps for support FullType.
|
2015-07-22 15:42:13 +08:00 |
pandamicro
|
e0e5ae9d99
|
Merge pull request #12924 from liamcindy/SkyBox_3.7.1
update for Game3DNodeReader & UserCameraReader
|
2015-07-22 15:34:18 +08:00 |
Vincent Yang
|
3addf38134
|
Fixed #12906 : Can't add custom member to cocos2d::Scene subclass.
|
2015-07-22 12:01:34 +08:00 |
WenhaiLin
|
d0d481fd67
|
updated version to v3-deps-70
|
2015-07-21 16:43:47 +08:00 |
pandamicro
|
85d4ce0d5a
|
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into v3
Conflicts:
cocos/scripting/lua-bindings/auto/lua_cocos2dx_ui_auto.hpp
docs/RELEASE_NOTES.md
tools/cocos2d-console
tools/tojs/cocos2dx.ini
|
2015-07-21 11:39:24 +08:00 |