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
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
8ecaf49f93
GLView improvements
...
it is not longer a singleton
it is possible to specify the size
2014-01-23 15:36:55 -08:00
6b8781241c
code is cleaner
2014-01-22 13:51:01 -08:00
3cbeabc777
Icons for test projects
2013-10-16 11:55:14 -07:00
19e37d284e
rename test case to correct name
2013-09-18 18:26:03 +08:00
a2dee37b0e
glfw EGLView set alloc on the stack to prevent memory leak
2013-09-18 17:00:21 +08:00
bc5ae78423
issue #2460 : change other sample projects to glfw version
2013-09-02 11:46:23 +08:00
759831c1d8
issue #2397 : Application::sharedApplication --> Application::getInstance.
2013-07-15 16:24:42 +08:00
cf262c28e2
getInstance() / destroyInstance() are used...
...
... instead of sharedXXX / purgeXXX.
They are more C++ friendly, and also easier to remember.
common files + Mac files + iOS files + tests/samples files were updated.
The old methods are deprecated now.
2013-07-11 15:24:23 -07:00
ec5edeb8f6
issue #2325 : Updating title for Mac projects.
2013-07-02 10:42:50 +08:00
527d209ca8
Tries to compile WaterMelonWithMe
2013-07-01 15:20:31 -07:00
Ricardo Quesada