minggo
|
0c8d10b8dd
|
[ci skip] Update CHANGELOG
|
2015-01-22 09:49:41 +08:00 |
minggo
|
ece379bc64
|
Merge pull request #10162 from Dhilan007/v3-label-blockfix
Fixed label may become white/black block after resume from background on android
|
2015-01-22 09:48:10 +08:00 |
minggo
|
3eba023f2a
|
Merge pull request #10059 from cpascal/v3
Fixed inconsistent time-scale in Httpclient.
|
2015-01-22 09:47:40 +08:00 |
minggo
|
bd8c27b370
|
Merge pull request #10163 from MSOpenTech/wp8-fix
Updated precompiled shaders for WP8. Fixes issue 10161
|
2015-01-22 09:36:30 +08:00 |
Dale Stammen
|
e5b54f8c47
|
updated precompiled shaders for wp8
|
2015-01-21 10:50:44 -08: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 |
minggo
|
7eaa4fed5d
|
[ci skip] Update CHANGELOG
|
2015-01-21 21:01:41 +08:00 |
minggo
|
a0091058f6
|
Merge pull request #10157 from dabingnn/v3_fixandroidCrashWithoutneon
only mathUtil.cpp compiles with neon
|
2015-01-21 20:23:20 +08:00 |
minggo
|
954f372775
|
Merge pull request #10156 from vovkasm/fix-warnings
Fix warnings
|
2015-01-21 20:23:00 +08:00 |
minggo
|
0f46dec0c8
|
Merge pull request #10159 from samuele3hu/v3_4_rc1
[ci skip]Add checked lua test codes for issue #10107
|
2015-01-21 19:39:07 +08:00 |
samuele3hu
|
01bfe09c05
|
Add checked lua codes for issue #10107
|
2015-01-21 19:33:42 +08:00 |
Huabing.Xu
|
daa6d47b40
|
only mathUtil.cpp compiles with neon
|
2015-01-21 18:29:28 +08:00 |
Vladimir Timofeev
|
6e01cab380
|
Fix, thanks @minggo!
|
2015-01-21 13:19:43 +03:00 |
Vladimir Timofeev
|
610e24b453
|
Fix warning: CCLOG_STRING_TAG not used by enclosing it in platform ifdef. Provide empty SendLogToWindow implementation by default.
|
2015-01-21 13:07:21 +03:00 |
Vladimir Timofeev
|
4e25ffbc7f
|
Fix "field 'XXX' will be initialized after 'YYY'" warning in Xcode by reorder initialization sentences.
|
2015-01-21 12:59:53 +03:00 |
minggo
|
a74c75ae7b
|
Merge pull request #10154 from CocosRobot/update_lua_bindings_1421832682
[AUTO]: updating luabinding automatically
|
2015-01-21 17:50:44 +08:00 |
minggo
|
ce3052a6a7
|
Merge pull request #10152 from doomsdayer/v3
Updated the csb resources for test-cpp
|
2015-01-21 17:46:38 +08:00 |
CocosRobot
|
5e273da0ec
|
[AUTO]: updating luabinding automatically
|
2015-01-21 09:33:26 +00:00 |
minggo
|
7b4530fead
|
Merge pull request #10153 from samuele3hu/v3_4_rc1
[ci skip]Update bindings-generator submodule
|
2015-01-21 17:28:07 +08:00 |
samuele3hu
|
91a5129e61
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_4_rc1
|
2015-01-21 17:25:18 +08:00 |
samuele3hu
|
3dd590cf9d
|
Update bindings-generator submodule
|
2015-01-21 17:18:54 +08:00 |
yusheng.lu
|
bec9b0e6b3
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2015-01-21 17:14:16 +08:00 |
yusheng.lu
|
304f28a58a
|
Update the csb resources for current Cocos2d-x
|
2015-01-21 17:08:16 +08:00 |
minggo
|
72fb059aeb
|
Merge pull request #10144 from andyque/fixButtonPressActionIssue
fix button pressAction scale issue
|
2015-01-21 16:37:59 +08:00 |
minggo
|
aab3de0b3e
|
[ci skip] Update CHANGELOG
|
2015-01-21 16:27:55 +08:00 |
minggo
|
6b5b0f9784
|
Merge pull request #10149 from Dhilan007/v3-audioengine-freeze-fix
Fixed AudioEngine causes game 'freeze' on Android
|
2015-01-21 16:23:14 +08:00 |
minggo
|
67fed12e1b
|
Merge pull request #10148 from CocosRobot/update_cocosfiles_1421827655
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-01-21 16:21:00 +08:00 |
WenhaiLin
|
5fd9ccfecb
|
Fixed AudioEngine causes game 'freeze' on Android
|
2015-01-21 16:18:47 +08:00 |
CocosRobot
|
c1e586ebab
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-01-21 08:07:36 +00:00 |
minggo
|
ead455eb08
|
Merge pull request #10143 from andyque/updateDeps
update 3rd party libraries to v3-deps-33
|
2015-01-21 16:05:11 +08:00 |
minggo
|
86b1f4594a
|
Merge pull request #10147 from geron-cn/fixProjectNodeLoader
ProjectNode's actiontimeline should jump to 0 frame when after nest i...
|
2015-01-21 15:49:39 +08:00 |
minggo
|
571e313ff5
|
Merge pull request #10146 from htlxyz/fixed_show_dialog_on_android_without_runtime
fixed run lua samples 360 will popup access wifi note!
|
2015-01-21 15:34:13 +08:00 |
htl
|
12010ce3da
|
fixed run lua samples 360 will popup access wifi note!
|
2015-01-21 15:30:05 +08:00 |
geron-cn
|
2fc79e2da5
|
ProjectNode's actiontimeline should jump to 0 frame when after nest into another csd
|
2015-01-21 15:21:23 +08:00 |
minggo
|
b1e7d66294
|
[ci skip] Update CHANGELOG
|
2015-01-21 15:09:06 +08:00 |
minggo
|
97f29adf84
|
Merge pull request #10138 from dabingnn/v3_fixcrashForTextureAtlas
fix crash for textureAtlas
|
2015-01-21 15:02:06 +08:00 |
andyque
|
d3241cae9c
|
update 3rd party libraries to v3-deps-33
|
2015-01-21 15:00:27 +08:00 |
minggo
|
82bb5e6f69
|
Merge pull request #10142 from CocosRobot/update_lua_bindings_1421822695
[AUTO]: updating luabinding automatically
|
2015-01-21 14:58:52 +08:00 |
andyque
|
d58426db99
|
fix button pressAction scale issue
|
2015-01-21 14:54:37 +08:00 |
CocosRobot
|
4f7b6608c4
|
[AUTO]: updating luabinding automatically
|
2015-01-21 06:46:49 +00: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 |
Huabing.Xu
|
0ca47ab40f
|
fix crash for textureAtlas
|
2015-01-21 14:14:53 +08:00 |
minggo
|
335f69d95d
|
Merge pull request #10110 from super626/v3
Fix Animate3D speed bug and add parameter to Ray::intersects
|
2015-01-21 14:11:11 +08:00 |
minggo
|
607ae4c2ca
|
Merge pull request #10136 from andyque/fixSliderProgressBarRender
fix progress bar render issue when switch scale9
|
2015-01-21 14:10:18 +08:00 |
minggo
|
060c7b6721
|
Merge pull request #10137 from CocosRobot/update_lua_bindings_1421818960
[AUTO]: updating luabinding automatically
|
2015-01-21 14:09:57 +08:00 |
Huabing.Xu
|
14e9ff4ba4
|
Merge pull request #10134 from CocosRobot/update_cocosfiles_1421818870
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-01-21 13:46:46 +08:00 |
CocosRobot
|
b31b22491d
|
[AUTO]: updating luabinding automatically
|
2015-01-21 05:44:30 +00:00 |
andyque
|
7f7506fb99
|
fix progress bar render issue when switch scale9
|
2015-01-21 13:41:40 +08:00 |