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 |
SuYaohui
|
2edb7f7d50
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into cocosapi
|
2015-03-19 10:05:24 +08:00 |
SuYaohui
|
bc2b897dc6
|
ProgressTimer
|
2015-03-19 10:00:30 +08:00 |
dingpinglv
|
9be573e92f
|
Added js annotate to CCSpriteFrameCache.h
|
2015-03-18 22:24:03 +08:00 |
dingpinglv
|
4bb78a2eec
|
Added js annotate to CCScene.h
|
2015-03-18 22:08:50 +08:00 |
dingpinglv
|
ee44f024f1
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Iss_Annotate
Conflicts:
cocos/2d/CCActionGrid.h
cocos/2d/CCAnimation.h
cocos/2d/CCAnimationCache.h
cocos/base/CCRef.h
|
2015-03-18 21:58:07 +08:00 |
minggo
|
ddb6230c13
|
Merge pull request #10953 from fusijie/cocosapi
[ci skip]update CCActionManager & CCActionInstant & CCActionInterval & CCScene & ...
|
2015-03-18 21:48:28 +08:00 |
dingpinglv
|
a99c2c7893
|
Issue : added js annotate to CCActionGrid.h, CCAnimation.h, CCAnimationCache.h, CCAtlasNode.h, CCRef.h
|
2015-03-18 21:45:58 +08:00 |
VisualSJ
|
785214ae12
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-docs
Conflicts:
cocos/base/CCAutoreleasePool.h
cocos/base/CCData.h
|
2015-03-18 21:38:56 +08:00 |
zhangbin
|
f31a833df4
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
|
2015-03-18 21:10:17 +08:00 |
zhangbin
|
a5e148c829
|
Update comments of some header files.
|
2015-03-18 20:56:17 +08:00 |
VisualSJ
|
cb50c7d89a
|
Add javascript notes...
cocos/2d/CCActionPageTurn3D.h
cocos/base/CCAutoreleasePool.h
cocos/base/CCData.h
|
2015-03-18 20:51:18 +08:00 |
Jacky
|
2d50327323
|
update CCActionManager & CCActionInstant & CCActionInterval & CCScene & CCSpriteFrame & CCSpriteFrameCache
|
2015-03-18 20:40:29 +08:00 |
SuYaohui
|
31944da08c
|
[ci skip]Action,ActionCamera,ActionCatmullRom,Animation,AnimationCache,AtlasNode
|
2015-03-18 20:26:16 +08:00 |
SuYaohui
|
ee8776f041
|
[ci skip]Action,ActionCamera,ActionCatmullRom,Animation,AnimationCache,AtlasNode
|
2015-03-18 20:07:00 +08:00 |
minggo
|
359e25327d
|
Merge pull request #10946 from natural-law/v3
[ci skip] Update comments of some header files.
|
2015-03-18 18:25:31 +08:00 |
zhangbin
|
b55916c283
|
Update comments of some header files.
|
2015-03-18 18:15:34 +08:00 |
minggo
|
5271c75c11
|
Merge pull request #10936 from super626/v3
Camera mask for label
|
2015-03-18 14:00:44 +08:00 |
yangxiao
|
44af57459e
|
add comment
|
2015-03-18 11:58:36 +08:00 |
yangxiao
|
21d581a72c
|
set camera mask when member created
|
2015-03-18 11:41:43 +08:00 |
minggo
|
1e271a9d96
|
Merge pull request #10899 from super626/v3
Bug fix
|
2015-03-17 19:29:21 +08:00 |
Dale Stammen
|
5606fad642
|
Merge branch 'v3' into v3-wp8-fix
|
2015-03-16 20:47:55 -07:00 |
Vincent Yang
|
6bbb89a098
|
Add doxygen config for white book and cocos/doxygen_modules.h for doc mudules.
|
2015-03-17 11:26:33 +08:00 |
Dale Stammen
|
65c83378d0
|
Merge branch 'v3' into v3-wp8-fix
|
2015-03-16 20:22:28 -07:00 |
Dale Stammen
|
08ceae3de2
|
removed no-gl_PointSize shaders for Windows Phone 8.1
|
2015-03-16 08:08:02 -07:00 |
yangxiao
|
5b26ba3c68
|
override setCameraMask
|
2015-03-16 17:11:17 +08:00 |
yangxiao
|
f56d8c4784
|
fix camra mask for label does not work
|
2015-03-16 15:31:29 +08:00 |
Martin Konopka
|
2c80b6ae3a
|
Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
|
2015-03-15 00:10:08 +01:00 |
Martin Konopka
|
cd12d08a52
|
Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
|
2015-03-14 19:33:15 +01:00 |
Huabing.Xu
|
03c3a4d5ed
|
Merge pull request #10836 from pipu/reconstruct_object_extension_data
To reconstruct object extension data.
|
2015-03-13 15:04:41 +08:00 |
pipu
|
c72c8e865d
|
To reconstruct object extension data.
|
2015-03-12 15:47:15 +08:00 |
yangxiao
|
50c3a9cb4c
|
fix removeAllChildren cause camera to be destroyed bug
|
2015-03-12 10:39:21 +08:00 |
mogemimi
|
8cf0ec1aca
|
Minor refactor TMXMapInfo
* Replace with range-based for loop
* Replace some size() with !empty()
* Refactor scope of local variable
|
2015-03-12 01:21:57 +09:00 |
mogemimi
|
279604bac5
|
Add missing white spaces and some minor cleanups
* Add missing white space
* Fix if-else statement without curly braces
* Fix indentation
* Clean up code
|
2015-03-12 01:19:37 +09:00 |
mogemimi
|
abeb269534
|
Remove useless (char*) cast
|
2015-03-12 01:14:05 +09:00 |
Jacky
|
605ce58293
|
disable MoveTo::reverse()
|
2015-03-11 09:55:32 +08:00 |
minggo
|
5ac2fb398c
|
Merge pull request #10774 from minggo/sync-from-v4
Label:Fixed transform not update correctly
|
2015-03-10 09:54:20 +08:00 |
Dale Stammen
|
24d706cb7a
|
added /bigobj to C++ compiler command line options
|
2015-03-09 09:39:36 -07:00 |
Dale Stammen
|
35222a8193
|
Merge branch 'v3' into v3-wp8-fix
|
2015-03-09 09:20:25 -07:00 |
Dale Stammen
|
a828f73ccb
|
updated expiration date of project certificates
|
2015-03-09 08:31:06 -07:00 |
WenhaiLin
|
cd95905a04
|
Label:Fixed transform not update correctly if this camera mask of Label isn't visible by the current visiting camera
|
2015-03-09 17:26:43 +08:00 |
Dale Stammen
|
6cd881d8f8
|
added missing Particle3D files
|
2015-03-08 21:37:29 -07:00 |
Dale Stammen
|
362edec6d6
|
added missing Particle3D files
|
2015-03-08 21:31:43 -07:00 |
yangxiao
|
8137b01f23
|
merge cocos
|
2015-03-06 18:31:57 +08:00 |
XiaoYang
|
27ae60e626
|
Merge pull request #249 from songchengjiang/particle_merge
support win8.1
|
2015-03-06 17:57:34 +08:00 |
songchengjiang
|
4ca90341b9
|
support win8.1
|
2015-03-06 15:35:02 +08:00 |
yangxiao
|
457ac3fdd7
|
reset unproject with viewport cocostudio using it
|
2015-03-06 11:29:40 +08:00 |
songchengjiang
|
444dbfdf9e
|
replace .mesh with .c3b
modify ParticleUniverse file structure
|
2015-03-05 14:54:32 +08:00 |
yangxiao
|
3db3d9ae11
|
merge cocos
|
2015-03-03 17:23:33 +08:00 |
Dale Stammen
|
44b951a51a
|
Merge branch 'v3' into v3-wp8-fix
|
2015-03-02 16:42:05 -08:00 |
songchengjiang
|
5c460ebb2d
|
add/update particle files
|
2015-03-02 13:07:32 +08:00 |
minggo
|
0755400a79
|
Merge pull request #10279 from seobyeongky/motionstreak_bug_fix
MotionStreak MoveTo/MoveBy action OK
|
2015-02-28 11:17:28 +08:00 |
Dale Stammen
|
e4db9f396e
|
disable LTCG. set warning level to W3
|
2015-02-27 11:16:40 -08:00 |
Dale Stammen
|
f68a966485
|
disabled Check SDL to allow CC_DEPRECATED to work as warning and not error
|
2015-02-27 11:07:51 -08:00 |
Dale Stammen
|
e04fd6eb1d
|
updated cocos2d dll name from 3.4 to 3.5
|
2015-02-27 10:54:27 -08:00 |
Dale Stammen
|
d486cc78fb
|
updated cocos2d dll name from 3.4 to 3.5
|
2015-02-27 10:52:32 -08:00 |
Dale Stammen
|
8bc5b37b40
|
removed missing include files from project
|
2015-02-27 10:48:53 -08:00 |
Dale Stammen
|
b5e936c657
|
disabled LTCG to speed up release builds
|
2015-02-27 10:43:13 -08:00 |
Dale Stammen
|
2eb919bb7a
|
disabled Check SDL to allow CC_DEPRECATED to work as warning and not error
|
2015-02-27 10:36:48 -08:00 |
Dale Stammen
|
e9ef92291f
|
renamed cocos2d dll from 3.4 to 3.5
|
2015-02-27 10:26:58 -08:00 |
Dale Stammen
|
49b16718a2
|
removed missing .h files from solution
|
2015-02-27 10:24:02 -08:00 |
yangxiao
|
437a59fb9a
|
modify project & unproject api
|
2015-02-27 10:01:57 +08:00 |
yangxiao
|
6f395edf0e
|
modify according to minggo
|
2015-02-26 17:37:45 +08:00 |
yangxiao
|
f13237c013
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2015-02-26 17:27:42 +08:00 |
yangxiao
|
a1642757f9
|
merge setcameramask
|
2015-02-26 15:33:18 +08:00 |
yangxiao
|
9a64eb18dd
|
add project function
|
2015-02-26 15:20:20 +08:00 |
Ray
|
1a2aa8633f
|
fix w8 project
|
2015-02-26 10:27:12 +08:00 |
Ray
|
83a7b8012c
|
3DParticle Reader and tests
|
2015-02-26 09:19:14 +08:00 |
Ray
|
c66a4f28bc
|
Add CocosStudio UserCameraReader
fix Sprite3DReader Test
|
2015-02-25 14:19:08 +08:00 |
Ray
|
fbe9e5b767
|
complate project file
|
2015-02-23 00:52:50 +08:00 |
Ray
|
8eb201797d
|
工程文件修改
|
2015-02-19 17:52:50 +08:00 |
Dale Stammen
|
76233d4c6e
|
added missing Particle3D files and tests
|
2015-02-16 10:41:03 -08:00 |
Dale Stammen
|
795f65c85f
|
added missing Particle3D files and tests
|
2015-02-16 10:01:09 -08:00 |
minggo
|
c8eaa4aeba
|
Merge pull request #10447 from super626/particle_merge
add 3d particle (Particle Universe)
|
2015-02-15 19:48:18 +08:00 |
Vladimir Perminov
|
9f5efe5153
|
Fix visual studio project out of date
Remove 3dExport.h from project.
Change location CCPlatformConfig.h and CCPlatformMacros.h from ..\base\
to ..\platform\
|
2015-02-13 11:18:14 +03:00 |
yangxiao
|
9b117bf87c
|
resolve conflict
|
2015-02-13 15:46:19 +08:00 |
Justin Fraize
|
3667cc6e1f
|
Cleaned up CCAction.cpp
*Fixed tab/space issue.
*Removed unneeded if/else block.
*Added explicit braces around if block.
|
2015-02-12 21:00:12 -08:00 |
minggo
|
87e444873f
|
Merge pull request #10268 from kompjoefriek/Fixing-warnings
Fixed some compiler warnings
|
2015-02-13 10:04:19 +08:00 |
kompjoefriek
|
a2ef1abef3
|
Fixed unwanted changes
|
2015-02-12 23:07:24 +01:00 |
zhukaixy
|
acc0476f01
|
Solve compile errors on win32 platform
|
2015-02-12 19:36:03 +08:00 |
minggo
|
afd4e94c4c
|
Merge pull request #10160 from lite3/wildpointer
fix wild pointer
|
2015-02-12 18:01:10 +08:00 |
minggo
|
7fd6b5bfe7
|
Merge pull request #10172 from sergeant-wizard/make_tmx_object_group_name_getter_const
make CCTMXObjectGroup::getGroupName const
|
2015-02-12 18:00:49 +08:00 |
minggo
|
8716164a5d
|
Merge pull request #10206 from sergeant-wizard/specify_default_capacity_for_sprite_batch_node
Specify default capacity for sprite batch node
|
2015-02-12 17:58:59 +08:00 |
yangxiao
|
58bfae2e57
|
adjust and remove unused code
|
2015-02-12 16:58:34 +08:00 |
lvlong
|
ee03bb8eea
|
setCameraMask for cocostudio-ui
|
2015-02-12 09:24:04 +08:00 |
yangxiao
|
79a0c0152a
|
add 3d particle (Particle Universe)
|
2015-02-11 18:14:22 +08:00 |
minggo
|
1e11f3b3da
|
Merge pull request #10310 from perminovVS/v3
Fix visual studio project out of date
|
2015-02-10 14:18:13 +08:00 |
Chad
|
befbc0a14e
|
FIX for Build error when CC_USE_CULLING=0 #10373
Fix for build error when using CC_USE_CULLING
|
2015-02-09 18:15:22 -08:00 |
XiaoYang
|
c9fe5251a9
|
Merge pull request #229 from lvlonggame/v3
add Camera::project
|
2015-02-04 09:38:31 +08:00 |
lvlong
|
a0c7723edb
|
add GP_ASSERT
|
2015-02-03 14:21:12 +08:00 |
lvlong
|
6d92b7adc9
|
modify Camera::project
|
2015-02-03 11:59:43 +08:00 |
lvlonggame
|
4c65332550
|
add project function to camera
|
2015-02-01 21:14:37 +08:00 |
Vladimir Perminov
|
bb2d2c9a07
|
Fix visual studio project out of date
Remove 3dExport.h from project.
Change location CCPlatformConfig.h and CCPlatformMacros.h from ..\base\
to ..\platform\
|
2015-01-30 17:37:19 +03:00 |
zhukaixy
|
f3536056d8
|
Simpilify skybox
|
2015-01-29 19:01:10 +08:00 |
byeonggee.seo
|
fa683ec98b
|
MotionStreak MoveTo/MoveBy action OK
|
2015-01-29 19:30:00 +09:00 |
huangshiwu
|
cd00de572d
|
add glBindBuffer for drawnode and clippingnode to avoid crash
|
2015-01-29 18:06:20 +08:00 |
Dale Stammen
|
652baed1ee
|
increase build heap memory option to /Zm384
|
2015-01-28 20:37:39 -08:00 |
Dale Stammen
|
be8075b29c
|
increase build heap memory option to /Zm384
|
2015-01-28 20:32:32 -08:00 |
zhukaixy
|
ee99700ec1
|
add test case TextureCube
|
2015-01-29 09:28:14 +08:00 |
minggo
|
b233d6928e
|
Merge pull request #10238 from Dhilan007/v3-scale9sprite-fix
Fixed Scale9Sprite can't run move/scale/rotation action in physics scene
|
2015-01-28 15:16:23 +08:00 |
Nite Luo
|
be6ca1b6d2
|
add force depth write
|
2015-01-27 17:05:51 -08:00 |
Nite Luo
|
8f539a0107
|
Make PositionZ independent from global Z
|
2015-01-27 15:41:58 -08:00 |
Wenhai Lin
|
f2335fb3bc
|
Fixed Scale9Sprite can't run move/scale/rotation action in physics scene
|
2015-01-27 16:13:45 +08:00 |
minggo
|
988a2729d7
|
Merge pull request #10203 from Dhilan007/v3-bmf-performance
Improved the parsing performance of bitmap fonts
|
2015-01-26 13:46:04 +08:00 |
Ryo Miyajima
|
d1d4ec2ac6
|
fix grammar in comment
|
2015-01-26 10:56:43 +09:00 |
Ryo Miyajima
|
4985653f5b
|
specify default capacity
|
2015-01-26 10:56:38 +09:00 |
WenhaiLin
|
9afa871164
|
Improved the parsing performance of bitmap fonts
|
2015-01-24 16:23:30 +08:00 |
Huabing.Xu
|
030394bffe
|
refactor the rendering and creation of DrawNode
make LayerColor rendering safer
|
2015-01-23 18:19:03 +08:00 |
kompjoefriek
|
ca48c5e5dd
|
Fixed lots of compiler warnings
- signed / unsigned mismatches
- using int as bool
- Removed throw() from CCFrame.h, why is explained here:
http://www.gotw.ca/publications/mill22.htm
|
2015-01-23 02:02:33 +01:00 |
Ryo Miyajima
|
75847bc383
|
make CCTMXObjectGroup::getGroupName const
|
2015-01-22 16:37:51 +09:00 |
Wenhai Lin
|
5076b9f008
|
Fixed crash
|
2015-01-21 22:46:31 +08:00 |
Wenhai Lin
|
342c582124
|
Fixed label may become white/black block after resume from background on android
|
2015-01-21 21:58:18 +08:00 |
lite3
|
0923a28e4d
|
fix wild pointer
|
2015-01-21 21:01:57 +08:00 |
minggo
|
26bdd8b532
|
Merge pull request #10140 from minggo/crash-fix
check if plist file exist
|
2015-01-21 14:41:44 +08:00 |
minggo
|
097d4f3266
|
check if plist file exist
|
2015-01-21 14:36:49 +08:00 |
minggo
|
fde86c7fd2
|
Merge pull request #10127 from Dhilan007/v3-systemfont-alphafix
Fixed the alpha channel of text color of system font not take effect
|
2015-01-21 11:09:27 +08:00 |
minggo
|
9f24b9a350
|
Merge pull request #10090 from Dhilan007/v3-issue10089
Fixed lose the precision of label's dimensions
|
2015-01-21 10:51:27 +08:00 |
minggo
|
372b11422d
|
Merge pull request #10115 from dabingnn/FixCrashOnWin32
Fix crash on win32
|
2015-01-21 10:34:22 +08:00 |
minggo
|
5f37ba8096
|
Merge pull request #10095 from super626/fixnode
fix anchor point bug
|
2015-01-21 09:58:00 +08:00 |
Huabing.Xu
|
65b6500491
|
Merge branch 'v3' into FixCrashOnWin32
Conflicts:
cocos/2d/CCDrawNode.cpp
cocos/renderer/ccShaders.cpp
|
2015-01-20 18:09:11 +08:00 |
Huabing.Xu
|
79eee9b145
|
fix crash on windows
|
2015-01-20 16:50:51 +08:00 |
WenhaiLin
|
415bbeba21
|
Fixed the alpha channel of text color of system font not take effect
|
2015-01-20 16:04:14 +08:00 |
samuele3hu
|
d4db54dc64
|
issue #9537:Make parameters more sense
|
2015-01-20 15:41:59 +08:00 |
yangxiao
|
2a2330438c
|
fix anchor point bug
|
2015-01-20 14:10:11 +08:00 |
WenhaiLin
|
f2c6a48976
|
Fixed lose the precision of label's dimensions
|
2015-01-20 11:46:43 +08:00 |
tangziwen
|
25cd1f4c02
|
update test
|
2015-01-20 10:34:30 +08:00 |
Huabing.Xu
|
19bb6a0c68
|
fix opengl 502 by using glGetBooleanv
|
2015-01-16 15:21:23 +08:00 |
Nite Luo
|
9848a8133b
|
Fix Vertex Z issue
|
2015-01-15 16:41:07 -08:00 |
Nite Luo
|
9d7604cab7
|
undeprecate init for custom command
|
2015-01-15 15:56:44 -08:00 |
Nite Luo
|
0bddeb88c8
|
Disable 3D rendering support for commands that needs to execute in order
|
2015-01-15 14:57:51 -08:00 |
Nite Luo
|
4a440e66c9
|
Refactor draw command
|
2015-01-15 14:00:49 -08:00 |
huangshiwu
|
65e97450d0
|
fix DrawNode init error
|
2015-01-15 11:51:21 +08:00 |
Mircea Rila
|
2a235f5b8d
|
add Color3B type parameter to TintTo::create
|
2015-01-14 11:04:23 +02:00 |
yangxiao
|
42c40d895f
|
enable disable culling using macro
|
2015-01-14 14:41:10 +08:00 |
Huabing.Xu
|
34582ba268
|
Merge branch 'v3' into v3_AddOptionsForCulling
Conflicts:
cocos/2d/CCLabel.cpp
|
2015-01-14 12:44:24 +08:00 |
minggo
|
5459149279
|
Merge pull request #9969 from huangshiwu/pointSize
DrawNode enable draw different size points
|
2015-01-14 11:38:31 +08:00 |
minggo
|
0207c22cb6
|
Merge pull request #9953 from darkdukey/renderFix
Render fix
|
2015-01-14 11:06:33 +08:00 |
Huabing.Xu
|
f3d8798d39
|
add macro to enable to disable culling
|
2015-01-14 10:56:51 +08:00 |
huangshiwu
|
f4ac7c4e44
|
modify WP8 project and update precompileshader
|
2015-01-14 02:15:04 +08:00 |
huangshiwu
|
fea492ab4f
|
DrawNode enable draw different size points
|
2015-01-13 22:30:50 +08:00 |
Nite Luo
|
1c10ae43bc
|
Merge branch 'v3' into renderFix
Conflicts:
tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.cpp
tests/cpp-tests/Classes/Camera3DTest/Camera3DTest.h
|
2015-01-12 20:43:55 -08:00 |
Nite Luo
|
8591609128
|
Implement 3D drawing support for Sprite, Label, Particle, BatchNode
|
2015-01-12 20:06:50 -08:00 |
Huabing.Xu
|
af9e49b28d
|
cache director pointer to improve rendering performance
|
2015-01-13 10:28:25 +08:00 |
yangxiao
|
6d297d377b
|
camera visible check
|
2015-01-12 10:08:55 +08:00 |
minggo
|
465bf48442
|
Merge pull request #9879 from suzukaze/fix-indents
Replace tabs with spaces in cocos/2d dir
|
2015-01-09 14:59:27 +08:00 |
Takao Kato
|
ba0beaffdc
|
fixed getParentToNodeTransform. it returned a wrong transform if _transformDirty was true.
|
2015-01-09 09:58:09 +08:00 |