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
|
6988d48d08
|
issue #3828: Updates win32 projects.
|
2014-01-28 15:49: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
|
bc618ee424
|
issue #3828: Renames `TestXxx` to `test-xxx` for samples.
|
2014-01-28 11:34:12 +08:00 |