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
Nite Luo
e7480a7efb
Enable tansparent queue and create camera rotation demo
2015-01-08 16:30:00 -08:00
Jun Hiroe
e4d560b658
Replace tabs with spaces in cocos/2d dir
2015-01-08 20:17:45 +09:00
Huabing.Xu
5f8d69d447
Merge pull request #9862 from Dhilan007/v3-physics-performance2
...
[Physics]Reduce temporary object creation and save mathematical labor
2015-01-08 14:27:52 +08:00
Wenhai Lin
61438f7297
[Physics]Reduce temporary object creation and save mathematical labor
2015-01-08 14:25:06 +08:00
Huabing.Xu
2b71c57b52
Merge pull request #9840 from Dhilan007/v3-physics-performance
...
Improve performance of Physics
2015-01-08 10:33:51 +08:00
Jun Hiroe
ca86bce60d
Replace tab with spaces
2015-01-07 23:46:28 +09:00
Wenhai Lin
8524a5fb97
Improve performance of physics
2015-01-07 17:08:04 +08:00
Huabing.Xu
27d4c6a0f6
Merge pull request #9830 from huangshiwu/v3_drawNode_fixbug
...
DrawNode override drawPoints function to set pointSize, fix draw points ...
2015-01-07 14:46:13 +08:00
huangshiwu
f41f00fcb2
make rotated rect draw correctly
2015-01-07 11:44:16 +08:00
huangshiwu
ac7ddad4ac
DrawNode override drawPoints function to set pointsize, fix draw points use last color bug and drawRect behavior bug
2015-01-07 11:02:31 +08:00
minggo
4b0a35d772
Merge pull request #9813 from Dhilan007/v3-physics-remove-infoclass
...
Remove XXXXInfo_chipmunk class in 'chipmunk' folder to simplify implementation of physics
2015-01-07 10:21:54 +08:00
minggo
5b0925d42d
Merge pull request #9802 from dabingnn/v3_fixGLProgramLogCrash
...
fix delete wild opengl buffers
2015-01-06 15:13:49 +08:00
WenhaiLin
2847a940ed
Update project
2015-01-06 14:40:15 +08:00
minggo
31819bafc3
Merge pull request #9769 from ton1517/fix/jumpto
...
fix problem : JumpTo position is changed each repeat.
2015-01-06 14:09:54 +08:00
WenhaiLin
f620038c59
Add miss file for win32 project
2015-01-06 10:55:26 +08:00
Huabing.Xu
7f61a3d97b
reset _VAOname to 0 before recreating on android
2015-01-06 09:44:19 +08:00
Huabing.Xu
a1654e5714
fix delete wild opengl buffers
2015-01-05 17:53:31 +08:00
ton
a445148a5e
fix problem : JumpTo position is changed each repeat.
...
example:
sprite->runAction(
RepeatForever::create(
Sequence::create(
JumpTo::create(1, Vec2(300, 200), 100, 2),
MoveTo::create(1, Vec2(100, 200)),
nullptr
)
)
);
2015-01-03 01:13:57 +09:00
Dale Stammen
395b9fbaa7
added /bigobj to c++ command line options to fix arm builds
2014-12-31 12:56:16 -08:00
Dale Stammen
d8c2927944
added base/allocator files
2014-12-30 21:41:46 -08:00
Dale Stammen
7276f64f29
updated dll name from 3.3 to 3.4
2014-12-30 21:40:01 -08:00
Dale Stammen
ac95d292bd
added base/allocator files
2014-12-30 21:21:36 -08:00
Dale Stammen
df64718ef1
removed 3dExport.h as it no longer exists
2014-12-30 20:51:54 -08:00
Dale Stammen
f73a07c7b9
added missing files
2014-12-30 17:27:37 -08:00
Dale Stammen
bd1fef7515
added missing files
2014-12-30 16:40:04 -08:00
minggo
da8c007932
add const for Sprite::getTextureRect() and do some format
2014-12-30 11:55:54 +08:00
minggo
7db279220c
Merge branch 'quaternion' of https://github.com/super626/cocos2d-x into v3
2014-12-29 15:04:43 +08:00
minggo
d7dfdc9124
Merge pull request #9417 from lite3/spriteretainframe
...
retain the sprite frame in sprite
2014-12-29 10:33:42 +08:00
lvlong
f592671df6
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into frustum
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
2014-12-26 13:42:13 +08:00
andyque
19dc8b5d19
fix conflicts and wp8, wp8.1 linker error
2014-12-25 18:11:59 +08:00
andyque
29e9ef7edf
Merge branch 'v3' into modifyWidgetDefaultBehavior
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
cocos/2d/libcocos2d_wp8.vcxproj.filters
2014-12-25 18:08:07 +08:00
lvlong
a4a108f766
fix lua binding again!!
2014-12-25 14:04:41 +08:00
youyou
f678d1027c
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
2014-12-25 12:09:31 +08:00
yangxiao
0db70977f9
wrong scale order
2014-12-25 10:39:48 +08:00
yangxiao
510633ba72
wrong spelling
2014-12-25 10:33:49 +08:00
yangxiao
6eed142e03
rename _rotation_quat to _rotationQuat
2014-12-24 18:12:00 +08:00
yangxiao
17207673ff
merge cocos
2014-12-24 17:34:58 +08:00
yangxiao
88e0f025ef
make it clean
2014-12-24 17:18:09 +08:00
yangxiao
22ae384edf
Rotation representation with quaternion fix #9510
2014-12-24 17:07:54 +08:00
youyou
db6ffd7962
Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x ; branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-12-24 15:59:50 +08:00
lvlonggame
805b248af3
modify win-project
2014-12-24 15:06:58 +08:00
yusheng.lu
fa5b4f8df7
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader
...
Conflicts:
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
cocos/2d/libcocos2d_wp8.vcxproj.filters
resolve the conflicts
2014-12-24 13:06:38 +08:00
minggo
5d8e004b9b
Merge pull request #9600 from huangshiwu/v3_allocator_wp
...
fix allocator related compile error on wp8/8.1 and winrt
2014-12-24 10:54:16 +08:00
kaile.yin
942abfc654
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
2014-12-24 10:53:09 +08:00
huangshiwu
01eeb15a8d
fix allocator related compile error on wp8/8.1 and winrt
2014-12-24 10:45:29 +08:00
minggo
dea483b6ef
performance improve
2014-12-23 18:07:22 +08:00
yusheng.lu
d543f8f6a2
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader
2014-12-23 16:12:50 +08:00
andyque
d8f726bc4f
modify widget default behavior
2014-12-23 15:03:31 +08:00
yangxiao
3d77c7535d
merge cocos
2014-12-23 10:35:35 +08:00
yusheng.lu
2de5ba7c2f
vs filters update
2014-12-22 19:43:14 +08:00
yusheng.lu
02b9269cff
completed multiplatform projects
2014-12-22 19:39:10 +08:00
yusheng.lu
b0bfc2906a
change armature codes files path
2014-12-22 18:26:50 +08:00
lvlong
db9f4a23fe
feedback commit.
2014-12-22 18:13:07 +08:00
yusheng.lu
6de7fae114
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader
2014-12-22 18:00:08 +08:00
yusheng.lu
62c5df2d9d
armature node reader done (projs incompleted)
2014-12-22 17:35:39 +08:00
yangxiao
e8c7f30541
add quaternion
2014-12-22 17:23:44 +08:00
minggo
feacf75f12
Merge pull request #9575 from minggo/MoveTo-MoveBy-support-v3
...
#9555 MoveTo and MoveBy support Vec3
2014-12-22 15:57:12 +08:00
yangxiao
bdc12dce8b
add quaternion property
2014-12-22 15:14:18 +08:00
minggo
81de0ae687
Merge pull request #9566 from austinkelleher/dev
...
Fixing variable name lenght -> length.
2014-12-22 15:07:15 +08:00
minggo
20beb3b9e0
Merge pull request #9567 from joewan/v3-improve-perf
...
fix serious performance problem of Animate.
2014-12-22 14:57:26 +08:00
minggo
1268f73a7c
MoveTo and MoveBy support Vec3
2014-12-22 14:34:35 +08:00
kaile.yin
b924dafe83
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
2014-12-22 11:14:31 +08:00
joewanchen
bb1267cd09
use auto&.
2014-12-21 14:05:34 +08:00
joewanchen
a15a4a0739
fix compile error.
2014-12-21 02:03:41 +08:00
joewanchen
3765f87651
fix.
2014-12-21 00:49:23 +08:00
joewanchen
7d6686eb7b
fix.
2014-12-21 00:42:55 +08:00
joewanchen
fc69dabca2
fix serious performance problem.
2014-12-21 00:22:23 +08:00
Austin Kelleher
d3ca364259
Fixing variable name lenght -> length.
2014-12-20 07:34:44 -05:00
XiaoYang
9102c77840
Merge pull request #182 from lvlonggame/v3
...
camera frustum update
2014-12-19 16:14:01 +07:00
WenhaiLin
4366fb7230
Fix compile error on WIN32.
2014-12-19 11:49:40 +08:00
songchengjiang
f5f95c5693
fix errors on Windows
2014-12-19 11:30:51 +08:00
lvlong
f6bea9b6bb
1.add camera culling.
...
2.add camera culling sample.
3.fix bug: load .obj file material.
2014-12-18 17:18:22 +08:00
minggo
e800b3d9ba
Merge pull request #9501 from joewan/v3-fix-mismatch
...
V3 fix uninitialized members.
2014-12-16 18:28:36 +08:00
lvlong
73a2a6385a
add frustum culling.
2014-12-16 16:34:35 +08:00
joewanchen
713d19c830
initialize _contentSizeDirty.
2014-12-15 19:43:54 +08:00
Wenhai Lin
4ed5872ba3
Fixed content size of Label is incorrect after sets empty string.
2014-12-15 14:36:57 +08:00
lite3
91c7127bbd
Merge branch 'v3' into spriteretainframe
2014-12-09 10:51:47 +08:00
lite3
4f4c30051e
retain the sprite frame
...
do not removed by SpriteFrameCache::removeUnusedSpriteFrames
2014-12-08 21:04:15 +08:00
kaile.yin
1db2bf89e0
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-12-05 14:42:25 +08:00
lite3
8df8ee36db
print more info
2014-12-04 19:18:54 +08:00
kaile.yin
9f9c4782f1
change file name
2014-12-04 18:51:32 +08:00
kaile.yin
a6653c7d8d
change name
2014-12-04 18:50:00 +08:00
kaile.yin
743166f50b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
Conflicts:
cocos/editor-support/cocostudio/ActionTimeline/CSLoader.cpp
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
2014-12-04 15:32:25 +08:00
pipu
6d764bc2c8
Merge branch 'v3' into v3_flatbuffers
...
Conflicts:
tools/cocos2d-console
2014-12-03 15:47:03 +08:00
kaile.yin
fd69a5efc3
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-12-03 15:22:46 +08:00
minggo
4bee194a0b
Merge pull request #9285 from huangshiwu/v3_drawpolygon
...
DrawNode::drawPolygon refactor
2014-12-03 14:06:48 +08:00
minggo
4d2ea40db0
Merge pull request #9265 from shrimpz/fix_label_crashed_on_android
...
Fix label crashed on android #9255
2014-12-02 15:48:10 +08:00
pipu
26a6c9a724
Modify libcocos2d_wp8.vcxproj, libcocos2d_wp8.vcxproj.filters, libcocos2d_8_1.Shared.vcxitems, libcocos2d_8_1.Shared.vcxitems.filters, cpp-tests.Shared.vcxitems, cpp-tests.Shared.vcxitems.filters
2014-12-02 12:30:34 +08:00
pipu
1cbc0120be
Merge branch 'v3' into v3_flatbuffers
2014-12-01 22:56:18 +08:00
zhounan
7ffc6f9784
Modify that cocos/2d/libcocos2d.vcxproj, cocos/2d/libcocos2d.vcxproj.filters
2014-12-01 13:18:57 +08:00
Dale Stammen
117d7bd5e8
fixed universal app project files for flatbuffers
2014-11-27 05:34:36 -08:00
Dale Stammen
267edeafd3
fixed wp8 project files for flatbuffers
2014-11-27 05:22:07 -08:00
StarWing
d5125ae179
nullptr check when Sprite::setTexture with non-exists file
2014-11-27 21:15:09 +08:00
pipu
1633b7f475
Reset libcocos2d_8_1.Windows.vcxproj, libcocos2d_8_1.Windows.vcxproj.filters, libcocos2d_8_1.WindowsPhone.vcxproj, libcocos2d_8_1.WindowsPhone.vcxproj.filters
2014-11-27 20:02:03 +08:00
zhangcheng
12a5443834
Merge branch 'v3_flatbuffers' of https://github.com/pipu/cocos2d-x into v3_flatbuffers
2014-11-27 18:34:18 +08:00
zhangcheng
0c89db7675
Add WidgetCallbackHandlerProtocol.h, WidgetCallbackHandlerProtocol.cpp
2014-11-27 18:32:35 +08:00
huangshiwu
b866a58fc4
DrawNode::drawPolygon refactor
2014-11-27 18:31:04 +08:00
pipu
48f280b478
Update .vcxproj, vcxproj.filters files for wp8, Windows 8.1 WindowsPhone 8.1
2014-11-27 18:27:22 +08:00
Shrimpz
38a6aa30a2
* fixed android crash that a Label instance add to an invisibility parent node.
2014-11-27 10:59:47 +08:00
pipu
889f84e540
newest v3 flatbuffers
2014-11-26 13:29:23 +08:00
minggo
5d58ffc5ab
Merge pull request #9212 from Dhilan007/v3-fontfnt-crash
...
Fix crash when missing image resource of FNT font.
2014-11-26 11:48:53 +08:00
minggo
14bbaab0ba
Merge pull request #9210 from Dhilan007/v3-physics-scale
...
Reducing unnecessary function call
2014-11-26 10:57:59 +08:00
minggo
7f4cabcd9f
Merge pull request #9216 from Dhilan007/v3-debugfix
...
fix compiling error caused by enable CC_LABELBMFONT_DEBUG_DRAW/CC_LABELATLAS_DEBUG_DRAW
2014-11-26 10:53:36 +08:00
Ricardo Quesada
33a2d0451c
Code conforms with the cocos2d-x c++ guidelines
2014-11-25 17:53:52 -08:00
Ricardo Quesada
9e10d2d32b
Revert "Merge pull request #9193 from pipu/v3_flatbuffers"
...
This reverts commit fa22b12628
, reversing
changes made to 8dce62b94c
.
2014-11-24 10:19:53 -08:00
Wenhai Lin
d63474436b
fix compiling error caused by enable CC_LABELBMFONT_DEBUG_DRAW/CC_LABELATLAS_DEBUG_DRAW
2014-11-24 17:21:14 +08:00
LinWenhai
fa90897e5b
remove unnecessary keyword
2014-11-24 16:27:42 +08:00
Dhilan007
7119a5855d
Fix crash when missing image resource of FNT font.
2014-11-24 15:57:00 +08:00
Dhilan007
4bc4f43b28
Reducing unnecessary function call
2014-11-24 15:27:20 +08:00
zhangcheng
32ce3dca2e
1, Update windows project.
2014-11-21 18:12:46 +08:00
pipu
6be17520c7
Config android, linux, wp8
2014-11-21 18:08:09 +08:00
minggo
02ba67e17f
Merge pull request #9082 from Teivaz/v3
...
- Optimization in CCClippingNode.
2014-11-20 11:35:42 +08:00
kaile.yin
eb9646ee3d
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-11-19 10:58:19 +08:00
Ricardo Quesada
71fec06a11
fixes indentation
2014-11-17 18:11:17 -08:00
kaile.yin
bbd971d910
create ActionTimelineNode
2014-11-17 21:05:20 +08:00
Ricardo Quesada
dcc4c46d5b
Using std::swap instead of CC_SWAP
...
CC_SWAP is deprecated. Use `std::swap` instead.
2014-11-16 09:29:05 -08:00
Ricardo Quesada
50dcae4bef
fixes compiler warnings
2014-11-14 13:07:34 -08:00
minggo
156be2e633
Merge pull request #9077 from super626/fixscene
...
fix Scene::setScale does not work #9031
2014-11-13 18:59:49 +08:00
teivaz
2d75ceafb7
- set const modifier to ClippingNode::hasContent()
2014-11-13 12:43:05 +02:00
minggo
222adb22dd
Merge pull request #9104 from super626/camera
...
add comments to camera and scene
2014-11-13 18:04:44 +08:00
yangxiao
d50670af4b
add comment to camera and scene
2014-11-13 17:30:49 +08:00
Dhilan007
e071e5c896
Fix Label may display incomplete for multiline text with outline feature enabled.
2014-11-12 17:24:35 +08:00
teivaz
7c355a087b
- Optimization in CCClippingNode.
...
Disable visiting when no objects has to be drawn under stencil.
2014-11-11 21:09:58 +02:00
yangxiao
6ecb9a7b04
fix #9031
2014-11-10 12:48:42 +08:00
minggo
db659107d3
Merge pull request #9052 from huangshiwu/v3_fixbug
...
fix ui crash bug caused by DrawNode
2014-11-07 10:33:08 +08:00
huangshiwu
ace9933d72
fix ui crash bug caused by DrawNode
2014-11-07 10:05:29 +08:00
minggo
8a49ae0b07
Merge pull request #8981 from vovkasm/clean-order-of-fields-initialization
...
Cleanup order of fields initialization.
2014-11-05 17:51:58 +08:00
minggo
e56c84ebf0
Merge pull request #8983 from super626/camera
...
fix wrong camera lookat computation
2014-11-05 17:49:59 +08:00
minggo
98073632d4
Merge pull request #8908 from zawasp/v3-source
...
fix some warnings / remove TABs
2014-11-05 13:39:20 +08:00
Ricardo Quesada
3a34d6eb9d
Performance improvements
...
`Director::getMatrix()` returns `const Mat4`
2014-11-04 16:46:14 -08:00
yangxiao
642a601502
fix wrong look at
2014-10-31 11:32:10 +08:00
Vladimir Timofeev
2835b094da
Cleanup order of fields initialization.
...
Make initialization order to match declarations.
This change twice reduces number of warnings when compiling on MacOS X with Xcode 6.1
Warnings was like "Field 'XXXX' will be initialized after field 'YYYY'"
2014-10-30 17:28:41 +03:00
Dale Stammen
32a5a2cbb8
Merge branch 'v3' into wp8-shader-fix
2014-10-28 22:08:04 -07:00
Dale Stammen
145156d698
disabled distanceFieldEnabled for WP8 as the shader crashes some older windows phones
2014-10-28 20:56:49 -07:00
Dale Stammen
6d46ee8f3d
fixed location of renderer filter
2014-10-27 11:09:27 -07:00
Dale Stammen
b483162128
added ignore warning 4756
2014-10-27 11:07:27 -07:00
minggo
23f922420a
Merge pull request #8919 from ahlwong/v3
...
Fix Label Kerning on Single Characters Cocos2d-X3.3Beta0
2014-10-27 11:48:50 +08:00
minggo
baff367c94
Merge pull request #8918 from dumganhar/iss8843-drawpoint
...
closed #8843 : Fixes DrawNode::drawPoint crash and uses VAO if it's available when draw points.
2014-10-27 11:38:11 +08:00
Ahlwong
dfcdf10898
Fix Label Additional Kerning All Strings
2014-10-24 08:57:37 -07:00
Dale Stammen
40e49cdc12
Merge branch 'v3' into wp8.1-universal
2014-10-24 07:08:55 -07:00
Ahlwong
012683bf6e
Fix kerning on signle characters
2014-10-23 21:18:51 -07:00
James Chen
603700179e
closed #8843 : Fixes DrawNode::drawPoint crash and uses VAO if it's available when draw points.
2014-10-24 12:03:11 +08:00
Dale Stammen
b6329c6c7b
added correct options to compile c file
2014-10-23 13:27:24 -07:00
Dale Stammen
b520e80e04
updated 2d and base file locations
2014-10-23 09:03:35 -07:00
Dale Stammen
a4f13a91ab
added CC_NO_GL_POINTSIZE preprocessor define
2014-10-23 07:36:23 -07:00
Dale Stammen
89d3d7b7cf
added missing cocos2d files
2014-10-23 07:29:57 -07:00
Dale Stammen
753bc5034a
removed winrt/wp8 code. no longer needed
2014-10-23 06:59:09 -07:00
Mircea Rila
3d276db6d2
fix some warnings / remove TABs
2014-10-23 12:54:15 +03:00
Dhilan007
20d372b356
Fixed Label shifting when outline feature enabled
2014-10-22 14:34:01 +08:00
Dhilan007
a5f838496c
Move `CCCamera.cpp/h` `CCLight.cpp/h` into 2d
2014-10-20 16:25:24 +08:00
Dhilan007
0bb02fb34f
Fix Label: endless loop if not using system font, and constrained length is less than one character width
2014-10-20 10:41:01 +08:00
yangxiao
cfb6a7846f
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-10-17 18:08:55 +08:00
yangxiao
66dd0807eb
add isVisibleByVisitingCamera check when visit
2014-10-17 18:07:45 +08:00
Dhilan007
4586954e0a
fixed miss sqlite3 for release build on window.
2014-10-17 11:39:06 +08:00
Dale Stammen
d5b0830c3b
added missing files
2014-10-16 11:15:39 -07:00
andyque
f3f15c58fe
remove UIWebView.cpp in win32
2014-10-16 16:46:49 +08:00
samuele3hu
d997f72be2
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_assetsmanager
...
nter
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2014-10-16 10:59:58 +08:00
minggo
8eed0811fa
Merge pull request #8717 from MSOpenTech/wp8-dll
...
New version of WP8 for cocos2d-x v3.3
2014-10-16 09:33:43 +08:00
minggo
68d58b05e9
Merge pull request #8700 from iSevenDays/v3
...
CMake fix for Mac Os X
2014-10-15 21:24:18 +08:00
SunLightJuly
74952d7258
added CCClippingRectangleNode.cpp to CMakeList
2014-10-15 14:17:04 +08:00
SunLightJuly
3352fb7bf3
reset wp8 project files
2014-10-15 14:14:02 +08:00
samuele3hu
064e159c70
Merge branch 'v3_testMerge' of https://github.com/pandamicro/cocos2d-x into v3_assetsmanager
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/platform/CCFileUtils.cpp
tests/lua-tests/project/CMakeLists.txt
tests/lua-tests/project/Classes/AppDelegate.cpp
tests/lua-tests/project/proj.android/jni/Android.mk
tests/lua-tests/project/proj.win32/lua-tests.win32.vcxproj
2014-10-15 13:41:27 +08:00