Ricardo Quesada
|
2546335c83
|
TestCpp: compiles on linux
|
2014-01-30 18:15:44 -08:00 |
Ricardo Quesada
|
862500f99a
|
Renames EGLView -> GLView
|
2014-01-30 15:40:56 -08:00 |
Ricardo Quesada
|
4cbbd8a9f5
|
EGLView is not longer a singleton
|
2014-01-30 15:11:54 -08:00 |
Ricardo Quesada
|
4ed2e0d9d2
|
Merge branch 'develop' into glview_improvements
Conflicts:
CHANGELOG
cocos/2d/platform/linux/CCApplication.cpp
samples/Cpp/AssetsManagerTest/Classes/AppDelegate.cpp
samples/Cpp/HelloCpp/Classes/AppDelegate.cpp
samples/Cpp/HelloCpp/Classes/AppMacros.h
samples/Cpp/HelloCpp/proj.ios/AppController.mm
samples/Cpp/HelloCpp/proj.mac/main.cpp
samples/Cpp/SimpleGame/Classes/AppDelegate.cpp
samples/Cpp/SimpleGame/proj.ios/AppController.mm
samples/Cpp/SimpleGame/proj.mac/main.cpp
samples/Cpp/TestCpp/Classes/AppDelegate.h
samples/Javascript/CocosDragonJS/Classes/AppDelegate.cpp
samples/Javascript/CocosDragonJS/proj.ios/AppController.mm
samples/Javascript/CocosDragonJS/proj.mac/main.cpp
samples/Javascript/CrystalCraze/Classes/AppDelegate.cpp
samples/Javascript/CrystalCraze/proj.ios/AppController.mm
samples/Javascript/CrystalCraze/proj.mac/main.cpp
samples/Javascript/MoonWarriors/Classes/AppDelegate.cpp
samples/Javascript/MoonWarriors/proj.ios/AppController.mm
samples/Javascript/MoonWarriors/proj.mac/main.cpp
samples/Javascript/WatermelonWithMe/Classes/AppDelegate.cpp
samples/Javascript/WatermelonWithMe/proj.ios/AppController.mm
samples/Javascript/WatermelonWithMe/proj.mac/main.cpp
samples/Lua/HelloLua/Classes/AppDelegate.cpp
samples/Lua/HelloLua/proj.ios/AppController.mm
samples/Lua/HelloLua/proj.mac/main.cpp
|
2014-01-28 11:32:25 -08:00 |
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
|
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
|
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
|
1f4ca2f0ad
|
Works on Android
|
2014-01-27 13:05:58 -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
|
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 |
Dhilan007
|
662b3dd9a0
|
fix miss websocket lib for HelloLua on vs.
|
2014-01-27 17:02:31 +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
|
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
|
90c537928e
|
Merge pull request #5253 from boyu0/iss3401_lua_bit_fix
issue #3401: add bit operation for lua physics test
|
2014-01-26 22:11:49 -08:00 |
samuele3hu
|
73f272ec7c
|
issue #3837:Update the comment
|
2014-01-27 14:10:34 +08:00 |
boyu0
|
c0765c9a77
|
issue #3401: bug fix
|
2014-01-27 14:10:23 +08:00 |
samuele3hu
|
8e8e229888
|
issue #3837:Update the comment
|
2014-01-27 14:02:11 +08:00 |
boyu0
|
e68db23f7a
|
issue #3401: bug fix
|
2014-01-27 13:52:29 +08:00 |
boyu0
|
6239dadff6
|
issue #3401: add bit operation for lua physics test
|
2014-01-27 13:39:11 +08:00 |
samuele3hu
|
cea6a15903
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBug
|
2014-01-27 12:00:35 +08:00 |
samuele3hu
|
13d2f2b97b
|
issue #3837:Update the “HelloLua” test case to support on-device debugging
|
2014-01-27 11:59:17 +08:00 |
James Chen
|
4712636783
|
Updates JS-Test: fix ArmatureTest/ChangeMounttest fails.
|
2014-01-27 11:22:19 +08:00 |
samuele3hu
|
d3824c9592
|
issue #3863:Rename the lua binding of the `registerScriptHandler` and `unregisterScriptHandler` of the SkeletonAnimation
|
2014-01-26 22:27:37 +08:00 |
James Chen
|
413bfdb3c2
|
Reverts Application.mk.
|
2014-01-26 19:06:03 +08:00 |
James Chen
|
23c963cbdc
|
Compilation fix when CC_ENABLE_BOX2D_INTEGRATION is enabled.
|
2014-01-26 18:35:35 +08:00 |
James Chen
|
e89bde4fbe
|
Updates JS test.
|
2014-01-26 17:53:42 +08:00 |
James Chen
|
a4a010465c
|
Merge commit 'refs/pull/5071/head' of git://github.com/cocos2d/cocos2d-x into merge5071
|
2014-01-26 16:41:35 +08:00 |
boyu0
|
682a6819cb
|
issue #3401: change getContactData function return value back to pointer.
|
2014-01-26 12:02:42 +08:00 |
samuele3hu
|
48498f726e
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developBug
Conflicts:
cocos/scripting/lua/bindings/CCLuaStack.cpp
|
2014-01-26 11:59:54 +08:00 |
samuele3hu
|
9b514927f5
|
issue #3837:Make `HelloLua` support to debug by the ZeroBrane Studio
|
2014-01-26 11:55:02 +08:00 |
Dhilan007
|
c7e9cee835
|
updated vs project[Lua]:
1.add files of socket
2.fixed miss include path
3.fixed miss lib for release
|
2014-01-26 10:25:49 +08:00 |
Ricardo Quesada
|
8c62fcb7ba
|
Merge branch 'develop' into glview_improvements
|
2014-01-24 14:22:25 -08:00 |