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
f6275667bf
Removing unused ios projects.
2013-10-12 15:02:28 +08:00
18f2f831b4
issue #2800:Can not hide status bar on iOS 7
...
fixed #2800:User prefersStatusBarHidden in RootViewController on IOS 7 to hide status.
2013-09-13 16:07:02 +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
3e052d5525
issue #2325 : Fixing an issue that Xcode doesn't rebuild app when source file updated in dependent static library.
2013-06-25 23:21:06 +08:00
8dc8fec180
issue #2325 : Updating project configuration, tested on iPad 3.
2013-06-24 18:32:06 +08:00
b870488aad
issue #2325 : [iOS] Using Workspace to manage all projects. TBD, also apply to Mac port.
2013-06-24 15:31:18 +08:00
0879a12516
issue #2129 : Re-adds 'CC' prefix to objective-c classes for all projects.
2013-06-21 11:14:03 +08:00
1fb9f44d15
issue #2129 : Removing CC prefix for samples module.
2013-06-20 14:17:10 +08:00
a221f06592
issue #2284 : fix bugs after merging master
2013-06-14 14:34:50 +08:00
cd5bcb87af
issue #2284 : merge master and fixed some conflicts
2013-06-13 17:54:05 +08:00
7bd9717944
make lua works ok on iOS
2013-06-04 15:12:16 +08:00
2cdb48bc22
enable c++11 for iOS projects
2013-06-03 10:57:06 +08:00
89591fdccc
fixed #2084:add lua loader for all platforms
2013-04-26 12:12:19 +08:00
6a56bb6d73
issue #1847 : [iOS] Using LuaJit for HelloLua and TestLua.
2013-04-17 09:51:28 +08:00
a771bc8183
issue #1689:modify lua Android.mk
2013-02-04 12:02:21 +08:00
977046cc32
issue #1603:make some samples build ok on iOS
2012-12-20 17:20:10 +08:00
4660e72eda
issue #1603 : Moved the position of some projects.
2012-12-20 12:58:21 +08:00
Ricardo Quesada