James Chen
|
5615717617
|
issue #4729: NULL -> nullptr in constructor or setXXX(NULL)
|
2014-04-10 00:36:43 +08:00 |
Sergey
|
13df593ae7
|
file attributes fixed
|
2014-03-19 18:58:19 +04:00 |
Sergey
|
f65ef462e5
|
getCurrentLanguageCode() for all platforms return iso 639-1 language code
iPhone template improvements(for game center support)
|
2014-03-17 22:34:21 +04:00 |
James Chen
|
306df0537e
|
Reverts changes in CCApplication.cpp/.mm, pollEvent must after main loop, otherwise, potential crash will happen.
|
2014-03-15 00:10:39 +08:00 |
James Chen
|
9bc48a7ac1
|
PollEvents before main loop and beautifies codes in CCApplication.cpp/.mm.
|
2014-03-14 18:40:04 +08:00 |
koowolf
|
90f5d6511e
|
fix win32 crash while click close button.
|
2014-03-14 16:13:32 +08:00 |
Siim Kallas
|
881757a792
|
Fixed crashing when calling CCDirector's end().
|
2014-02-01 22:10:00 +02:00 |
Ricardo Quesada
|
7da8c84a75
|
Renames EGLView -> GLView
|
2014-01-30 16:51:43 -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
|
2b92ba75b4
|
more fixes for new GLView API
|
2014-01-23 16:04:11 -08:00 |
walzer
|
64af0de648
|
update copyrights for 2014, in cocos/2d/ folder
|
2014-01-07 11:25:07 +08:00 |
minggo
|
4313c46e93
|
issue #2905:adjust folder structure
|
2013-10-12 11:22:05 +08:00 |