James Chen
|
c7bbd99b73
|
issue #3828: Updates the path of java library reference.
|
2014-01-28 17:16:01 +08:00 |
James Chen
|
c0746f40f9
|
issue #3828: Removes unused link folder.
|
2014-01-28 17:13:02 +08:00 |
James Chen
|
41e261509b
|
Update CHANGELOG [ci skip]
|
2014-01-28 16:33:01 +08:00 |
James Chen
|
3cf052c353
|
Update AUTHORS [ci skip]
|
2014-01-28 16:31:59 +08:00 |
James Chen
|
6a3e9d7c13
|
Merge pull request #5222 from martell/dutch3
closed #3879: Added Dutch Language support for 3.x branch.
|
2014-01-28 00:30:53 -08:00 |
James Chen
|
3f8f36df68
|
issue #3828: Updates travis script.
|
2014-01-28 16:23:16 +08:00 |
James Chen
|
6d491e66cf
|
issue #3828: Updates travis-scripts/run-script.sh
|
2014-01-28 16:11:54 +08:00 |
James Chen
|
5e4779aef2
|
issue #3828: Updates TestJavascript.vcxproj.
|
2014-01-28 16:09:36 +08:00 |
James Chen
|
6988d48d08
|
issue #3828: Updates win32 projects.
|
2014-01-28 15:49:23 +08:00 |
James Chen
|
a00b4a7c49
|
issue #3828: Updates JS-Test.
|
2014-01-28 15:38:07 +08:00 |
James Chen
|
ffd8970996
|
issue #3828: Updates android build.
|
2014-01-28 15:33:23 +08:00 |
James Chen
|
ebe22aaeec
|
issue #3828: Fix a mistake in android-build.py.
|
2014-01-28 15:17:34 +08:00 |
James Chen
|
5d67d53393
|
issue #3828: Updates android build.
|
2014-01-28 15:14:27 +08:00 |
James Chen
|
8c9b4f27c6
|
issue #3828: Removes unused files generated by eclipse.
|
2014-01-28 15:14:27 +08:00 |
James Chen
|
f6fa26d251
|
issue #3828: Updates CMakeLists.txt of testlua.
|
2014-01-27 23:10:11 -08:00 |
James Chen
|
c2f1fbc4c1
|
issue #3828: Updates CMakeLists.txt. Removes unused CMakeLists.txt.
|
2014-01-28 14:52:47 +08:00 |
James Chen
|
d1d447b52e
|
issue #3828: Updates iOS & Mac projects. And update JS-Tests.
|
2014-01-28 12:55:06 +08:00 |
James Chen
|
3592873e2f
|
issue #3828: Moves submodule of JStest.
|
2014-01-28 11:40:27 +08:00 |
James Chen
|
bc618ee424
|
issue #3828: Renames `TestXxx` to `test-xxx` for samples.
|
2014-01-28 11:34:12 +08:00 |
Ricardo Quesada
|
20346499ab
|
Continue with the refactoring
|
2014-01-27 19:16:09 -08:00 |
James Chen
|
e80a0b2848
|
issue #3828: Updates CMakeLists.txt. Removes HelloCpp/ HelloLua.
|
2014-01-28 11:14:16 +08:00 |
James Chen
|
5b1cea1f59
|
issue #3828: Moves JS-tests submodule to samples/TestJavascript/tests.
|
2014-01-28 10:51:01 +08:00 |
James Chen
|
2f02e2e390
|
issue #3828: Removes some samples(HelloCpp, HelloLua, JSB games), moves test case samples(TestCpp, TestJavascript, TestLua) to previous folder (cocos2d-x/samples).
|
2014-01-28 10:40:47 +08:00 |
Ricardo Quesada
|
b96c4f1ad0
|
Only compile iOS files on iOS
|
2014-01-27 16:44:10 -08:00 |
Ricardo Quesada
|
1f4ca2f0ad
|
Works on Android
|
2014-01-27 13:05:58 -08:00 |
Ricardo Quesada
|
67b62224b4
|
restore it to platform=10
|
2014-01-27 12:39:24 -08:00 |
Ricardo Quesada
|
3bb74c08ca
|
Merge branch 'glview_improvements' of github.com:ricardoquesada/cocos2d-x into glview_improvements
|
2014-01-27 10:53:12 -08:00 |
Ricardo Quesada
|
efaec7b7ec
|
Merge branch 'develop' into glview_improvements
Conflicts:
samples/Lua/HelloLua/Classes/AppDelegate.cpp
template/multi-platform-lua/Classes/AppDelegate.cpp
|
2014-01-27 10:52:35 -08:00 |
James Chen
|
042ec10ffb
|
Merge pull request #5261 from CocosRobot/updategeneratedsubmodule_1390816204
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-27 01:54:53 -08:00 |
CocosRobot
|
a2fc1cf970
|
[AUTO] : updating submodule reference to latest autogenerated bindings
|
2014-01-27 09:50:08 +00:00 |
James Chen
|
e83ddec7b8
|
Merge pull request #5258 from lmskater/create-module-project
[Jenkins] add create-template-project.py
|
2014-01-27 01:42:07 -08:00 |
James Chen
|
94b26536ff
|
Merge pull request #5260 from samuele3hu/developBug
fix:Add lua binding for ‘Component’
|
2014-01-27 01:41:26 -08:00 |
James Chen
|
b736da52f7
|
Merge pull request #5259 from Dhilan007/develop_crash
fix miss websocket lib for HelloLua on vs.
|
2014-01-27 01:40:44 -08:00 |
lm
|
f6e4f4b44b
|
[Jenkins] rename language to languages
|
2014-01-27 17:22:24 +08:00 |
lm
|
607a060256
|
[Jenkins] rename module to template
|
2014-01-27 17:09:14 +08:00 |
samuele3hu
|
d9ceed2a7c
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBug
|
2014-01-27 17:08:34 +08:00 |
samuele3hu
|
1fa2f24bf2
|
fix:Add the lua binding for ‘Component’
|
2014-01-27 17:04:37 +08:00 |
Dhilan007
|
662b3dd9a0
|
fix miss websocket lib for HelloLua on vs.
|
2014-01-27 17:02:31 +08:00 |
lm
|
8356afdd0e
|
[Jenkins] add create-module-project.py
|
2014-01-27 16:46:35 +08:00 |
James Chen
|
09197b65b0
|
Update CHANGELOG [ci skip]
|
2014-01-27 16:39:52 +08:00 |
James Chen
|
fa995c27fb
|
Merge pull request #5257 from dumganhar/iss3871-stop-propagation-fix
closed #3871: event->stopPropagation can't work for EventListenerAllAtOnce. And add relevant test case.
|
2014-01-27 00:35:04 -08:00 |
James Chen
|
098869852b
|
issue #3871: Removes unneeded empty lines.
|
2014-01-27 16:32:04 +08:00 |
James Chen
|
8141397bbd
|
closed #3871: event->stopPropagation can't work for EventListenerAllAtOnce. And add relevant test case.
|
2014-01-27 16:30:20 +08:00 |
James Chen
|
bbe156fe37
|
Update CHANGELOG [ci skip]
|
2014-01-27 16:12:31 +08:00 |
James Chen
|
f64e8826b8
|
Merge pull request #5242 from Dhilan007/develop_crash
close #3861:fixed NativeActivity issue ANR on android 2.3 when press hardware button.
|
2014-01-27 00:07:24 -08:00 |
Dhilan007
|
35cf49c26d
|
close #3861:fixed NativeActivity issue ANR on android 2.3 when press hardware button.
|
2014-01-27 15:37:36 +08:00 |
James Chen
|
31643adb99
|
Merge pull request #5252 from samuele3hu/developBug
issue #3837:Update the “HelloLua” test case to support on-device debugging
|
2014-01-26 23:05:18 -08:00 |
samuele3hu
|
9ddce1b4ba
|
issue #3837:Update the comment
|
2014-01-27 15:00:11 +08:00 |
James Chen
|
f23b471fbd
|
Merge pull request #5255 from natural-law/develop
Update the reference of the submodule "plugin".
|
2014-01-26 22:36:55 -08:00 |
zhangbin
|
015e7c905f
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
|
2014-01-27 14:23:36 +08:00 |