minggo
|
50a2cb2b86
|
remove unneeded includes
|
2014-08-28 17:32:23 +08:00 |
minggo
|
7baf873bf6
|
remove unneeded includes
|
2014-08-28 17:03:29 +08:00 |
minggo
|
6a8270f33b
|
Merge pull request #7900 from minggo/setposition-optimize
not create Vec as possible for setting position
|
2014-08-28 14:31:54 +08:00 |
minggo
|
681c3c06f1
|
Merge pull request #7558 from newnon/v3_actions_by_tag_improvements
stopAllActionsByTag && removeAllActionsByTag
|
2014-08-28 14:24:37 +08:00 |
minggo
|
9fb977ff99
|
not create Vec as possible for setting position
|
2014-08-28 11:41:18 +08:00 |
Ricardo Quesada
|
3dda35b4ef
|
Adds `std::nothrow` to `new`
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
|
2014-08-27 16:31:57 -07:00 |
minggo
|
17ab047b7d
|
fix compiling error on windows
|
2014-08-27 15:13:41 +08:00 |
minggo
|
04bfbdd5a1
|
fix conflict
|
2014-08-27 13:50:01 +08:00 |
minggo
|
d0ca9a4da5
|
remove unneeded include header files
|
2014-08-27 13:39:50 +08:00 |
minggo
|
ac029c3d0d
|
Merge pull request #7887 from super626/v3
2d cull only for default camera
|
2014-08-27 13:39:13 +08:00 |
yangxiao
|
26f7345693
|
2d cull only for default camera
|
2014-08-27 12:09:23 +08:00 |
samuele3hu
|
33fd605a16
|
Adjust libcocos2d and libluacocos2d on the win32 platform and adjust related test cases.
|
2014-08-27 10:18:44 +08:00 |
minggo
|
b9c51e6994
|
remove unneeded codes
|
2014-08-26 18:19:28 +08:00 |
samuele3hu
|
07cf4d3526
|
Fix the win32 and android compile error
|
2014-08-25 14:10:13 +08:00 |
samuele3hu
|
74624f5ba1
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
|
2014-08-25 11:52:52 +08:00 |
samuele3hu
|
893e0b0a08
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
|
2014-08-25 11:45:29 +08:00 |
minggo
|
e5ac6e204b
|
Merge pull request #7864 from minggo/module-devide
Module devide
|
2014-08-25 11:01:19 +08:00 |
minggo
|
e7050486d3
|
fix conflict
|
2014-08-24 18:56:51 +08:00 |
minggo
|
030f80a257
|
one static library for c++ and another one for lua-binding
|
2014-08-24 03:52:51 -07:00 |
zii
|
e8a5fc9fef
|
Update CCActionManager.cpp
|
2014-08-23 17:06:46 +08:00 |
zii
|
4763531085
|
Update CCActionManager.cpp
|
2014-08-23 17:03:26 +08:00 |
minggo
|
0701fe1dfb
|
Merge pull request #7853 from super626/v3
Better reskin model support
|
2014-08-22 19:18:47 +08:00 |
samuele3hu
|
d1b4d43a0b
|
Remove CCModuleManager.h/cpp and adjust the related project
|
2014-08-22 15:10:46 +08:00 |
samuele3hu
|
70cba1f64a
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module
Conflicts:
cocos/Android.mk
|
2014-08-22 14:01:17 +08:00 |
samuele3hu
|
2f60e610a2
|
Integrate libcocosdenshion,libcocos3d,libnetwork,libcocostudio and libextension into cocos2d on the iOS/Mac platform
|
2014-08-22 13:49:21 +08:00 |
minggo
|
a0b19db670
|
Merge pull request #7840 from minggo/fix-warning
fix warnings
|
2014-08-22 13:41:31 +08:00 |
yangxiao
|
7818b28ee3
|
Merge branch 'newcode' into v3
|
2014-08-22 13:32:57 +08:00 |
andyque
|
84cf0ee834
|
add disableCascadeOpacity to ProtectedNode and Scale9Sprite
|
2014-08-22 11:49:39 +08:00 |
minggo
|
2afbc7a698
|
fix warnings
|
2014-08-21 16:21:23 +08:00 |
pandamicro
|
34b93a24ff
|
Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into 3.2-cocos-engine-PR
Conflicts:
cocos/platform/desktop/CCGLViewImpl.h
|
2014-08-21 16:07:19 +08:00 |
pandamicro
|
909dd0d397
|
Update #3897: Refactor missed protected constructors
|
2014-08-21 15:11:33 +08:00 |
teivaz
|
aecdb832a2
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-08-21 13:48:05 +03:00 |
teivaz
|
a70688dc96
|
+ [WINRT] Inserted newly added files to cocos WIN RT project
|
2014-08-21 13:47:53 +03:00 |
yangxiao
|
c26a81bb55
|
Merge branch 'newcode' into v3
|
2014-08-21 09:53:06 +08:00 |
yangxiao
|
fcf4d79b06
|
setGLProgramState support
|
2014-08-20 19:01:04 +08:00 |
minggo
|
bbf5c56e83
|
Merge pull request #7827 from andyque/ccRandom
add c++11 random library support
|
2014-08-20 13:35:12 +08:00 |
andyque
|
34629f1014
|
fix windows & win8 & wp8 compile error
|
2014-08-20 12:02:12 +08:00 |
Sergey
|
055a143f9d
|
Label performance problem
|
2014-08-19 15:02:09 +04:00 |
teivaz
|
db805ee2c8
|
* Fixed WP8 cocos library project
* Fixed profiling macros
|
2014-08-19 19:24:56 +03:00 |
minggo
|
22fa650bbf
|
Merge pull request #7807 from samuele3hu/v3_3_3d_module
Split 3d module from cocos2d and adjust related cpp and Lua project setting on the different platforms except wp8
|
2014-08-18 22:38:58 +08:00 |
samuele3hu
|
6259aebdab
|
Split cocos3d from cocos2d on the android、win32 and linux platform and adjust the related test project
|
2014-08-17 23:45:56 +08:00 |
Dmitry Bushtets
|
1257f642c7
|
- added export to dll for: ZipFile, CGAffineToGL, GLToCGAffine, XXH32 (in .def file)
|
2014-08-15 13:20:37 +03:00 |
minggo
|
f2f8035724
|
Merge pull request #7708 from super626/obb
AABB, OBB
|
2014-08-15 15:32:14 +08:00 |
minggo
|
aa052eb1c1
|
add CCModuleManager into vs project
|
2014-08-15 14:39:15 +08:00 |
teivaz
|
90e5870499
|
* Fixed WP compilation errors (added CCPrimitive, CCPrimitiveCommand, CCVertexIndexBuffer and CCVertexIndexData to the project)
|
2014-08-14 15:35:36 +03:00 |
teivaz
|
885fd16b9e
|
* Fixed WP8 compilation error (Added missing files CCCamera.h/cpp to the project)
|
2014-08-14 15:20:48 +03:00 |
teivaz
|
e9563696db
|
* Fixed WP8 compilation errors (added path to CCGLView.h)
- Modified filters for CCCamera.h/cpp
|
2014-08-14 15:14:25 +03:00 |
yangxiao
|
a508477eda
|
remove unused code
|
2014-08-14 19:07:40 +08:00 |
yangxiao
|
2786e63824
|
Merge branch 'newcode' into obb
|
2014-08-14 18:58:46 +08:00 |
yangxiao
|
ab783d2702
|
merge cocos2d
|
2014-08-14 17:12:39 +08:00 |