2youyou2
|
719fdb712d
|
add frame event test
|
2014-06-18 11:22:38 +08:00 |
andyque
|
ca24ad6768
|
Merge branch 'v3' into cleanupBinaryLoader
|
2014-06-18 11:19:19 +08:00 |
minggo
|
df798baa8b
|
Merge pull request #7059 from Rumist/v3
BUG FIX : #5553
|
2014-06-18 11:18:33 +08:00 |
minggo
|
f05eb9532d
|
fix compiling error
|
2014-06-18 11:11:08 +08:00 |
minggo
|
76856af709
|
[ci skip]
|
2014-06-18 10:36:53 +08:00 |
minggo
|
8a0a6a2ded
|
Merge pull request #7064 from kyokomi/TextReader_filePath_fix
Fix bug for TextReader #setFontName.
|
2014-06-18 10:36:29 +08:00 |
minggo
|
ba54f8c92c
|
[ci skip]
|
2014-06-18 10:34:57 +08:00 |
minggo
|
7589bc7b40
|
Merge pull request #7068 from kyokomi/UIButton_ttfFont
Fix UIButton.cpp added TTFFont.
|
2014-06-18 10:32:46 +08:00 |
minggo
|
66ec8f1ee1
|
Merge pull request #7106 from dabingnn/v3SmallerTexture
use a small texture for sprite3D
|
2014-06-18 10:31:50 +08:00 |
minggo
|
3c789ca35b
|
Merge pull request #7107 from MSOpenTech/wp8-v3-fix
Fixes broken WP8 V3 build
|
2014-06-18 10:00:29 +08:00 |
Dale Stammen
|
da9a652868
|
added missing files to project
|
2014-06-17 09:27:36 -07:00 |
Dale Stammen
|
6fcf43e64d
|
#undef NEAR reserved word for WP8 and WinRT
|
2014-06-17 09:27:19 -07:00 |
Huabing.Xu
|
2c8c9dea01
|
use a small texture for sprite3D
|
2014-06-17 22:31:56 +08:00 |
minggo
|
9784f4d9f3
|
Merge pull request #7101 from CocosRobot/update_lua_bindings_1403010712
[AUTO]: updating luabinding automatically
|
2014-06-17 21:35:35 +08:00 |
minggo
|
c7b14cfcba
|
Merge pull request #7103 from CocosRobot/update_cocosfiles_1403011185
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-17 21:34:51 +08:00 |
minggo
|
611ab0e9c3
|
Merge pull request #7104 from CocosRobot/update_lua_bindings_1403011348
[AUTO]: updating luabinding automatically
|
2014-06-17 21:34:25 +08:00 |
minggo
|
dee0c7666b
|
Merge pull request #7100 from CocosRobot/update_cocosfiles_1403010564
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-17 21:33:16 +08:00 |
CocosRobot
|
22e1d69f9f
|
[AUTO]: updating luabinding automatically
|
2014-06-17 13:24:08 +00:00 |
CocosRobot
|
2d68b408e0
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-17 13:19:46 +00:00 |
minggo
|
269ed214a9
|
[ci skip]
|
2014-06-17 21:18:08 +08:00 |
minggo
|
bd0cf66efa
|
Merge pull request #7102 from minggo/v3
update changelog and release note
|
2014-06-17 21:15:30 +08:00 |
minggo
|
9b6d58118c
|
update changelog and release note
|
2014-06-17 21:13:49 +08:00 |
CocosRobot
|
fea6509c22
|
[AUTO]: updating luabinding automatically
|
2014-06-17 13:13:31 +00:00 |
CocosRobot
|
a292f7d063
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-17 13:09:25 +00:00 |
minggo
|
26cca348cb
|
Merge pull request #7085 from super626/v3
Sprite3D animation
|
2014-06-17 21:05:58 +08:00 |
minggo
|
17bbb675df
|
[ci skip]
|
2014-06-17 20:23:26 +08:00 |
yangxiao
|
1ba59fba94
|
code adjustment according to minggo
|
2014-06-17 19:18:56 +08:00 |
minggo
|
ec632a54b2
|
[ci skip]
|
2014-06-17 18:50:47 +08:00 |
minggo
|
552c3cbb2f
|
[ci skip]
|
2014-06-17 18:42:10 +08:00 |
minggo
|
caafc0ebc5
|
[ci skip]
|
2014-06-17 18:38:33 +08:00 |
bofeng-song
|
d97b28db76
|
modify copy script & modify release version`s outfile addr
|
2014-06-17 18:17:35 +08:00 |
minggo
|
5668674cc0
|
Merge pull request #7097 from andyque/fixDoxygenProblem
fix doxygen
|
2014-06-17 17:29:12 +08:00 |
andyque
|
62c4c9a69f
|
fix doxygen
|
2014-06-17 17:31:54 +08:00 |
Huabing.Xu
|
605b3517f0
|
roll back submodule plugin
|
2014-06-17 16:41:10 +08:00 |
Huabing.Xu
|
77091cad8b
|
Merge branch 'v3' of github.com:super626/cocos2d-x into v3Animation
|
2014-06-17 16:37:03 +08:00 |
Huabing.Xu
|
8efaf11a85
|
roll back submodule of bindings-generator and cocos2d-console
|
2014-06-17 16:35:25 +08:00 |
minggo
|
4da24dfade
|
issue #4693: correct comment
|
2014-06-17 16:21:24 +08:00 |
kyokomi
|
b6ed783b0b
|
fix use raw char* to represent string.
|
2014-06-17 17:05:44 +09:00 |
2youyou2
|
806d74b6f9
|
add change play section test
|
2014-06-17 15:57:30 +08:00 |
2youyou2
|
c221a59954
|
fixed frame's value not right when enter frame
|
2014-06-17 15:57:06 +08:00 |
kyokomi
|
3f7cecaf8b
|
fix move this enum class to private part and change `Type` to `FontType`.
|
2014-06-17 16:34:54 +09:00 |
yangxiao
|
e1fb8c82f0
|
missing include
|
2014-06-17 15:31:45 +08:00 |
yangxiao
|
6c39dc0e18
|
adjust includes
|
2014-06-17 15:28:14 +08:00 |
lvlong
|
c1fd9adebf
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
|
2014-06-17 13:59:25 +08:00 |
minggo
|
b88edf4058
|
Merge pull request #7093 from CocosRobot/update_cocosfiles_1402984224
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-17 13:59:07 +08:00 |
lvlong
|
ef32bffceb
|
modify bundle3D load()
|
2014-06-17 13:59:03 +08:00 |
minggo
|
a640557f88
|
Merge pull request #7095 from CocosRobot/update_cocosfiles_1402984705
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-17 13:58:58 +08:00 |
CocosRobot
|
7f9c86ab44
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-06-17 05:58:26 +00:00 |
minggo
|
f79561c135
|
Merge pull request #7094 from CocosRobot/update_lua_bindings_1402984310
[AUTO]: updating luabinding automatically
|
2014-06-17 13:57:09 +08:00 |
CocosRobot
|
657b90422d
|
[AUTO]: updating luabinding automatically
|
2014-06-17 05:53:04 +00:00 |