pipu
|
e7c89dadf1
|
Manage reference count of ActiontimelineData object in ObjectExtensionData.
|
2015-03-18 16:56:16 +08:00 |
calfjohn
|
83e69f4532
|
add comments for PhysicsWorld
|
2015-03-18 16:35:38 +08:00 |
minggo
|
0408fc0667
|
update document for CCRef.h
|
2015-03-18 15:02:03 +08:00 |
Huabing.Xu
|
eb2786f40d
|
[ci skip]update comments CCVertexIndexData.h
|
2015-03-18 14:43:44 +08:00 |
minggo
|
aa5f257243
|
Merge pull request #10938 from minggo/add-documentation
[ci skip]Add documentation
|
2015-03-18 14:11:30 +08:00 |
minggo
|
723244f62d
|
Merge pull request #10932 from lyubomirv/v3-bulgarian
Added Bulgarian language.
|
2015-03-18 14:01:26 +08:00 |
minggo
|
5271c75c11
|
Merge pull request #10936 from super626/v3
Camera mask for label
|
2015-03-18 14:00:44 +08:00 |
minggo
|
eeebe97547
|
Merge pull request #10937 from CocosRobot/update_lua_bindings_1426657990
[AUTO]: updating luabinding automatically
|
2015-03-18 13:57:08 +08:00 |
CocosRobot
|
611ec0a4a5
|
[AUTO]: updating luabinding automatically
|
2015-03-18 05:55:07 +00:00 |
Huabing.Xu
|
edf785cec3
|
[ci skip]update version
|
2015-03-18 13:52:52 +08:00 |
minggo
|
465d2dc415
|
Merge pull request #10934 from pipu/avoid_crash_parse_csd
Avoid crash during parse .csd file.
|
2015-03-18 13:49:52 +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 |
pipu
|
faf9d6b01c
|
Avoid crash during parse .csd file.
|
2015-03-18 10:28:12 +08:00 |
minggo
|
be2af44583
|
update document for CCDirector.h
|
2015-03-17 22:32:26 +08:00 |
lyubomirv
|
2aec39ad56
|
Added Bulgarian language.
|
2015-03-17 15:14:02 +02:00 |
minggo
|
44c04153a6
|
update document for CCDataVisitor.h
|
2015-03-17 20:54:47 +08:00 |
minggo
|
36bf7c6d39
|
update document for CCAutoreleaseData.h
|
2015-03-17 20:49:00 +08:00 |
minggo
|
5b55e873d0
|
update document for CCAutoreleasePool.h
|
2015-03-17 20:15:50 +08:00 |
minggo
|
1e271a9d96
|
Merge pull request #10899 from super626/v3
Bug fix
|
2015-03-17 19:29:21 +08:00 |
XiaoYang
|
8bbce138f3
|
Merge pull request #256 from songchengjiang/v3
fix bugs
|
2015-03-17 17:53:46 +08:00 |
songchengjiang
|
a9e5f8cc4a
|
replace static_cast with dynamic_cast
|
2015-03-17 17:47:58 +08:00 |
yangxiao
|
e6770909f2
|
reset expolosion
|
2015-03-17 17:47:53 +08:00 |
yangxiao
|
f24f2d617d
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
|
2015-03-17 17:45:12 +08:00 |
yangxiao
|
dced8004e1
|
reset explosion and fix bug of event handler
|
2015-03-17 17:44:52 +08:00 |
songchengjiang
|
73caf536da
|
fix the bug of lighting shader
|
2015-03-17 16:43:08 +08:00 |
XiaoYang
|
9a0613a652
|
Merge pull request #255 from lvlonggame/v3
replace setAdditionalTransform
|
2015-03-17 15:48:14 +08:00 |
lvlong
|
3ce0449c97
|
decompose
|
2015-03-17 15:17:23 +08:00 |
minggo
|
c89ac9f336
|
Merge pull request #10924 from CocosRobot/update_lua_bindings_1426573536
[AUTO]: updating luabinding automatically
|
2015-03-17 14:41:52 +08:00 |
CocosRobot
|
9df3f57e0d
|
[AUTO]: updating luabinding automatically
|
2015-03-17 06:28:14 +00:00 |
minggo
|
56718294a6
|
Merge pull request #10921 from CocosRobot/update_cocosfiles_1426573112
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-03-17 14:19:08 +08:00 |
CocosRobot
|
2b14d11bb9
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-03-17 06:18:34 +00:00 |
minggo
|
aa573a9553
|
Merge pull request #10904 from pipu/fixed_widget_reader_actiontag
Optimize parse action tag for node and widget.
|
2015-03-17 14:18:22 +08:00 |
minggo
|
f51e2b9537
|
Merge pull request #10912 from perminovVS/v3-dev-console
Create Console before any sub systems
|
2015-03-17 14:17:35 +08:00 |
minggo
|
5b2ba424b1
|
Merge pull request #10918 from CocosRobot/update_cocosfiles_1426563205
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-03-17 14:16:38 +08:00 |
minggo
|
3aa522eca2
|
Merge pull request #10905 from MSOpenTech/v3-wp8-fix
V3 Update Angle to support gl_PointSize on Windows Phone 8.1
|
2015-03-17 14:15:56 +08:00 |
lvlong
|
733a89100e
|
remove old code!
|
2015-03-17 13:13:03 +08:00 |
Dale Stammen
|
ec50e653c4
|
updated version to 35
|
2015-03-16 21:21:42 -07:00 |
lvlong
|
080132d072
|
modify sub node transform!
|
2015-03-17 12:15:03 +08:00 |
Dale Stammen
|
5606fad642
|
Merge branch 'v3' into v3-wp8-fix
|
2015-03-16 20:47:55 -07:00 |
CocosRobot
|
d2a853c72b
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-03-17 03:33:26 +00:00 |
minggo
|
7e5708cac6
|
Merge pull request #10917 from yangws/v3
Add doxygen config for white book and cocos/doxygen_modules.h for doc mu...
|
2015-03-17 11:32:07 +08: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 |
minggo
|
f7d5a16734
|
Merge pull request #10873 from konopka/fix_compiler_override_warnings
Fix compiler override warnings
|
2015-03-17 10:38:19 +08:00 |
Vladimir Perminov
|
e745d5949a
|
Create Console before any sub systems
Sub system use cocos2d::log in constructors.
|
2015-03-16 20:22:20 +03:00 |
konopka
|
0387b13bb6
|
Adding missing virtual keywords
|
2015-03-16 16:39:43 +01:00 |
konopka
|
7fb79272ca
|
Undo changes that are not allowed by spine license
|
2015-03-16 16:35:41 +01:00 |
Dale Stammen
|
e2a5eb2f9f
|
updated to Angle ddbf057c52
|
2015-03-16 08:18:26 -07:00 |
Dale Stammen
|
08ceae3de2
|
removed no-gl_PointSize shaders for Windows Phone 8.1
|
2015-03-16 08:08:02 -07:00 |