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
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
pipu
48f280b478
Update .vcxproj, vcxproj.filters files for wp8, Windows 8.1 WindowsPhone 8.1
2014-11-27 18:27:22 +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
Ricardo Quesada
71fec06a11
fixes indentation
2014-11-17 18:11:17 -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