andyque
|
a6b81ec772
|
issue #3333, fix project unused link
|
2014-04-21 17:13:43 +08:00 |
samuele3hu
|
b3ac3b2324
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_fix
|
2014-04-21 17:13:34 +08:00 |
samuele3hu
|
b313b4ce74
|
Comment the last three test cases
|
2014-04-21 17:09:44 +08:00 |
minggo
|
82d70e3492
|
Merge pull request #6338 from natural-law/develop
Enable depth test in test case : TilemapTest->TMXOrthoVertexZ.
|
2014-04-21 15:38:21 +08:00 |
zhangbin
|
440702aa06
|
Enable depth test in test case : TilemapTest->TMXOrthoVertexZ.
|
2014-04-21 15:26:57 +08:00 |
minggo
|
3ac08b7349
|
Merge pull request #6300 from elvman/develop
Flipping RenderTexture's sprite instead of scaling it by -1
|
2014-04-21 15:23:10 +08:00 |
minggo
|
816692ea37
|
[ci skip]
|
2014-04-21 14:55:31 +08:00 |
minggo
|
daf07a255c
|
Merge pull request #6336 from minggo/update-release-note
update release note
|
2014-04-21 14:51:45 +08:00 |
minggo
|
ec721dd448
|
update release note
|
2014-04-21 14:50:27 +08:00 |
James Chen
|
84208937c3
|
Merge pull request #6334 from CocosRobot/update_lua_bindings_1398062637
[AUTO]: updating luabinding automatically
|
2014-04-21 14:47:56 +08:00 |
minggo
|
a29f34f765
|
Merge pull request #6335 from minggo/update-release-note
update release note
|
2014-04-21 14:47:07 +08:00 |
minggo
|
c897f33eec
|
update release note
|
2014-04-21 14:45:36 +08:00 |
CocosRobot
|
77130708c2
|
[AUTO]: updating luabinding automatically
|
2014-04-21 06:45:09 +00:00 |
minggo
|
0a5b92c56f
|
Merge pull request #6305 from samuele3hu/developAudio
fix the bug that exit layer can’t end the SimpleAudioEngine
|
2014-04-21 14:40:40 +08:00 |
minggo
|
02c2fc8abf
|
Merge pull request #6333 from chuanweizhang2013/luaruntime
translate
|
2014-04-21 14:06:32 +08:00 |
minggo
|
8a75bccdc1
|
Merge pull request #6332 from minggo/develop
update version
|
2014-04-21 13:44:40 +08:00 |
minggo
|
b53b9ceb3e
|
update version
|
2014-04-21 13:43:42 +08:00 |
boyu0
|
710fe9d940
|
closed #4771: modify test.
|
2014-04-21 13:32:47 +08:00 |
minggo
|
360b63aa53
|
Merge pull request #6331 from natural-law/develop
Update the description of "how to start a new game" in README.md.
|
2014-04-21 11:41:32 +08:00 |
zhangbin
|
c0dfbc7561
|
Update the description of "how to start a new game" in README.md.
|
2014-04-21 11:37:35 +08:00 |
James Chen
|
5a81ed6521
|
Update AUTHORS [ci skip]
|
2014-04-21 11:20:52 +08:00 |
James Chen
|
8da373f358
|
Update AUTHORS [ci skip]
|
2014-04-21 11:20:16 +08:00 |
James Chen
|
c39a69895d
|
Update CHANGELOG [ci skip]
|
2014-04-21 11:19:39 +08:00 |
James Chen
|
a75432ec35
|
Merge pull request #6262 from Mazyod/develop-editbox-mac-enhancements
Mac Editbox Text Font and Placeholder features
|
2014-04-21 11:18:07 +08:00 |
minggo
|
9166b6430f
|
[ci skip]
|
2014-04-21 11:11:39 +08:00 |
minggo
|
1bde8a3e07
|
[ci skip]
|
2014-04-21 11:09:42 +08:00 |
minggo
|
65ffb5bb65
|
Merge pull request #6324 from kicktheken/develop
Fix lua project template crash on iOS5.1 device
|
2014-04-21 11:07:59 +08:00 |
chuanweizhang2013
|
1fe52b1557
|
translate
|
2014-04-21 11:07:14 +08:00 |
minggo
|
e3d7119716
|
Merge pull request #6326 from chuanweizhang2013/luaruntime
update android runtime
|
2014-04-21 11:06:30 +08:00 |
minggo
|
b43a051ef2
|
Merge pull request #6328 from natural-law/develop
Update the reference of submodule cocos2d-console.
|
2014-04-21 11:04:24 +08:00 |
minggo
|
fffef663a0
|
[ci skip]
|
2014-04-21 11:03:57 +08:00 |
minggo
|
1c44dbe385
|
Merge pull request #6327 from boyu0/bug4904_Image_safeToFile_crashes_ios
closed #4904: fix ios Image::saveToFile crashes when save jpg file.
|
2014-04-21 11:02:11 +08:00 |
zhangbin
|
00910216b1
|
Update the reference of submodule cocos2d-console.
|
2014-04-21 11:01:39 +08:00 |
boyu0
|
4acba7bdfa
|
closed #4904: use new Xcode command line tools to compile i386 arch libjpeg.a file, and shrink the lib file.
|
2014-04-21 10:28:21 +08:00 |
boyu0
|
a1024353f1
|
issue #4904: fix iOS Image::safeToFile crashes when save jpg file.
|
2014-04-21 10:25:34 +08:00 |
Huabing.Xu
|
e74f8719cf
|
fix warning in compiling
|
2014-04-21 09:52:59 +08:00 |
Dale Stammen
|
9792a4708a
|
fixed curl DEBUGASSERT for release builds
|
2014-04-19 10:33:40 -07:00 |
Dale Stammen
|
29af6f6c7e
|
updated project settings
|
2014-04-19 10:13:12 -07:00 |
Dale Stammen
|
6646e6c860
|
input event refactor. console enabled for wp8
|
2014-04-19 10:12:34 -07:00 |
Dale Stammen
|
d235539b39
|
added missing include paths
|
2014-04-19 10:12:06 -07:00 |
Dale Stammen
|
8d6fe7be1a
|
added missing files
|
2014-04-19 10:11:44 -07:00 |
Dale Stammen
|
f71178bac5
|
added missing files
|
2014-04-19 10:11:18 -07:00 |
Dale Stammen
|
3930beda40
|
input event refactor. console enabled for wp8
|
2014-04-19 10:10:44 -07:00 |
Dale Stammen
|
617982cbe5
|
added missing projects. Fixed property sheets
|
2014-04-19 10:09:53 -07:00 |
Dale Stammen
|
4a7fa029cc
|
updated property sheet include paths and warnings
|
2014-04-19 10:09:10 -07:00 |
Dale Stammen
|
467ededeff
|
enabled console for wp8
|
2014-04-19 10:08:01 -07:00 |
Dale Stammen
|
b0adaee331
|
added missing WP8 device orientation
|
2014-04-19 10:06:27 -07:00 |
Dale Stammen
|
768e0bd53f
|
updated wp8 precompiled shaders
|
2014-04-19 10:05:21 -07:00 |
Dale Stammen
|
8f14597717
|
check if _currentUTF16String is null
|
2014-04-19 09:38:45 -07:00 |
Dale Stammen
|
9cf463bf6a
|
start of input queue support
|
2014-04-19 09:37:54 -07:00 |