pandamicro
f64105b3dc
Merge pull request #14047 from liamcindy/v3.9
...
update for light3d reader
2015-10-10 11:43:05 +08:00
pandamicro
ee3399a4a4
Merge pull request #14097 from TheCodez/patch-1
...
Add missing getChildByTag<>() api
2015-10-10 09:43:46 +08:00
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
fuxiao
be4724ef47
issues #14050 ActionManager memory leak
2015-10-09 10:07:26 +08: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
wighawag
6ebdd3baf9
allow to use custom shader uniforms and attributes on drawNode
2015-09-23 10:34:35 +01: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
andyque
c4d8ebc780
add Two APIs to Node.
...
1. add getNodeToParentTransform(Node* ancestor)
2. add getNodeToParentAffineTransform(Node* ancestor)
2015-07-20 13:49:23 +08:00
WenhaiLin
63326c2826
Label:Fixed opacity setting is invalid with bitmap font.
2015-07-20 11:10:17 +08:00
WenhaiLin
731de26795
Label:Fixed system font may be invisible when there are multiple cameras.
2015-07-17 17:45:11 +08:00
子龙山人
0ea8dca299
Merge pull request #12881 from WenhaiLin/v3.7-label-gb2312
...
Label:support font that contains GB2312 char map.
2015-07-17 17:33:52 +08:00
fusijie
d828c030cb
remove CCClippingRectangleNode transform error support.
2015-07-17 11:56:23 +08:00
子龙山人
89e5307f0c
Merge pull request #12867 from WenhaiLin/v3.8-label-letter-color
...
Label:Fixed the color of letter will be overridden by fade action.
2015-07-17 11:29:58 +08:00
子龙山人
0b0b25c517
Merge pull request #12872 from zilongshanren/remove-emscript-code
...
remove EMSCRIPTEN related code
2015-07-17 10:08:34 +08:00
WenhaiLin
f0b29814c3
Label:support font that contains GB2312 char map.[android]
2015-07-16 21:35:10 +08:00
WenhaiLin
a6f8031af9
Label:support font that contains GB2312 char map.[except android]
2015-07-16 17:10:05 +08:00
子龙山人
a72ea73e60
Merge pull request #12863 from fusijie/fix_polygonsprite_setColor
...
fix polygon sprite setColor, setOpacity, setTexture, setTextureRect.
2015-07-16 14:51:06 +08:00
andyque
7c665e6447
remove EMSCRIPTEN related code
2015-07-16 14:15:41 +08:00
pandamicro
490d5a3747
Remove cleanup from auto bindings add made it support override in JS
2015-07-16 14:09:26 +08:00
WenhaiLin
d5d5af5ac3
change ‘auto’ to ‘auto&&’
2015-07-16 14:08:59 +08:00
WenhaiLin
1c9a181c35
Label:Fixed the color of letter will be overridden by fade action.
2015-07-15 20:17:05 +08:00
Jacky
e4b392d4c8
fix polygon sprite setColor, setOpacity, setTexture, setTextureRect.
2015-07-15 16:27:29 +08:00
子龙山人
d291afe295
Merge pull request #12856 from fusijie/fix_rendertexture_backtofront
...
fixed renderTexture switch foreground to background issue.
2015-07-15 14:32:40 +08:00
Jacky
a204b02668
fixed renderTexture switch foreground to background issue.
2015-07-15 13:47:10 +08:00
andyque
e4cad50c2f
fix tons of warnings
2015-07-15 12:04:48 +08:00
子龙山人
49b47f576d
Merge pull request #12828 from WenhaiLin/v3-label-readability
...
Label:improving the code readability.
2015-07-14 16:38:53 +08:00
andyque
91dfb07a8c
add more descriptive message to ASSET macro.
2015-07-14 15:28:36 +08:00
WenhaiLin
b701fd9e73
Fixed compile error
2015-07-14 13:47:35 +08:00
WenhaiLin
964713355b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-label-createfail
2015-07-14 13:43:43 +08:00
WenhaiLin
d4f62a8063
Label:improving the code readability.
2015-07-14 11:30:56 +08:00
andyque
ef5d4ddf86
Merge remote-tracking branch 'upstream/v3' into v3
...
# Conflicts:
# tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters
2015-07-14 11:24:38 +08:00
andyque
fc673ee502
Merge branch 'v3.7-release' into v3
2015-07-13 22:44:54 +08:00
子龙山人
cdc7e5205b
Merge pull request #11995 from MAUSMAUSgames/v3
...
using Action::_tag as flag field
2015-07-13 22:19:03 +08:00
子龙山人
c151ba89e5
Merge pull request #12774 from WenhaiLin/v3-label-createfail
...
Label:Fixed create fail if the font(TTF) not contain a Unicode charmap.
2015-07-13 21:58:39 +08:00
pandamicro
8944e932a1
Merge pull request #12786 from WenhaiLin/v3-animation-getCurrentFrame
...
Add Animate:getCurrentFrameIndex
2015-07-13 20:48:01 +08:00
pandamicro
36e1f26570
Fix CCSprite ; missing
2015-07-13 16:44:33 +08:00
WenhaiLin
80dff7f1c4
Rollback pr12299
2015-07-13 11:32:25 +08:00
WenhaiLin
dee13756ec
Add Animate:getCurrentFrameIndex
2015-07-13 10:40:43 +08:00
WenhaiLin
81bc0b09da
Label:Fixed create fail if the font(TTF) not contain a Unicode charmap.
2015-07-10 14:39:21 +08:00
pandamicro
07fd337052
Merge pull request #12763 from folgerhu/v3.7-release
...
CCTMXXMLParser code negligence
2015-07-10 11:49:30 +08:00
Liam
e50fc4f184
merge code
2015-07-09 17:12:48 +08:00
folgerhu@sina.com
a79586c052
CCTMXXMLParser code negligence
2015-07-09 17:02:12 +08:00
子龙山人
8e256dcd09
Merge pull request #12718 from WenhaiLin/v3-label-addchild
...
Label:Support add child nodes.
2015-07-09 15:37:49 +08:00
pandamicro
cab670f0ff
Merge pull request #12748 from fusijie/refineSetTexture
...
refine setTexture.
2015-07-09 14:56:06 +08:00
WenhaiLin
41bc3a1900
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3.8
...
Conflicts:
AUTHORS
2015-07-09 11:11:34 +08:00
Jacky
1dbb2ab17a
refine setTexture.
2015-07-09 10:11:15 +08:00
Jacky
02597eb369
Completed test case and comment.
2015-07-08 22:34:33 +08:00
WenhaiLin
6a33702c80
Refine Label::onDraw
2015-07-08 17:59:24 +08:00
Jacky
a59828605b
Support TileGrid rectangle.
2015-07-08 17:47:04 +08:00
Jacky
4a9e9f3744
completed api.
2015-07-08 17:26:29 +08:00
Jacky
260ce177d7
refine GridNode with rect.
2015-07-08 15:57:27 +08:00
WenhaiLin
8cf27b9174
Update comments.
2015-07-08 15:30:34 +08:00
子龙山人
3f550ef331
Merge pull request #12663 from xiaofeng11/v3.7-release
...
Fix drawLine & drawPoints won't use blendFunc bug
2015-07-08 14:38:10 +08:00
子龙山人
2bcd70f681
Merge pull request #12726 from xpol/fixes-warnings-and-related-bug-in-CCSprite
...
Fixes some warnings and a related bug in CCSprite.
2015-07-08 14:12:40 +08:00
Jacky
06c06a1f03
fix polygon sprite bug.
2015-07-08 10:07:35 +08:00
xpol
29dcbe6685
Fixes some warnings and a related bug in CCSprite.
...
This story tells us that we should not just ignore warnings.
2015-07-07 23:01:24 +08:00
Neo Kim
160bff8e13
Add a setter for line width in DrawNode
2015-07-07 18:48:02 +09:00
WenhaiLin
581f1ab42b
Add test case
2015-07-07 15:41:54 +08:00
WenhaiLin
158d96046e
Label:Support add child nodes.
2015-07-07 14:20:23 +08:00
子龙山人
f28fbdd0c4
Merge pull request #12683 from neokim/add_scroll_bar_into_scroll_view
...
Add scroll bar feature into ScrollView
2015-07-07 13:56:09 +08:00
子龙山人
a6b29666c9
Merge pull request #12674 from WenhaiLin/v3-38-issue12673
...
Label:Fixed the characters are displayed incorrect with "dark roast.ttf"
2015-07-07 09:50:00 +08:00
Neo Kim
86cbd59bfd
Add UIScrollViewBar.cpp into CMake and Windows project configuration.
2015-07-04 09:56:53 +09:00
WenhaiLin
c11e91e215
Label:Fixed the characters are displayed incorrect with "dark roast.ttf"
2015-07-03 18:08:32 +08:00
Liam
64b8660873
update for skybox reader
2015-07-03 17:52:42 +08:00
Vincent Yang
ca02f167c6
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2015-07-03 15:43:58 +08:00
Vincent Yang
1abeb8bf1e
Fixbug: CCTargetedAction executes callback twice.
2015-07-03 15:42:49 +08:00
XiaoFeng
993e420ce4
Fix drawLine & drawPoints won't use blendFunc bug
2015-07-03 11:30:38 +08:00
pandamicro
1b22438792
Merge branch 'v3.7-release' of https://github.com/cocos2d/cocos2d-x into merge-v3.7
...
Conflicts:
cocos/ui/UICheckBox.cpp
2015-07-03 10:23:49 +08:00
pandamicro
e7aeb335a3
Merge pull request #12609 from alexpeak/fixCCLabelPurgeResetOrder
...
Ensure CCLabel atlases are purged before resetting
2015-07-02 19:01:50 +08:00
子龙山人
5b971ee93d
Merge pull request #12607 from neokim/add_radio_button_and_group
...
Add RadioButton and RadioButtonGroup widgets
2015-07-02 17:12:59 +08:00
pandamicro
a95edbfb65
Merge pull request #12618 from super626/clippingnode2
...
Sprite3D Clipping
2015-07-01 18:56:16 +08:00
Vincent Yang
cb0e93fc08
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_scene3dtest
2015-07-01 14:58:06 +08:00
WenhaiLin
322bd30d7b
Label:Fixed the top of character's texture may be tailored if enable outline effect.
2015-07-01 14:57:01 +08:00
Vincent Yang
d26c08de46
Merge branch 'v3_scene3d_fixvisitingcamera' into v3_scene3dtest
2015-07-01 14:47:42 +08:00
pandamicro
2774d6ff1d
Merge pull request #12602 from yangws/v3_scene3dtest
...
Fixed bug: UI component can't click correctly by moving UI and camera far away of origin.
2015-07-01 14:46:35 +08:00
yangxiao
269feeb1f9
remove stencil from Renderstate
2015-07-01 14:06:37 +08:00
Neo Kim
a64e50688e
Add the new files into CMake and Windows project configurations.
2015-07-01 12:21:42 +09:00
Alex Peak
5328996a18
Fix event listener cleanup in destructor
...
Event listeners should always be removed at destroy (move out of
if-block)
2015-06-30 18:59:33 -07:00
Alex Peak
7cea464a11
Ensure CCLabel atlases are purged before resetting
...
The current purge->reset behavior occurs per label according to scene
graph priority. This has two disadvanages; firstly, any labels that are
initialized but not part of the scene graph will not be reset.
Secondly, any labels which share atlases in the FontAtlasCache may not
be reset since each label will call releaseFontAtlas individually before
resetting its fontConfig. This means that any shared atlases may not be
released all the way to a reference count of 0 and the invalid atlas
will not be deleted and reset from scratch.
By putting a fixed priority on both the purge and reset steps we can
ensure that firstly: all labels will be reset regardless of whether they
have been added to the scene-graph. Secondly, ALL labels with the same
atlas must call releaseFontAtlas before any others are allowed to
rebuild their textures. This will prevent any old atlases from sticking
around after a new GL context is created.
This is a fix for Github issue #8305
https://github.com/cocos2d/cocos2d-x/issues/8305
2015-06-30 13:16:25 -07:00
子龙山人
40521ad1c4
Merge pull request #12600 from fusijie/fix_spritebatchnode_sort_error
...
Fix SpriteBatchNode sort error.
2015-06-30 17:29:59 +08:00
子龙山人
3b4d134050
Merge pull request #12603 from jianglong0156/autoPolygonFileEncode
...
change the file encoding,
2015-06-30 16:29:44 +08:00
jianglong0156
bc341edf1f
change the file encoding,
...
It display a coded warning in current encoding, leading to incredbuild unusable
2015-06-30 15:33:54 +08:00
Vincent Yang
2ba6f266ad
Fixed bug: UI component can't click correctly by moving UI and camera far away of origin.
2015-06-30 14:32:14 +08:00
Jacky
25bac2f6a9
Fix SpriteBatchNode sort error.
2015-06-30 14:12:18 +08:00
WenhaiLin
3cb29bbc65
[ci skip]Fixed warns
2015-06-25 10:53:41 +08:00
pandamicro
9445aeacb7
Merge pull request #12456 from super626/camera
...
quaternion instead of euler angle
2015-06-23 13:16:39 +08:00
WenhaiLin
fbe1bd8253
Label should be invisible when the line height is set to zero.
2015-06-23 09:42:48 +08:00
yangxiao
d252250968
quaternion instead of euler angle
2015-06-19 18:46:14 +08:00
子龙山人
869e3c5243
Merge pull request #12444 from WenhaiLin/v3-37-label-linewrapfix
...
Label:Fixed line wrap error without space.
2015-06-19 15:08:13 +08:00
WenhaiLin
d32a317ea0
Label:Fixed line wrap error without space.
2015-06-19 13:39:19 +08:00
pandamicro
4d588c7837
Merge pull request #12423 from WenhaiLin/v3-37alpha0-warnfix
...
Fixed warn
2015-06-18 15:09:36 +08:00
WenhaiLin
05522afaa1
Fixed warn
2015-06-18 14:24:52 +08:00
Huabing.Xu
92824537ac
fix compile error for linux
2015-06-18 11:15:45 +08:00
Vincent Yang
187437068f
Fixed bug: wrong usage of isVisitableByVisitingCamera, which should only effect draw call.
2015-06-18 10:32:30 +08:00
Vincent Yang
f8a5b1e18c
Fixed bug: UI component can't click correctly by moving UI and camera far away of origin.
2015-06-18 10:23:52 +08:00
Dale Stammen
fd0605416e
moved clipper files to external/clipper filter in VS solution
2015-06-17 11:48:56 -07:00
Dale Stammen
9ef92b71dd
added missing external/clipper files. Removed obsolete files
2015-06-17 11:40:38 -07:00
pandamicro
bb275351f0
Merge pull request #12363 from super626/v3
...
Fix terrain lod computing bugs
2015-06-17 17:49:39 +08:00
pandamicro
6f6c317f87
Merge pull request #12386 from WenhaiLin/v3-label-spacefix
...
Label:Fixed wrong letter spacing with outline enabled
2015-06-17 15:16:49 +08:00
Wenhai Lin
cbd428f6ac
Label:Fixed wrong letter spacing with outline enabled
2015-06-17 13:57:23 +08:00
Jacky
3c5ab4f518
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon2
...
# Conflicts:
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
2015-06-17 13:04:24 +08:00
Jacky
13e0fb22f5
fix compile on linux platform.
2015-06-17 11:34:19 +08:00
songchengjiang
c08a355a06
fix the bug of light
...
replace atanf with atan2f
2015-06-17 11:17:46 +08:00
Dale Stammen
eb2bc78970
Merge branch 'v3' into v3-winrt-librecast
2015-06-16 07:13:53 -07:00
WuHao
3b56d2a66f
fix cmake for cmake platforms
2015-06-16 16:15:19 +08:00
pandamicro
0866180918
Merge pull request #12162 from namezero111111/patch-4
...
JumpTo::clone() results in incorrect end position
2015-06-16 13:37:04 +08:00
WuHao
aeeed0f4ab
Merge remote-tracking branch 'origin' into fix_spritepolygon
...
# Conflicts:
# external/config.json
2015-06-16 11:19:20 +08:00
Dale Stammen
8d8e7d6cb9
Merge branch 'v3' into v3-winrt-librecast
2015-06-15 19:27:40 -07:00
子龙山人
0b5c7d74b7
Merge pull request #12160 from namezero111111/patch-3
...
Blink::stop() access violation
2015-06-16 10:27:38 +08:00
Dale Stammen
0781978788
added librecast. Updated build properties
2015-06-15 18:44:14 -07:00
Dale Stammen
03fc2eca5e
added missing navmesh files
2015-06-15 18:19:28 -07:00
Dale Stammen
9262cc95bf
fixed project filters broken by recent additions of files
2015-06-15 11:38:52 -07:00
Ricardo Quesada
c17da7e90d
Removes not-needed draws
2015-06-15 10:40:47 -07:00
WuHao
27d0f51e9b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
build/cocos2d_tests.xcodeproj/project.pbxproj
cocos/2d/libcocos2d.vcxproj.filters
tools/cocos2d-console
web
2015-06-15 16:13:36 +08:00
pandamicro
0216d05eee
Merge pull request #12102 from super626/navigation2
...
3D Navigation
2015-06-15 13:39:05 +08:00
yangxiao
16a0ddc74e
rename CCNavMeshTool to CCNavMeshUtils
2015-06-15 12:52:55 +08:00
Ricardo Quesada
32aae46343
fixes
2015-06-12 15:37:29 -07:00
Ricardo Quesada
2a3347dd49
RenderState: default state fixes
...
parts of cocos2d code calls GL directly.
This should be avoided since v3.7 since the
`RenderState::StateBlock::_defaultState` won't know that
and the state will be invalid.
In order to fix this issue, after calling GL directly, you should
update the `_defaultState` manually.
2015-06-12 15:03:48 -07:00
pandamicro
9806c09b0e
Merge pull request #12299 from WenhaiLin/v3-label-cropped
...
Label:the texture of character have not cropped if character cross the axis-aligned bounding-box.
2015-06-12 21:33:09 +08:00
pandamicro
f9057b3f32
Merge pull request #12284 from pandamicro/v3
...
Fix template android compilation issue on physics3d
2015-06-12 21:10:40 +08:00
子龙山人
c01d1fe00a
Merge pull request #12310 from WenhaiLin/v3-particlefile-key
...
Fixed ParticleSystem may using wrong texture if the particle PLIST file created via ParticleDesigner.
2015-06-12 16:44:12 +08:00
Jacky
29c108bdef
Merge remote-tracking branch 'origin' into fix_spritepolygon2
...
# Conflicts:
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
2015-06-12 16:28:41 +08:00
WenhaiLin
9f5a36b817
Fixed ParticleSystem may using wrong texture if the particle PLIST file created via ParticleDesigner.
2015-06-12 11:03:32 +08:00
pandamicro
b1b9c808eb
Merge pull request #12074 from samuele3hu/v3_material
...
Issue #10570 : Make getItemForTouch of Menu virtual.
2015-06-12 08:21:18 +08:00
WenhaiLin
5aa31ea83a
Label:the texture of character have not cropped if character cross the axis-aligned bounding-box.
2015-06-11 17:16:44 +08:00
yangxiao
44c2b0d5ad
merge cocos
2015-06-11 15:54:42 +08:00
samuele3hu
17b1dee363
Merge branch 'fix_spritepolygon2' of https://github.com/Wu-Hao/cocos2d-x into v3_update_spritepolygon
2015-06-11 14:39:35 +08:00
samuele3hu
1b20e463d8
Update the Lua binding about the Polygon and update the test case.
2015-06-11 14:38:38 +08:00
Vincent Yang
097bf455c2
Rename CCRenderBufferObject to CCRenderBuffer in windows projects.
2015-06-11 11:45:10 +08:00
Jacky
a32fec8471
change clipper version to 6.1.3.
2015-06-11 10:45:37 +08:00
pandamicro
70606caa14
Fix template android compilation issue on physics3d
2015-06-10 19:37:52 +08:00
Jacky
4b5bcc06a1
remove draw points and add expand precision.
2015-06-10 18:54:53 +08:00
Jacky
b41c60dbdb
Merge remote-tracking branch 'origin/v3' into fix_spritepolygon2
...
# Conflicts:
# external/config.json
2015-06-10 10:23:43 +08:00
Huabing.Xu
10352c40b2
Merge branch 'v3' into v3FrameBufferObject
...
# Conflicts:
# cocos/2d/CCCamera.h
2015-06-10 10:16:42 +08:00
Jacky
88b3fc3c7e
fix memory leakage about operation=
2015-06-09 18:45:55 +08:00
Huabing.Xu
b79eec0b20
fix grid bug for viewport
2015-06-09 17:24:30 +08:00
Huabing.Xu
ef4978f0cd
move viewport to experimental namespace
2015-06-09 16:21:50 +08:00
Jacky
d8369dda94
fix on the wp8 universal.
2015-06-09 16:00:51 +08:00
Huabing.Xu
3e331128c6
file rename CCFrameBufferObject->CCFrameBuffer
2015-06-09 15:32:12 +08:00
yangxiao
e433ad305b
decopule physics and navmesh from Director
2015-06-09 13:49:07 +08:00
Jacky
74aed5ae85
fix on the android.
2015-06-09 13:47:29 +08:00
Jacky
562d4b9a78
fix on the windows.
2015-06-09 11:23:37 +08:00
Huabing.Xu
9acab65e4f
rename FrameBufferObject->FrameBuffer
...
Move FrameBufferObject related class to experimental namespace
2015-06-09 10:59:43 +08:00
Dale Stammen
a2b677d300
Merge branch 'v3' into v3-winrt-ogg
2015-06-08 08:22:46 -07:00
子龙山人
54e23f15e6
Merge pull request #12179 from WenhaiLin/v3-37-physics-ap
...
Node:Fixed the anchor point can only be Vec2::ANCHOR_MIDDLE after setting physics body.
2015-06-08 16:12:56 +08:00
WuHao
a67e570ef7
deleted more leftover comments, placed polygon test further down the tests
2015-06-08 15:40:18 +08:00
WuHao
e175815c70
deleted some leftover comments in sprite
2015-06-08 15:17:46 +08:00
WuHao
2650de030c
modified tests to show current epsilon
2015-06-08 15:08:16 +08:00
子龙山人
03892caed5
Merge pull request #12206 from super626/fixphysics3d2
...
3D Physics: remove addChildToPhysics
2015-06-08 14:13:38 +08:00
WuHao
a555b2fb52
added documentation for auto polygon
2015-06-08 13:59:44 +08:00
WuHao
0808b6aff9
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix_spritepolygon
...
Conflicts:
cocos/2d/MarchingSquare.cpp
2015-06-08 13:59:26 +08:00
Jacky
3e62dd0473
remove unused file and code.
2015-06-06 13:31:25 +08:00
Dale Stammen
47b5085ade
Merge branch 'v3' into v3-winrt-ogg
2015-06-05 05:36:15 -07:00
子龙山人
c5c96042ef
Merge pull request #12181 from namezero111111/patch-5
...
TintBy::clone() incorrect cast
2015-06-05 15:27:43 +08:00
yangxiao
d50c1823d4
merge cocos
2015-06-05 14:25:37 +08:00
yangxiao
761944f507
remove addChildToPhysicsWorld for 3d object
2015-06-05 13:54:09 +08:00
Dale Stammen
3f3ace05a7
added ogg support for Windows 10 UWP
2015-06-04 14:42:11 -07:00
Jacky
afa422d898
fixed copy constructor and operation = bug.
2015-06-04 18:27:58 +08:00
WuHao
5b572ab803
Polyinfo is no longer a pointer
2015-06-04 16:20:00 +08:00
Namezero
19f95c5542
TintBy::clone() incorrect cast
...
TintBy::clone() incorrectly casts the GLshort members to GLubyte, resulting in an object that isn't a clone and an incorrect tint.
2015-06-04 10:13:34 +02:00
pandamicro
2c168130ed
Fix jsbinding calls for CCComponent
2015-06-04 15:59:05 +08:00
pandamicro
86d372222c
Merge branch 'v2_addOnEnterAndOnExitToCCNode' of https://github.com/chengstory/cocos2d-x into compJSB
2015-06-04 15:54:58 +08:00
WuHao
0a51c9bd27
Finished AutoPolygon and Sprite
2015-06-04 15:43:31 +08:00
WenhaiLin
bd718bb85f
Node:Fixed the anchor point can only be Vec2::ANCHOR_MIDDLE after setting physics body.
2015-06-04 14:57:37 +08:00
zhangcheng
6a53cfdc76
1, modify space format.
2015-06-04 14:08:47 +08:00
zhangcheng
8d3d3a0348
1, Add onAdd and onRemove function to replace onEnter and onCancel used in onAdd and onRemove of ComponentContainer.
2015-06-04 14:06:31 +08:00
yangxiao
ded5c36271
Merge branch 'navigation2' of https://github.com/super626/cocos2d-x into navigation2
2015-06-04 12:46:12 +08:00
yangxiao
8b5333a5c9
Merge branch 'newcode' into navigation2
2015-06-04 12:44:39 +08:00
anniruddh.koppal
84fad34daf
Added ogg support to audio engine. Fixed issues #150 and #151
2015-06-03 20:57:14 -07:00
子龙山人
831ca47b13
Merge pull request #12158 from WenhaiLin/v3-letter-space
...
Label:Fixed letter spacing may be wrong.
2015-06-04 10:51:25 +08:00
zhangcheng
55995ece1a
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v2_addOnEnterAndOnExitToCCNode
2015-06-04 10:38:39 +08:00
zhukaixy
f891a0b124
configure navi for winodow phone
2015-06-04 10:00:15 +08:00
子龙山人
95934bf310
Merge pull request #12168 from MSOpenTech/v3-winrt-js-fix
...
V3: Fixes for Windows 8.1 Universal App JavaScript
2015-06-04 09:22:21 +08:00
Dale Stammen
18ce48dc2a
/NODEFAULTLIB:MSVCRT to fix linker warning
2015-06-03 09:26:15 -07:00
Namezero
c09e280b58
JumpTo::clone() results in incorrect end position
...
JumpTo::clone() passes incorrect value to (_delta) to create() rather than _endPosition
2015-06-03 13:14:11 +02:00
Namezero
89915a084c
Blink::stop() access violation
...
Blink::stop() is calles twice when inside a Repeat action. This results in an access violation
2015-06-03 12:39:16 +02:00
WenhaiLin
ffa7dc6b5a
Label:Fixed letter spacing may be wrong.
2015-06-03 16:28:44 +08:00
zhangcheng
a51a32fa9d
1, add onEnter and onExit of components to CCNode's onEnter and onExit function.
2015-06-03 15:10:48 +08:00
zhukaixy
76ad42bb0b
configure recast project for win8.1 project
2015-06-03 14:31:12 +08:00
Ricardo Quesada
5f6f38616a
Merge remote-tracking branch 'cocos2d/v3' into material_custom_uniforms
2015-06-02 17:05:05 -07:00
Ricardo Quesada
87a3a1844a
Adds support for Autobindings in Shader
...
...part of Material
2015-06-02 16:56:59 -07:00
yangxiao
3d4606921b
merge cocos
2015-06-02 14:27:31 +08:00
WuHao
3c5326ba1f
removed spritePolygon, merge into sprite and draft of AutoPolygon
2015-06-02 10:10:09 +08:00
Huabing.Xu
27d0f6328f
origin code of viewport
2015-06-01 14:26:08 +08:00
Huabing.Xu
739923a4a3
Merge branch 'v3' into v3Viewport
2015-06-01 09:41:45 +08:00
Dale Stammen
e0c65c203a
Merge branch 'v3' into v3-uwp
2015-05-29 08:09:05 -07:00
WuHao
3d62805d04
Merge branch 'v3' into fix_spritepolygon
...
# Conflicts:
# build/cocos2d_libs.xcodeproj/project.pbxproj
# cocos/2d/MarchingSquare.cpp
2015-05-29 18:10:41 +08:00
yangxiao
c782d63bef
add 3d navigation
2015-05-29 16:45:33 +08:00
Jacky
e69a6116fa
make SpritePolygonInfo extend from Ref.
2015-05-29 16:44:06 +08:00
Huabing.Xu
9bf15877e5
add applyViewport in camera.
2015-05-29 15:52:06 +08:00
Jacky
8df4920f6e
fixed file name.
2015-05-29 15:03:36 +08:00
Huabing.Xu
2f32fcabba
Merge branch 'v3FrameBufferObject' into v3Viewport
2015-05-29 14:10:49 +08:00
Huabing.Xu
b2579a754a
refactor, use Camera::apply() to apply Rendertarget and Viewport
2015-05-29 14:08:20 +08:00
Huabing.Xu
1fb0ba112b
init code for viewport
2015-05-29 13:47:29 +08:00
Vincent Yang
b714dde0ea
Add opengl version project/unproject function in camera.
2015-05-29 10:44:48 +08:00
Huabing.Xu
22ddf53539
Merge branch 'v3FrameBufferObject' into v3
2015-05-29 10:38:42 +08:00
Dale Stammen
8584f5f399
removed old WP8 files
2015-05-28 15:03:36 -07:00
Dale Stammen
2a71407501
fixed double to float conversion compiler warning
2015-05-28 15:00:49 -07:00
Dale Stammen
dadbbc18d6
added Windows 10 UWP project files
2015-05-28 13:51:25 -07:00
Dale Stammen
962393233f
removed old winrt property sheets
2015-05-28 13:12:37 -07:00
子龙山人
a76018041e
Merge pull request #12077 from WenhaiLin/v3-label-mlinefix
...
Text:Fixed the scale factor may be incorrect with multiline text.
2015-05-28 17:20:33 +08:00
Huabing.Xu
2d6d1b7a8c
add android background and foreground switch support for framebufferobject
2015-05-28 17:08:36 +08:00
MAUSMAUSgames
847cba026c
added _flags to Action, change API to stopActionsByFlags
2015-05-28 09:52:49 +02:00
WenhaiLin
c60112a634
Text:Fixed the scale factor may be incorrect with multiline text.
2015-05-28 11:56:43 +08:00
samuele3hu
9a4a545025
Issue #10570 : Make getItemForTouch of Menu virtual.
2015-05-28 11:41:49 +08:00
子龙山人
b8fdb152fd
Merge pull request #12026 from andyque/fix-android-9-patch-asset-issue
...
fix assert failure of NinePatchImageParser and rapidjson
2015-05-27 11:17:31 +08:00
Dale Stammen
06a5f7ed7a
moved CCNinePath files to base folder in solution
2015-05-26 09:48:25 -07:00
Dale Stammen
d146f26144
define RAPIDJSON_ENDIAN=RAPIDJSON_LITTLEENDIAN to fix broken ARM builds
2015-05-26 09:46:15 -07:00
Vincent Yang
d7ad7221e4
ciskip add doc for camera::getnear/farplane().
2015-05-26 18:14:37 +08:00
andyque
c668001e73
fix assert failure of NinePatchImageParser and rapidjson
2015-05-26 17:20:10 +08:00
Vincent Yang
246913c092
Fix bug: skybox can't move to other position except origin point in world space.
2015-05-26 17:14:26 +08:00
Huabing.Xu
83bae15caf
Merge branch 'v3FrameBufferObject' of github.com:dabingnn/cocos2d-x into v3FrameBufferObject
...
# Conflicts:
# cocos/2d/libcocos2d.vcxproj.filters
# cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
2015-05-26 12:06:05 +08:00
Huabing.Xu
c22a8e81ce
Merge branch 'v3' into v3FrameBufferObject
2015-05-25 16:56:22 +08:00
minggo
bcc1bf8d32
Merge pull request #11983 from dabingnn/v3_SpriteWithTrianglesCommand
...
use trianglescommand for sprite
2015-05-25 16:48:22 +08:00
MAUSMAUSgames
98c3ba6f4b
using Action::_tag as flag field
...
adding options to use tag as flag field to Node::stopAllActionsByTag
and ActionManager::removeAllActionsByTag
2015-05-24 17:30:26 +02:00
minggo
311f453ea0
Merge pull request #11973 from dabingnn/v3_fixCameraVisitError
...
Fix visiting scene error with multiple camera
2015-05-22 17:16:30 +08:00
Huabing.Xu
6d9f850e2c
use trianglescommand for sprite
2015-05-22 15:54:56 +08:00
minggo
27b7f2dd19
Merge pull request #11969 from WenhaiLin/v3-TMXTiledMap-crash
...
TileMap:Fixed crash if referring a non-existent layer in TMX.
2015-05-22 14:37:23 +08:00
Huabing.Xu
0644efc55e
isVisitableByVisitingCamera should not affect the calculation of transform
2015-05-22 13:59:45 +08:00
WenhaiLin
fdde58386f
experimental::TileMap:Fixed crash if referring a non-existent layer in TMX.
2015-05-22 11:14:34 +08:00
WenhaiLin
2f558b5793
Merge branch 'tmx-crash-fix' of https://github.com/dumganhar/cocos2d-x into v3-support-android-studio
2015-05-22 11:01:13 +08:00
minggo
d5d329b74f
Merge pull request #11946 from andyque/v3-final-android-9-patch-feature
...
add Android 9-patch image format support
2015-05-22 09:52:12 +08:00
Dale Stammen
382d681250
added winrt version of CCUserDefault
2015-05-21 11:23:36 -07:00
andyque
0352a7a3ea
add Android 9-patch image format support
...
commit c214c4a7a457275785d6377031b5a267d543ffbb
Author: andyque <guanghui8827@126.com>
Date: Mon May 18 17:16:09 2015 +0800
Add Android 9-patch format support.
Squashed commit of the following:
commit a5a5a7a8f25b5bddae0ba21c56676a3f8d84102a
Author: andyque <guanghui8827@126.com>
Date: Mon May 18 17:08:05 2015 +0800
finish refactoring
commit 730bf817f833de56999c616779fc0279890e14bf
Author: andyque <guanghui8827@126.com>
Date: Mon May 18 11:47:08 2015 +0800
refactoring 9-patch
commit b45be6d54ac6e70a3fb9aa3eb700b252e4e72a54
Author: andyque <guanghui8827@126.com>
Date: Mon May 18 09:42:06 2015 +0800
refactor
commit 384110193f1d581c4a0fb7a2c771c55f1db63cbf
Author: andyque <guanghui8827@126.com>
Date: Fri May 15 17:59:21 2015 +0800
fix lua and Android compile error
commit 2877538fb3a436f95400b2ad637ea147b9df81d7
Author: andyque <guanghui8827@126.com>
Date: Fri May 15 11:32:43 2015 +0800
Add Android 9-patch image format support.
The 9-patch format is used for creating Scale9Sprite.
2015-05-21 16:04:37 +08:00
andyque
03e8f16a8a
add vs2015 support
2015-05-21 13:55:01 +08:00
子龙山人
9ac23a5436
Merge pull request #11933 from kobake/fix-typo-angel
...
Fix typo: "angel" to "angle"
2015-05-21 09:37:53 +08:00
kobake
d6f7a0a8a1
Fix typo. angel -> angle
2015-05-21 09:22:59 +09:00
Dale Stammen
209e7c62f4
added libbullet to Windows 8.1 Universal App projects
2015-05-20 08:01:01 -07:00
James Chen
07f6774cee
Crash fix for referring a non-existent layer in tmx.
2015-05-20 11:29:52 +08:00
Jacky
bbaa60bbbb
change to autopolygon.
2015-05-20 06:07:50 +08:00
anniruddh.koppal
ea345717c7
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-winrt-audio
2015-05-18 23:40:28 -07:00
Vincent Yang
628619a694
Add CCFrameBufferObject files to win32 and win8 vcproj.
2015-05-19 11:53:08 +08:00
minggo
bb3ad7d249
Merge pull request #11677 from tankorsmash/patch-1
...
Fix setSprite never updating progress on ProgressTimer
2015-05-19 11:42:20 +08:00
Jacky
514c8ae965
move sprite polygon logic to sprite polygon cache.
2015-05-19 11:25:53 +08:00
anniruddh.koppal
e0b3091dcf
Merge branch 'v3' of https://github.com/MSOpenTech/cocos2d-x into v3-winrt-audio
...
Conflicts:
tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters
2015-05-18 19:21:48 -07:00
Jacky
bcfa29a7d7
fixed memory leakage.
2015-05-18 15:52:46 +08:00
Jacky
d21f85787e
fixed memory leakage, remove unused header, fixed reference args.
2015-05-18 15:10:41 +08:00
Huabing.Xu
f96e704f7d
Merge branch 'v3' into v3FrameBufferObject
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/cocos2d.h
cocos/renderer/CCGLProgramCache.cpp
2015-05-18 13:48:50 +08:00
Huabing.Xu
384041a950
improve the perfermance of clear background for camera
2015-05-18 10:31:17 +08:00
anniruddh.koppal
2db5a89b87
Added new audio engine with wav support
2015-05-15 18:17:52 -07:00
Jacky
19c5d2dc84
fixed some memory leakage and pixel cutting.
2015-05-15 17:18:19 +08:00
Huabing.Xu
84540c1ff4
Merge branch 'v3' into v3_CameraMaskFor2DAnd3DRendering
...
Conflicts:
cocos/renderer/CCGLProgramCache.cpp
tests/cpp-tests/Classes/controller.cpp
2015-05-14 11:55:10 +08:00
Huabing.Xu
42514ee62f
FrameBufferObject works
2015-05-13 14:24:53 +08:00
Ricardo Quesada
a83c10fdbf
Merge pull request #11807 from ricardoquesada/material_vertexattrib
...
Adds support of VertexAttribBinding per Pass
2015-05-12 21:05:02 -07:00
Ricardo Quesada
d23ff0ea2c
Adds support of VertexAttribBinding per Pass
2015-05-12 19:58:09 -07:00
minggo
5c227f4c92
Merge pull request #11528 from hobogenized/my_fix_branch
...
Minor changes in variable names to fix Xcode warnings
2015-05-13 10:03:33 +08:00
minggo
5e87bd307b
Merge pull request #11798 from WenhaiLin/v3-support-vs2015
...
Add support for visual studio 2015.
2015-05-13 09:37:12 +08:00
Huabing.Xu
f0acf7ee7b
original version of frame buffer object
2015-05-12 16:43:17 +08:00
WenhaiLin
c70bac7bb4
Add support for visual studio 2015.
2015-05-12 16:26:28 +08:00
minggo
398d36b58a
Merge pull request #11788 from joshuastray/spritepolygon
...
SpritePolygon binding and tests for js
2015-05-12 13:46:22 +08:00
Ricardo Quesada
1937431596
Material uses new file format
...
The new file format is easier to read and less error prone
It also fixes many bugs and adds new test cases
2015-05-11 21:31:33 -07:00
joshuastray
7a4ca3fe6a
add new files to project
2015-05-12 10:40:51 +08:00
Huabing.Xu
cc0b3ffd2e
Merge branch 'v3' into v3_addClearforCamera
...
Conflicts:
cocos/renderer/CCGLProgramCache.cpp
tests/cpp-tests/Classes/controller.cpp
2015-05-12 09:49:15 +08:00
WenhaiLin
7e0dc7482b
Label:Fixed the characters with outline not on the same base line.
2015-05-11 18:05:03 +08:00
minggo
bcd57c3d90
Merge pull request #11776 from samuele3hu/v3_physics3d
...
Add macro limitation for Physic3D related
2015-05-11 16:09:19 +08:00
samuele3hu
9e9494ded0
Add limited macro for related Physic3D
2015-05-11 15:34:37 +08:00
Dale Stammen
351a898a70
removed CC_PLATFORM_WP8
2015-05-08 09:19:13 -07:00
yangxiao
2391558c96
add physics3d support
2015-05-08 15:49:33 +08:00
Huabing.Xu
713831ca76
fix rendering of camera clear quad
2015-05-08 14:21:23 +08:00
Huabing.Xu
f064587ae5
refactor camera clear to immediate rendering
2015-05-07 18:32:32 +08:00
samuele3hu
23e4e0d4e3
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_remove_vs2012
2015-05-07 16:21:03 +08:00
Huabing.Xu
67ec758d15
add clear feature when before draw scene with a camera
2015-05-07 15:09:06 +08:00
minggo
65ec7f9545
Merge pull request #11728 from WenhaiLin/v3-label-pos
...
Label: Fixed position is wrong if label content is changed after invoking `getLetter(letterIndex)`
2015-05-07 13:42:28 +08:00
minggo
a718c11eb6
Merge pull request #11724 from andyque/fix-binding-generator
...
fix upstream compile error
2015-05-07 11:47:20 +08:00
WenhaiLin
03a1167902
Merge branch 'v3-label-pos' of https://github.com/WenhaiLin/cocos2d-x into v3.7
2015-05-07 11:31:59 +08:00
Wenhai Lin
d09bd21da4
Label: Fixed position is wrong if label content is changed after invoking `getLetter(letterIndex)`
2015-05-07 11:20:22 +08:00
samuele3hu
87db3aba78
Add $(EngineRoot)external for cocos2d_headers.props
2015-05-07 11:11:33 +08:00
andyque
db95034798
fix android compile error
2015-05-07 10:37:19 +08:00
minggo
fb112995d8
Merge pull request #11491 from milos1290/tween
...
Adding FloatAction to animate any property over time.
2015-05-07 09:34:44 +08:00
minggo
ba1e77d656
Merge pull request #11720 from WenhaiLin/v3-label-outline
...
Label:Fixed outline doesn't match with the characters exactly.
2015-05-07 09:30:37 +08:00
WenhaiLin
b1803d40db
Label:Fixed outline doesn't match with the characters exactly.
2015-05-06 17:17:30 +08:00
minggo
6351863b3c
Merge pull request #11696 from WenhaiLin/v3-label-shadow-glerror
...
Label:Fixed shadow effect cause OpenGL error on IOS.
2015-05-06 09:53:39 +08:00
minggo
37302d6d8f
Merge pull request #11704 from MSOpenTech/v3-winrt-fix
...
V3: WinRT updated output name to libcocos2d_v3.7
2015-05-06 09:41:11 +08:00
Ricardo Quesada
26bca75e0e
Merge pull request #11708 from ricardoquesada/no_exceptions
...
No throws in cocos2d-x code
2015-05-05 17:57:28 -07:00
Ricardo Quesada
10b71464a7
No throws in cocos2d-x code
2015-05-05 17:17:41 -07:00
Ricardo Quesada
90c9dffc1a
cleanup Material Code
...
- removes unused code
- removes experimental code
2015-05-05 15:59:41 -07:00
Dale Stammen
22951e8a6a
updated output name to libcocos2d_v3.7
2015-05-05 14:54:33 -07:00
Ricardo Quesada
ce95bfe059
Squashed commit of the following:
...
commit 3676fd8b4fe09be74fe10a6e2b8d6043cd016a2a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 5 11:46:57 2015 -0700
compiles on win32
commit 0b8d30a3f8b2656e714846a62ca8a94b303efbdc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 5 11:01:04 2015 -0700
compiles on windows!
commit 8cad22273ec2d9b74ef22196afcb8aa2f2bd8a6c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 5 10:20:13 2015 -0700
windows fix
CALLBACK is defined in windows. Use CALLBACK_FN instead
commit 33eff5c09c30e5ba6c8e61a69d1be0696d0b5d15
Merge: 17c5102 f843466
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue May 5 09:51:02 2015 -0700
Merge remote-tracking branch 'cocos2d/v3' into material_system
commit 17c5102215e60c9e9b8b69ceb6b61b84b657ec91
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon May 4 17:05:49 2015 -0700
Material system works Ok.
Deftaul states are being applyied to RenderState::StateBlock::_default
state as well!
commit 3f5285102ef95c77c505d0f2174f8f77b9bd86e1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon May 4 15:52:09 2015 -0700
more fixes for material
blending works as expected
commit 347eaea42248eb07bc77844dcee56dcbcf0fbcb2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon May 4 12:14:00 2015 -0700
compiles on Android
compiles on Android
commit 5feef67410a6e8408414230887c177a5cc3d8c35
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon May 4 11:01:46 2015 -0700
Cmakefiles
works with Cmake again
commit 1366da20efd4f63f683ac9264e18aa71d84bcc71
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat May 2 18:17:50 2015 -0700
Particle3D working Ok with its own uniforms
commit c6cfa32e1f693e6d71d00e0cd9dd9610ca1e7663
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 1 17:32:00 2015 -0700
MeshCommand now works 100% on Material!
commit 92d641e29675ffc58daba48fcdcc5ec6459be02f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 1 15:49:14 2015 -0700
multiple meshes work Ok
commit 842927d18b5605b2fd1bd3a679fc25418c7eeab8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 1 13:43:56 2015 -0700
Adds `clone` to GLProgramState
commit c4b8e222f8e852254b1f23f0e17c16dfca7cc5ca
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 30 18:54:34 2015 -0700
adds comment about the glprogramstate bug
commit 2d008ec90557025507e0b17284e60b39fc9b42d3
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 30 18:28:39 2015 -0700
some uniforms moved to Material
commit 11f59f87079a6cb698c7e9b5a55735f6d51cf420
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 30 16:52:07 2015 -0700
depth test moved to Material!
commit 4dabb53641c293bfe8c417fe3491ec33b33ffc4e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 30 13:12:28 2015 -0700
Material/Technique/Pass subclass of RenderState
Inheritance of RenderState. Code from GamePlay3D
commit a8b888dc30cf7ab4fae186acec2a366dfb967116
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 30 12:05:26 2015 -0700
same as v3
commit c026de5318a2a03beed1de6d7a0efda431569a5c
Merge: 4561e3f 254a4b0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 30 11:37:40 2015 -0700
Merge remote-tracking branch 'cocos2d/v3' into material_system
commit 4561e3f5763849872d888a3be9ebbdcfb1a7bf9d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 29 18:02:21 2015 -0700
fixes on blending
commit 1b4cd8fd1c7b2a489b6a52ab6d42548eb7c7fac0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 29 17:51:05 2015 -0700
better defaults for StateBlock
commit 3a661c35908aa075754d7b9dfac45be1af3b38e9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 29 17:46:36 2015 -0700
RenderState::bind() binds lots of states
commit 074d5fb4a485e4ac32996c345e314594806e3cf0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 29 16:40:07 2015 -0700
Adds REnderState parsing in .material
commit 7c0f098b7e2e198aa4a821bfbdec661eeba2587e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 29 16:06:31 2015 -0700
RenderState added into RenderState
Code based on GamePlay3D. Adds GamePlay3d License.
commit 04a6295ca5839e2e1202881b8a10733685c113d6
Merge: 52c916f 5671818
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 29 11:27:55 2015 -0700
Merge branch 'v3' into material_system
commit 52c916fb4df04558433b1370102a5e9269f73607
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 28 18:15:12 2015 -0700
order files alphabetically
order files alphabetically
commit a5f54f0c1ca5d997a87e0231ce1b28d3c8d9ca64
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 28 17:46:07 2015 -0700
Adds cmake and android support
commit 2432b1dd2ec3c7db78d4d9e5e7b9fbe491b95884
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 28 16:33:50 2015 -0700
for some reason the callback was crashing
... bug in the callback code?
in any case, we didn't need it and it was making the code slower.
commit 7844d32d04cb411ddae139d9598adcb04b899606
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 28 14:00:24 2015 -0700
more little fixes
commit 2992a5e0f4a8dfac87d6aab37e101154f8b41519
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 28 12:11:28 2015 -0700
MeshCommand using Material internally
works
commit 67a435d66b4e554b4d24e462ca2ad42408157e69
Merge: 6dee7ca b9a994f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 28 10:34:03 2015 -0700
Merge remote-tracking branch 'cocos2d/v3' into material_system
commit 6dee7cac6a51b4c123aabb111b0f8951082b1507
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Apr 27 17:41:27 2015 -0700
improved readebility of MeshCommand code
commit 3a57eb200f7cba4a17f512060dd3f121d83e32fd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Apr 27 15:41:07 2015 -0700
mesh supports Material
`Mesh` supports `Material`
Now `MeshCommand` needs to implement it correctly.
commit 2fc745c787555fbd5c6b100b0a2833ef0e65ad73
Merge: 05b16f5 bd5f4e0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Apr 27 11:23:28 2015 -0700
Merge branch 'v3' into material_system
commit 05b16f5c6f783ff38b4ae54528f9b949d8bb39a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 24 17:40:48 2015 -0700
Adding Material into Mesh
WIP.
commit bc62f1a146ff9ad9864d8ff317f6a9540760066a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 24 16:39:54 2015 -0700
cosmetic
commit 2f86d50cee15c6af20abb512368aa36dc4ed3ccf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 24 16:26:41 2015 -0700
moves even more code form Sprite3D to Mesh
commit 04643bed3c277f0a775e962a5c87f550b1a59e74
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 24 16:15:21 2015 -0700
Moves "draw" from `Sprite3D` to `Mesh`
commit 4bf884cdcb1a8df7522adeab364368493aba11e0
Merge: 2f305fc 2199bf1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 24 15:00:50 2015 -0700
Merge remote-tracking branch 'cocos2d/v3' into material_system
commit 2f305fc68ad847fd4bdf855611c6f6f6a4bf63d2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 24 14:46:28 2015 -0700
cosmetic
commit a697b43a96e5f9440787aa2a1c4e178d98b2e5bc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 23 16:44:21 2015 -0700
revert my changes...
...actually the GLProgramState code was Ok... ouch
commit 36323c62eae2f8dbdcd7e13075758752cce44132
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 23 15:40:54 2015 -0700
parsing GLProgramState validates the attributes
commit a406d6236a78244f73e81ded0b4148199a8677e5
Merge: 3be7fde cf177bb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 23 12:10:31 2015 -0700
Merge remote-tracking branch 'cocos2d/v3' into material_system
commit 3be7fdee9d88a14916b4f25b1c0b6f50cb619c04
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 22 17:45:34 2015 -0700
little progress on Sprite3D + Material
GLProgramState needs to decouple Uniforms from Attributes in
`applyGLProgram`.
binding the attributes is something that needs to be done
at a different order.
Perhaps the attributes are part of a VAO or something else.
the method `applyAttributes()` has a variable to avoid that...
but everything looks very hackish.
commit f82496c61c9cb5a0787f883a4fb2d475889fa711
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 22 15:46:02 2015 -0700
doesn't crash :)
but doesn't show anything either
commit 0593fb09dc987aa2dd22af3a6c3aa8241fedfe5f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 22 13:35:45 2015 -0700
adding sprit3d test
commit e716da63fe053b48db06f2aed9e0280256dd5f1b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 22 12:10:32 2015 -0700
MeshCommand: initial draw with Material
commit d758041d81c3e6275997205e6395c46006bcc4ca
Merge: 8cdc99f ca1a95f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 22 10:41:05 2015 -0700
Merge remote-tracking branch 'cocos2d/v3' into material_system
commit 8cdc99fca664b0c9c2a536d431ffcc7844d69b3e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 21 21:57:28 2015 -0700
adding Material to MeshCommand
commit 0121872709c5e584b9b9f102e0f8dfc9c836841b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 21 19:39:09 2015 -0700
pre commit before merging MeshCommand
commit 06c0ac2a67e303bde98dff75ac436ec22de59263
Merge: 736feb1 0287b42
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 21 18:19:00 2015 -0700
Merge remote-tracking branch 'cocos2d/v3' into material_system
commit 736feb1b6495b7411525afb130015bdb31b5c471
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Apr 20 17:22:03 2015 -0700
Pass conforms to create()/init() pattern
commit 6103ffbb8479681b6665e81f0572bc3287919d07
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Apr 20 17:04:19 2015 -0700
defines are strings
better error checking when creating objects
autorelase added in Pass, Material, Technique
commit 1efcbab63c7ca4259d50825144184baee1b577ac
Merge: 5b233bc fd3e38b
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Apr 20 11:23:47 2015 -0700
Merge remote-tracking branch 'cocos2d/v3' into material_system
commit 5b233bc879bd65123092d366257843465ec1d306
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 17 15:31:37 2015 -0700
blur effect works with alpha
commit 836d3c4a0dcc3a363e1b0290e628b7ac2a973c89
Merge: e4c1dd2 425b2b6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 17 15:04:35 2015 -0700
Merge remote-tracking branch 'cocos2d/v3' into material_system
commit e4c1dd23d8b28f2631efe30f6cc9da9eda4501bb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 17 15:04:07 2015 -0700
Material, Technique, Pass: they have parent
commit 7c3f258a1c9e4ff319db4e3eebfd39006d673d91
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 16 21:48:06 2015 -0700
multipass works
commit b73ede73b72d8305f6f9d7898b4a5aa2336e9e32
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 16 17:31:04 2015 -0700
yeah!
more materials... a lot to do yet
commit d54d24ed185071ce1350bbf71914a64c9f6f228e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 16 17:06:46 2015 -0700
yeah! works!
commit 1e70cb553148e6c136df42a789bf85184e73762d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 16 16:43:54 2015 -0700
simple test of material system works!!!
commit c8581dfe9e970a3004254987416d75cccc644ccd
Merge: 83aeec4 5d5fa3d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 16 13:51:45 2015 -0700
Merge remote-tracking branch 'cocos2d/v3' into material_system
commit 83aeec41c7933ee46f5763ad64dcdc71a50885dc
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 15 18:04:23 2015 -0700
JSON file curated
fixes minor bugs
commit 35f669e7fad6257ff6e60023e95ec757fdfe23f5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 15 17:22:36 2015 -0700
parsers shaders!
including uniforms
commit 3f58bad0b2bc7ebbcfcf74e1eb02048f9d574340
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 14 23:24:18 2015 -0700
Material parses texture
commit 1f678faf9d6c25f6405591f052da511281be8768
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 14 18:22:33 2015 -0700
material parsing almost working
commit 9a79c45fe4d735a772d5e6d9e1f8bcb02546560d
Merge: d0ff296 d54ddbd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Apr 14 09:23:23 2015 -0700
Merge branch 'v3' into material_system
commit d0ff2960f4f9edc4714f9d3edf921f3365d305c7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Apr 13 18:42:42 2015 -0700
json parsing broken
ha... I need to parse the content of the file, to the name of the file.
to be fixed tomorrow
commit e5aab39e5774d997f848155fc7209e9fbbd03bbc
Merge: 81e93fa bc34554
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Apr 13 10:19:11 2015 -0700
Merge branch 'v3' into material_system
commit 81e93faac9d80888e975ee19d7412c54daf439a0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 10 17:41:12 2015 -0700
Adds more dummy files for material
commit 5552a1e099bcf960d962c5369973ea663f802895
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 10 17:01:16 2015 -0700
adds empty test
commit 7027c85fb24109f1ed4c50877dbec35618b5b39c
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 10 15:36:24 2015 -0700
more material fixes
multiple passes added in renderer
commit db6745ead9879c6ce66b1921f32bf927421c54d9
Merge: 58d2412 8a160d7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 10 11:52:30 2015 -0700
Merge branch 'v3' into material_system
commit 58d241266bdbd88162bb7ae9a7e868af173e6375
Merge: 0eccb23 b409f20
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 9 15:42:35 2015 -0700
Merge branch 'v3' into material_system
commit 0eccb236aa933eb471416258c5bb55a7ca3a24f0
Merge: 83494de 967f35a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 9 15:18:34 2015 -0700
Merge branch 'cpp_compiles_on_mac' into material_system
commit 83494dedd0f4e7092f0267187cf07bd7de7723c2
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 9 15:09:59 2015 -0700
compiles on Mac
commit cca5b060164182b67df21fa330dce938e17fb324
Merge: dfc3740 09c50c4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 9 13:54:59 2015 -0700
Merge branch 'v3' into material_system
commit dfc374099ca02e547478d24fa8fd61817a85862c
Merge: fa2152b 64c45fa
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 8 14:16:27 2015 -0700
Merge branch 'v3' into material_system
commit fa2152b3402e3519d35f98309c4acc03b6790370
Merge: 90b7b6f b648d1f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 3 10:15:28 2015 +0800
Merge branch 'v3' into material_system
commit 90b7b6f6540edff156e22fdf38021a5c83194deb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri Apr 3 10:13:24 2015 +0800
little changes to pass
commit 7f8b83017f03572a3698f431b6af497d62fcfa25
Merge: 7460614 0779d05
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 2 08:36:43 2015 +0800
Merge branch 'v3' into material_system
commit 7460614dd8b7eff5d8c759be54dd205333b26033
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Apr 2 08:23:17 2015 +0800
small changes
commit fa0354e74983795adafad3bedc9c50f6e8e328c9
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu Mar 26 18:20:46 2015 -0700
initial Material system
2015-05-05 13:07:32 -07:00
WenhaiLin
8f6277c540
Label:Fixed shadow effect cause OpenGL error on IOS.
2015-05-05 18:30:33 +08:00
minggo
902c033838
Merge pull request #11683 from WenhaiLin/v3-label-i10576
...
Label:Fixed the character positions could be wrong if `getLetter(letterIndex)` get called.
2015-05-05 18:19:33 +08:00
samuele3hu
f1b5729183
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_7_remove_vs2012
2015-05-05 16:14:57 +08:00
samuele3hu
037c17fe5d
Remove vs2012 support in v3
2015-05-05 16:11:26 +08:00
minggo
701d5fa827
Merge pull request #11673 from vovkasm/dev/v3-cleanup
...
Fix warnings in v3.
2015-05-05 11:26:10 +08:00
WenhaiLin
22c46b5c14
Label:Fixed the character positions could be wrong if `getLetter(letterIndex)` get called.
2015-05-04 10:07:37 +08:00
TankorSmash
88833213ca
Fix setSprite never updating progress on ProgressTimer
...
Basically whenever you set a new sprite on a ProgressTimer, the new sprite is hidden.
Calling setPercentage once with the same value doesn't work because the new percentage is the same as the old one. I've got a workaround setting the percentage to 0 and then back to the old value, but this change seems to solve that issue entirely.
2015-05-03 14:35:50 -04:00
WenhaiLin
004cb5464e
Fixed crash
2015-05-03 22:15:58 +08:00
Vladimir Timofeev
fd3e44b72b
Fix warning in the ClippingNode class. Do not define the setProgram(Node*,GLProgram*) helper function on 'non OpenGL ES' platforms.
2015-05-01 12:36:19 +03:00
WenhaiLin
7472bafee3
Label:When you invoking `getLetter(letterIndex)` and `setString(text)` in sequence, and `letterIndex` greater than the length of `text`, it might crash your program.
2015-04-30 15:13:41 +08:00
minggo
4acd231f89
merge v3.6
2015-04-30 13:46:08 +08:00
Dale Stammen
904abeab87
added CC_WINDOWS_PHONE_8_1 to preprocessor defines
2015-04-29 09:48:14 -07:00
WenhaiLin
ce7e36f76e
Fixed warns and crash on Win32.
2015-04-28 20:10:56 +08:00
Milos Jakovljevic
0343fd4061
Changing the name of the Action, adding more comments
2015-04-28 11:48:19 +02:00
WenhaiLin
1af9ce8483
Merge branch 'v3.6' of https://github.com/cocos2d/cocos2d-x into v3.6
2015-04-28 13:36:34 +08:00
andyque
854fcdf2bf
fix spritepolygon
2015-04-28 11:26:21 +08:00
andyque
a6a2dddfe9
fix spritepolygon
2015-04-28 10:51:26 +08:00
WenhaiLin
41e2d84116
Fixed compile error on VS 2012.
2015-04-28 10:35:21 +08:00
WuHao
a046f74c4d
fix anchor point bug
2015-04-27 17:30:38 +08:00
WuHao
dcf8f674bc
Merge branch 'v3.6' of https://github.com/Wu-Hao/cocos2d-x into v3.6
...
Conflicts:
cocos/2d/SpritePolygon.cpp
cocos/2d/SpritePolygonCache.cpp
2015-04-27 17:18:26 +08:00
WuHao
815c6a9b74
merge the start and end points
2015-04-27 16:33:54 +08:00
samuele3hu
3de665b9cd
Update SpritePolygon
2015-04-27 15:19:26 +08:00
WuHao
c7e990dcae
Merge branch 'v3.6' of https://github.com/Wu-Hao/cocos2d-x into v3.6
...
Conflicts:
cocos/2d/SpritePolygon.cpp
2015-04-27 13:39:41 +08:00
WuHao
9f2ea5fbb9
fixed some SpritePolygon create, added more tests
2015-04-27 13:34:47 +08:00
samuele3hu
d7dbb910d0
Update SpritePolygonCache
2015-04-27 11:57:36 +08:00
samuele3hu
cf53d13f6f
Update SpritePolygon.cpp
2015-04-27 11:07:08 +08:00
samuele3hu
6f17dcecf2
Update config.json for 3rd-party-libs and SpritePolygonCache
2015-04-27 11:01:47 +08:00
WuHao
c2cefadb6f
Merge branch 'v3.6' of https://github.com/Wu-Hao/cocos2d-x into v3.6
2015-04-27 10:44:56 +08:00
WuHao
cd0ebc1801
fix the info struct
2015-04-27 10:44:23 +08:00
samuele3hu
bd5ca083e9
Fix the compile error of SpritePolygonTest on the win32 and wp8.1
2015-04-26 23:08:14 +08:00
Jacky
633c1aed75
Add EaseRateAction::create() method.
2015-04-24 18:31:44 +08:00
WuHao
9496a48800
Merge branch 'v3.6' of https://github.com/cocos2d/cocos2d-x into v3
2015-04-24 18:29:23 +08:00
WuHao
c1d10ffa1c
fixed poly2tri creation method, added testCase
2015-04-24 18:28:28 +08:00
WuHao
5620da1adf
fixed anchor point issue, removed rect rotated property
2015-04-24 18:17:12 +08:00
WuHao
0e318dd8dc
fixed UV issue, also taking account of contentScaleFactor, made test case better
2015-04-24 17:39:43 +08:00
minggo
0198c8707b
Merge pull request #11572 from super626/v3
...
Fix memory leak
2015-04-24 16:42:33 +08:00
XiaoFeng
07725ce84d
fix
2015-04-24 11:40:15 +08:00
WuHao
07349ff588
initial cpp test
2015-04-23 18:03:03 +08:00
XiaoFeng
faddbd8e71
Add function to texture cache for studio to check if texture have been already loaded
2015-04-23 16:50:28 +08:00
WuHao
ada7ced0a8
change getVecCount to ssize_t
2015-04-23 16:40:11 +08:00
WuHao
1ee87140b1
renamed PolySprite to SpritePolygon
2015-04-23 14:34:56 +08:00
samuele3hu
7c77bc9587
Add the PolySprite support and adjust the project setting on the different platform
2015-04-23 00:51:47 +08:00
Dale Stammen
0f3ff6f762
Merge branch 'v3' into v3-winrt-typo-fix
2015-04-21 18:18:00 -07:00
Dale Stammen
84a47000b5
rename -win to -winrt
2015-04-21 18:17:18 -07:00
Dale Stammen
a2ed8e7234
disable INCREMENTAL for ARM builds. Fixes lnk2013 error
2015-04-21 08:38:19 -07:00
lvlong
4f96037e15
1. Merge branch 'v3' of github.com:super626/cocos2d-x into v3
...
2. fix bug: memory leak!
2015-04-21 19:38:38 +08:00
hobogenized
22df7df76a
Renamed shadowed variables to reduce confusion when reading source code
2015-04-20 22:57:55 -04:00
minggo
7a1a021974
Merge pull request #11517 from andyque/fix-widget-gray-shader-issue
...
Fix widget gray shader issue
2015-04-21 09:34:18 +08:00
andyque
484153aff7
remove ui shaders in windows platform
2015-04-20 17:54:49 +08:00
andyque
1e514f0a2b
fix freetype include path on win-8.1
2015-04-20 15:54:31 +08:00
Vladimir Perminov
4c33050536
Optimize Vec2
...
small function Vec2 move to Vec2.inl
Added:
setZero();
Change all code:
_vec2 = Vec2(x, y); -> _vec2.set(x, y);
Vec2 vec2 = Vec2(x, y); -> Vec2 vec2(x, y);
_vec2 += Vec2(x, y); -> _vec2.add(x, y);
_vec2 = Vec2::ZERO; -> _vec2.setZero();
Vec2 vec2(Vec2::ZERO); -> Vec2 vec2;
2015-04-19 20:40:52 +03:00
Milos Jakovljevic
a13c519882
Adding FloatAction to animate any property over time.
2015-04-18 14:35:14 +02:00
WenhaiLin
9c2e39dd49
Label:Fixed the shadow color of system font may be incorrect.
2015-04-17 15:42:41 +08:00
WenhaiLin
5a438ed9a1
Label:Fixed the shadow effect of system font might not be shown.
2015-04-17 15:26:43 +08:00
WenhaiLin
0ac99002d5
Label:disableEffect(LabelEffect::XXXX) support disable all effect.
2015-04-17 14:39:52 +08:00
lvlong
f55af40016
fix bug: label action in multiple cameras.
2015-04-17 10:19:20 +08:00
Dale Stammen
b1c9c34c19
added Windows Image Component support for Windows 8.1 Universal App
2015-04-15 09:19:38 -07:00
Dale Stammen
081b9ccac2
updated freetype include path
2015-04-15 08:20:03 -07:00
Dale Stammen
c9eb2790be
updated chipmunk and freetype libs
2015-04-15 08:08:18 -07:00
Dale Stammen
b700798287
removed WP8 project files
2015-04-15 07:13:54 -07:00
minggo
4211b20134
Merge pull request #11414 from likexx/patch-1
...
Update CCLabel.cpp
2015-04-14 10:06:09 +08:00
minggo
d246c33974
Merge pull request #11413 from WenhaiLin/v3-label-sf-position
...
Label:Fixed the position of system font is wrong if it is visited by a new camera.
2015-04-14 09:59:09 +08:00
minggo
06a2042a11
Merge pull request #11345 from IgorMats/v3
...
Add getStroke/setStroke methods for motion streak.
2015-04-14 09:36:03 +08:00
Igor Mats
e54a51be02
Fix comment.
2015-04-13 19:24:19 +03:00
likexx
6f341e3284
Update CCLabel.cpp
...
in rare case, the texture atlas becomes NULL. Added an additional check to make sure it won't crash here.
2015-04-13 20:53:34 +08:00
WenhaiLin
d24a1243da
Label:Fixed the position of system font is wrong if it is visited by a new camera.
2015-04-13 18:22:05 +08:00
WenhaiLin
9ef04943a8
Label:Fixed System font can't scale.
2015-04-13 16:28:55 +08:00
minggo
9cc03407a8
Merge pull request #11383 from WenhaiLin/v3-physics-rotation
...
Physics: Fixed the rotation of PhysicsBody is wrong if the rotation of node is set before PhysicsBody attached.
2015-04-10 18:12:43 +08:00
Wenhai Lin
1949348124
Physics: Fixed the rotation of physics body is wrong if the rotation for node is set before body attached.
2015-04-10 17:01:21 +08:00
minggo
698d93a42b
Merge pull request #11379 from WenhaiLin/v3-physics-fix
...
Physics: Fixed position of physics body is wrong when the position of parent node changes
2015-04-10 16:45:45 +08:00
Wenhai Lin
97082cb169
Physics: Fixed position of physics body is wrong when the position of parent node changes
2015-04-10 15:39:39 +08:00
andyque
c8d8a0d220
add disableEffect API for ui::Text
2015-04-10 14:18:16 +08:00
Igor Mats
f5c61b4f9a
Ooops.
2015-04-09 13:36:17 +03:00
Igor Mats
60759764ff
Add getStroke method.
2015-04-09 12:05:21 +03:00
Igor Mats
7f24eb0cf6
Add setStroke method.
2015-04-08 21:55:24 +03:00
Dale Stammen
c88e8064c7
updated dll name to v3.6
2015-04-08 07:51:40 -07:00
andyque
24c0c8d811
fix wp8 compile issue
2015-04-08 18:01:56 +08:00
andyque
f52899c257
update freetype2 and chipmunk on wp8 and wp8.1
2015-04-08 16:21:19 +08:00
minggo
e9cdf333f9
Merge pull request #11246 from xiaofeng11/v3
...
V3 reader fix
2015-04-08 11:46:40 +08:00
andyque
8a4a7344b0
fix freetype include
2015-04-08 09:24:34 +08:00
WenhaiLin
927cda3f0d
Add Label::disableEffect(LabelEffect effect) for better support disable the effect of Label.
2015-04-07 15:51:57 +08:00
minggo
eb928432ce
Merge pull request #11302 from WenhaiLin/v3-label-shadowcolor
...
Label: Fixed shadow color is incorrect.
2015-04-07 15:27:19 +08:00
minggo
353c2b0d75
Merge pull request #11288 from perminovVS/v3-dev-optimize-vec3
...
Optimize Vec3
2015-04-07 14:04:57 +08:00
WenhaiLin
c5c5d3e39d
Label: Fixed shadow color is incorrect.
2015-04-07 11:17:01 +08:00
minggo
deaa6a19f0
Merge pull request #11257 from super626/terrain
...
Terrain
2015-04-07 09:32:35 +08:00
XiaoFeng
16aa704ffd
Merge branch 'v3' of github.com:xiaofeng11/cocos2d-x into v3
2015-04-07 09:11:14 +08:00
XiaoFeng
4929d8102a
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2015-04-07 09:06:06 +08:00
Ricardo Quesada
a782eb022d
fixes warnings on Xcode 6.3
...
instead of using `abs()` it uses `std::abs()`
2015-04-06 12:08:30 -07:00
Vladimir Perminov
105bac2d55
Optimize Vec3
...
small function Vec3 move to Vec3.inl
Added:
add(float xx, float yy, float zz);
setZero();
Change all code:
_vec3 = Vec3(x, y, z); -> _vec3.set(x, y, z);
Vec3 vec3 = Vec3(x, y, z); -> Vec3 vec3(x, y, z);
_vec3 += Vec3(x, y, z); -> _vec3.add(x, y, z);
_vec3 = Vec3::ZERO; -> _vec3.setZero();
2015-04-05 13:09:50 +03:00
zhukaixy
6eb86f736c
add for wp8 support --ziwen.tang
2015-04-03 17:12:44 +08:00
yangxiao
7ea1c1ac1f
reset
2015-04-03 16:15:09 +08:00
tangziwen
0193420dfc
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into terrain
...
Resovle Conflicts:
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
2015-04-03 15:45:51 +08:00
tangziwen
ee41c9b3f1
add win rt support
2015-04-03 14:36:29 +08:00
Huabing.Xu
cb77d0145a
Merge pull request #11266 from WenhaiLin/v3-at01
...
Add getInScene,getDuration for TransitionScene class.
2015-04-03 11:50:44 +08:00
WenhaiLin
f2dc7958bf
Add getInScene,getDuration for TransitionScene class.
2015-04-03 11:49:15 +08:00
WenhaiLin
a544eadab8
MenuItem: Fixed crash if MenuItem::onExit is called multiple times.
2015-04-02 23:27:07 +08:00
yusheng.lu
82c6e623e0
Remove CCNodeReader.h/cpp from libcocos2d_8_1.Shared.vcxitems, libcocos2d_8_1.Shared.vcxitems.filters
2015-04-02 10:15:36 +08:00
minggo
6cf344ded6
Merge pull request #10827 from mogemimi/remove-useless-cast-and-cleanup
...
Remove useless (char*) casts in CCTMXXMLParser.cpp
2015-04-02 09:45:22 +08:00
xiaofeng11
ea8538117b
Merge pull request #7 from pipu/remove_CCNodeReader
...
Remove CCNodeReader.h/.cpp.
2015-04-01 14:12:09 +08:00
pipu
41661830ff
Remove CCNodeReader.h/.cpp.
2015-04-01 13:37:36 +08:00
yusheng.lu
01a091ef2c
Delete CCNodeReader for Win8.1 project
2015-04-01 11:49:36 +08:00
minggo
eefd06415b
Merge pull request #11229 from xiaofeng11/v3
...
Add destroyCocosStudio()
2015-04-01 10:49:49 +08:00
pipu
bc7d8f0a09
Add method destroyCocosStudio() for CocoStudio
2015-03-31 19:55:56 +08:00
samuele3hu
6c528c4a42
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_5_test
2015-03-30 15:51:01 +08:00
samuele3hu
c3ad458a26
Update comment for Lua
2015-03-30 15:47:47 +08:00
andyque
b5d10fb246
Merge branch 'v3' into fix-remaining-missing-comments
...
Conflicts:
cocos/base/CCIMEDelegate.h
2015-03-30 10:56:42 +08:00
yangxiao
b469cfa928
merge cocos
2015-03-30 10:28:14 +08:00
VisualSJ
9ba82584a9
[ci skip] Add javascript notes...
...
cocos/2d/CCClippingNode.h
cocos/2d/CCTMXTiledMap.h
cocos/2d/CCTMXObjectGroup.h
cocos/2d/CCTMXLayer.h
cocos/2d/CCSpriteBatchNode.h
cocos/2d/CCSprite.h
cocos/2d/CCRenderTexture.h
cocos/2d/CCProtectedNode.h
cocos/2d/CCMenuItem.h
cocos/2d/CCMenu.h
cocos/2d/CCLabelAtlas.h
cocos/2d/CCLabel.h
cocos/2d/CCGrid.h
cocos/2d/CCGLBufferedNode.h
cocos/2d/CCFastTMXTiledMap.h
cocos/2d/CCFastTMXLayer.h
cocos/2d/CCDrawingPrimitives.h
cocos/2d/CCDrawNode.h
cocos/2d/CCComponentContainer.h
cocos/2d/CCClippingRectangleNode.h
cocos/2d/CCTextFieldTTF.h
cocos/2d/CCTileMapAtlas.h
2015-03-28 14:28:16 +08:00
andyque
e3fc9b082e
Finish the missing comments
2015-03-27 20:56:12 +08:00
minggo
b03900bbbf
fix doxygen comment
2015-03-27 17:09:54 +08:00
Wenhai Lin
8f3bbe3c40
[ci skip]Update comments
2015-03-27 15:25:44 +08:00
Jacky
d9b0c67f65
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into cocosapi
...
Conflicts:
cocos/2d/CCNode.h
2015-03-27 13:43:38 +08:00
Jacky
4edf9e76fd
update comments.
2015-03-27 12:07:19 +08:00
minggo
29c5da8429
Merge pull request #11189 from SuYaoHui/cocosapi
...
Add comments
2015-03-27 11:46:02 +08:00
SuYaohui
17bd26e9d4
Add comments
2015-03-27 11:39:31 +08:00
minggo
8b4f662ac0
Merge pull request #11179 from WenhaiLin/v3-doxygen
...
[ci skip]Fixed warnings when generating docs by doxygen.
2015-03-27 11:10:43 +08:00
minggo
24aef7c6bb
Merge pull request #11164 from super626/texturecube
...
Texturecube
2015-03-27 11:06:28 +08:00
Wenhai Lin
fdffad3956
[ci skip]Fixed warnings when generating docs by doxygen.
2015-03-27 10:52:59 +08:00
zhangbin
58bc56f759
Solve the warning when generating docs by doxygen.
2015-03-27 10:17:33 +08:00
yangxiao
6cd1697240
config wp8 and add comment
2015-03-26 18:10:42 +08:00
andyque
42cd63fe01
fix group error
2015-03-26 15:47:14 +08:00
yangxiao
000e34c6d0
merge cocos
2015-03-26 12:50:18 +08:00
yangxiao
84535feb0c
merge cocos
2015-03-26 11:59:26 +08:00
minggo
52d53fd7ee
Merge pull request #11148 from andyque/finish-v3-comments
...
Add missing comments for UI modules
2015-03-26 10:02:42 +08:00
andyque
248325d055
Add missing comments for UI modules
...
Squashed commit of the following:
commit eb23bf8972d1a580db537f3d341091eaeb99d626
Author: andyque <guanghui8827@126.com>
Date: Wed Mar 25 17:08:07 2015 +0800
finish all the documents
commit a64ec4196eb1b41771ac2f7b2ba48845d22b6211
Author: andyque <guanghui8827@126.com>
Date: Wed Mar 25 09:49:33 2015 +0800
finish scrollview
commit 4ff76623230f19dd25c4de29e2816754524570b2
Author: andyque <guanghui8827@126.com>
Date: Tue Mar 24 21:40:26 2015 +0800
add UIScale9Sprite comments
Conflicts:
cocos/ui/UIScale9Sprite.h
commit e82a17b4e3cd07a03d4bfc906b0dc94d1fa08757
Author: andyque <guanghui8827@126.com>
Date: Tue Mar 24 18:05:02 2015 +0800
add comments for UIRichText
commit 7cbbcc6883ace0ef60a060f6c5808f4c296af4df
Author: andyque <guanghui8827@126.com>
Date: Mon Mar 23 22:08:26 2015 +0800
add comments for UIPageView and UIRelativeBox
commit 6fcf32a40d5407aefcba39e76aea5fb93a1a4e4a
Author: andyque <guanghui8827@126.com>
Date: Mon Mar 23 21:12:27 2015 +0800
finish loadingbar comments
commit 58e16b81dee833788018d913aef80e2ddd33d408
Author: andyque <guanghui8827@126.com>
Date: Mon Mar 23 20:51:30 2015 +0800
finished UiListView
commit 8278b3f1ee905c34dbd9c461975b1b4491eb7977
Author: andyque <guanghui8827@126.com>
Date: Mon Mar 23 20:06:10 2015 +0800
add comments for LayoutManager and LayoutParameter.
commit b2edfa06b83fbb0cdaf2f567c0d6f8d72e6f90c5
Author: andyque <guanghui8827@126.com>
Date: Mon Mar 23 17:09:17 2015 +0800
finish comments for UILayoutComponent
commit 730b5bc9c1a18139fbdef331b16c58b928cf999f
Author: andyque <guanghui8827@126.com>
Date: Fri Mar 20 14:07:58 2015 +0800
add missing comments
commit cecd97e830492e58dd07a2b1f5d0e87f19144856
Author: andyque <guanghui8827@126.com>
Date: Fri Mar 20 09:31:51 2015 +0800
add comments
commit ca0a6033bf61c7fc9caf70719ee5ea651953f580
Author: andyque <guanghui8827@126.com>
Date: Thu Mar 19 21:02:36 2015 +0800
add missing docs for UIButton, UILayout, UIIMageview and UIWidget
commit df98454583553e80d2ef4f72cc58de4b433f43c7
Author: andyque <guanghui8827@126.com>
Date: Thu Mar 19 14:02:05 2015 +0800
add missing comments for UIHbox and UIHelper
commit 4baf76dd92672b745d3d84e47e5fed8c680b01c7
Author: andyque <guanghui8827@126.com>
Date: Thu Mar 19 11:28:32 2015 +0800
add comments for UICheckbox
commit 77c4080b3c70268b6a07cfa12d1e9319c86a2f38
Author: andyque <guanghui8827@126.com>
Date: Thu Mar 19 00:01:42 2015 +0800
update coments
commit 4506327ace5b7786ee8b490aab1653462a834418
Author: andyque <guanghui8827@126.com>
Date: Wed Mar 18 20:32:57 2015 +0800
add comments for UIEditbox
commit 4937f30adb8912a02ab10353b6cc5fe2eed9d4bf
Author: andyque <guanghui8827@126.com>
Date: Wed Mar 18 10:51:20 2015 +0800
add missing comments for UIEditBox
commit 64a48c6b09f4eaf6b84cc8446ef59d382cf8767b
Author: andyque <guanghui8827@126.com>
Date: Wed Mar 18 10:12:08 2015 +0800
fix indentation problem
commit b38c921c114bb4a707be0f29dcdf8c46e43a445a
Author: andyque <guanghui8827@126.com>
Date: Wed Mar 18 10:08:46 2015 +0800
add missing comments for CCIMEDispatcher
commit 4412cf52429f22351a5c9fbb7c392bca64c2a2c6
Author: andyque <guanghui8827@126.com>
Date: Wed Mar 18 09:57:52 2015 +0800
add missing documents for CCIMedelegate
commit 53d3242f2cafde2bebedebe8353c6be625e5ce84
Author: andyque <guanghui8827@126.com>
Date: Wed Mar 18 09:43:33 2015 +0800
add missing documentation for CCTilemapatlas
commit 1f6183086b6e21557e5b05bf4cede43d472611a1
Author: andyque <guanghui8827@126.com>
Date: Wed Mar 18 09:38:59 2015 +0800
add missing comments for CCTextfieldttf
commit a7fe234153cebc4113cc97064d20dfd3515f9611
Author: andyque <guanghui8827@126.com>
Date: Tue Mar 17 22:03:31 2015 +0800
supplement comments for ProtectedNode
commit 3b02d22850b6a9e99e779ca09e5ce0b5bf24d602
Author: andyque <guanghui8827@126.com>
Date: Tue Mar 17 21:55:03 2015 +0800
add comments to CCMenuitem.h
commit 58e054c5cd28986e4420c2ae44af7e9a2beab4ce
Author: andyque <guanghui8827@126.com>
Date: Tue Mar 17 21:36:14 2015 +0800
add comments to Menu
2015-03-25 18:17:58 +08:00
minggo
51329ac130
Merge pull request #11136 from WenhaiLin/v3-doxygen
...
[ci skip]Update comments.
2015-03-25 11:10:08 +08:00
WenhaiLin
153d697f1a
[ci skip]Update comments.
2015-03-25 10:59:04 +08:00
minggo
671be8e157
Merge pull request #11131 from natural-law/v3
...
[ci skip] Update the group of CCClippingRectangleNode.
2015-03-25 09:48:41 +08:00
zhangbin
2f7397f6b9
Update the group of CCClippingRectangleNode.
2015-03-25 09:46:00 +08:00
Huabing.Xu
d06d575e6e
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3_comments
2015-03-24 23:01:18 +08:00
Huabing.Xu
133955dba1
[ci skip]update comments CCGrid.h CCGrabber.h CCGLBufferNode.h
2015-03-24 21:34:20 +08:00
WenhaiLin
9dd778edb0
[ci skip]Update comments
2015-03-24 20:23:51 +08:00
zhukaixy
3b8a796404
config project config file for cocos2d-win8.1-universal
2015-03-24 16:01:06 +08:00
WenhaiLin
2caff4e64d
[ci skip]Update comments
2015-03-24 14:12:58 +08:00
minggo
6cc8fb4348
Merge pull request #11092 from fusijie/cocosapi
...
[ci skip]update headers' module name.
2015-03-24 11:27:54 +08:00
Jacky
af12891cfc
[ci skip]update headers' module name.
2015-03-24 10:34:41 +08:00
minggo
2dfc0e11db
Merge pull request #11081 from VisualSJ/v3-docs
...
[ci skip] Add javascript notes...
2015-03-23 22:18:34 +08:00
minggo
67e0cd20d2
Merge pull request #11080 from SuYaoHui/cocosapi
...
[ci skip]Action,Sprite,TmxTiledMap,UTF8,GLView....
2015-03-23 22:18:00 +08:00
VisualSJ
b5fa6d2e95
[ci skip] Add javascript notes...
...
cocos/2d/CCMotionStreak.h
cocos/2d/CCParticleBatchNode.h
cocos/2d/CCParticleExamples.h
cocos/2d/CCParticleSystem.h
cocos/2d/CCParticleSystemQuad.h
cocos/2d/CCTransition.h
cocos/2d/CCTransitionPageTurn.h
cocos/base/CCConfiguration.h
cocos/base/CCTouch.h
2015-03-23 20:27:13 +08:00
SuYaohui
d8a033c2ef
Action,Sprite,TmxTiledMap,UTF8,GLView
2015-03-23 18:37:28 +08:00
minggo
c587d19e8b
Merge pull request #11059 from SuYaoHui/cocosapi
...
add comments.
2015-03-23 16:24:22 +08:00
minggo
4143eae713
Merge pull request #11061 from fusijie/cocosapi
...
add comments.
2015-03-23 16:23:51 +08:00
SuYaohui
6310e75071
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into cocosapi
2015-03-23 11:35:30 +08:00
minggo
dda85fcb02
Merge pull request #11027 from tangziwen/doc
...
add 3D doc, fixed typo
2015-03-23 10:45:41 +08:00
Jacky
cc09b84153
add comments.
2015-03-21 18:02:56 +08:00
SuYaohui
367fb6ed4c
add comments.
2015-03-21 17:06:26 +08:00
dingpinglv
ef56088886
Issue: Added js Annotates to CCNode.h
2015-03-21 11:07:39 +08:00
dingpinglv
b30b6db09b
Issue: added js annotates to CCLayer.h
2015-03-21 10:23:42 +08:00
tangziwen
814490ab44
add 3D doc, fixed typo
2015-03-20 17:20:22 +08:00
minggo
d28e5d61b6
Merge pull request #10998 from dingpinglv/Iss_Annotate
...
[ci skip] Added js annotates to -x
2015-03-19 22:09:43 +08:00
minggo
8e019de83b
Merge pull request #11003 from fusijie/cocosapi
...
[ci skip]add comments to CCLayer & CCNode & CCConfiguration.
2015-03-19 22:09:20 +08:00
minggo
0648ac7ca0
Merge pull request #11004 from SuYaoHui/cocosapi
...
[ci skip]NodeGrid,Config,NS,ApplicationProtocol,ProgressTimer
2015-03-19 21:47:32 +08:00
dingpinglv
de73f25e42
Corrected some wrong indent in CCScene.h and CCSpriteFrameCache.h
2015-03-19 21:44:44 +08:00
SuYaohui
5e236fd753
progressTimer,ApplicationProtocol
2015-03-19 21:42:31 +08:00
Jacky
85c04ff605
[ci skip]add comments to CCLayer & CCNode & CCConfiguration.
2015-03-19 21:41:40 +08:00
SuYaohui
c295952c71
NodeGrid,Config,NS,ApplicationProtocol
2015-03-19 21:03:28 +08:00
dingpinglv
c03703ddab
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Iss_Annotate
2015-03-19 21:01:17 +08:00
dingpinglv
069791a0a2
Corrected a wrong indent in CCSpriteFrameCache.h
2015-03-19 21:00:33 +08:00
dingpinglv
67169443df
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Iss_Annotate
...
Conflicts:
cocos/audio/include/SimpleAudioEngine.h
2015-03-19 20:28:29 +08:00
Vincent Yang
93ccdae7df
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2015-03-19 20:22:59 +08:00
Vincent Yang
ca4c71bf0e
Add MainPageWhiteBook.h, and move doxygen_modules.h to docs.
2015-03-19 20:21:40 +08:00
minggo
1539b5de78
Merge pull request #10991 from VisualSJ/v3-docs
...
Add javascript notes...
2015-03-19 20:09:41 +08:00
minggo
f3e518b103
Merge pull request #10985 from dabingnn/v3_fixRenderTextureCrash
...
fix crash problem when switch to a new scene after call RenderTexture::s...
2015-03-19 20:00:31 +08:00
dingpinglv
7a50af4407
Issue : added js annotate to CCLight.h
2015-03-19 19:54:46 +08:00
dingpinglv
194c8d8f17
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Iss_Annotate
2015-03-19 19:46:01 +08:00
VisualSJ
f87b06a1c8
Add javascript notes...
...
cocos/2d/CCAction.h
cocos/2d/CCActionCamera.h
cocos/2d/CCActionCatmullRom.h
cocos/2d/CCActionInstant.h
cocos/2d/CCActionInterval.h
cocos/2d/CCActionManager.h
cocos/audio/include/AudioEngine.h
cocos/audio/include/SimpleAudioEngine.h
2015-03-19 18:41:11 +08:00
Huabing.Xu
8b04a15ee8
fix crash problem when switch to a new scene after call RenderTexture::saveToFile()
2015-03-19 16:39:45 +08:00
zhangbin
f196d213ee
Solve the error format of comments in header files.
2015-03-19 15:59:58 +08:00
minggo
a8471dd507
Merge pull request #10978 from natural-law/v3
...
[ci skip] Update comments of some header files.
2015-03-19 13:42:48 +08:00
zhangbin
d755a7b46a
Update comments of some header files.
2015-03-19 13:41:21 +08:00
minggo
1d37016912
Merge pull request #10962 from dingpinglv/Iss_Annotate
...
[ci skip] added js annotate to classes
2015-03-19 11:56:07 +08:00
minggo
aec86d7e61
Merge pull request #10967 from VisualSJ/v3-docs
...
Add javascript notes...
2015-03-19 11:52:44 +08:00
minggo
b469f460c7
Merge pull request #10968 from WenhaiLin/v3-update-document
...
[ci skip]Update document
2015-03-19 10:46:06 +08:00
WenhaiLin
e528531b4b
[ci skip]Update document
2015-03-19 10:38:12 +08:00
VisualSJ
62b3f537ce
Add javascript notes...Fixed error
2015-03-19 10:33:11 +08:00