Ricardo Quesada
|
7da8c84a75
|
Renames EGLView -> GLView
|
2014-01-30 16:51:43 -08:00 |
Ricardo Quesada
|
862500f99a
|
Renames EGLView -> GLView
|
2014-01-30 15:40:56 -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 |
martell
|
609ee3db2b
|
Added Dutch for 3.x branch
|
2014-01-25 20:38:15 +00:00 |
Ricardo Quesada
|
8ecaf49f93
|
GLView improvements
it is not longer a singleton
it is possible to specify the size
|
2014-01-23 15:36:55 -08:00 |
walzer
|
64af0de648
|
update copyrights for 2014, in cocos/2d/ folder
|
2014-01-07 11:25:07 +08:00 |
boyu0
|
e07c4ffec1
|
Change NULL to nullptr, edit hungarian notation.
|
2013-12-18 17:47:20 +08:00 |
minggo
|
4313c46e93
|
issue #2905:adjust folder structure
|
2013-10-12 11:22:05 +08:00 |