Ricardo Quesada
cd557a11bf
Adds missing icons to templates and samples
2013-09-20 14:06:44 -07:00
minggo
bcb171e3c9
fix line end in windows
2013-09-20 22:23:13 +08:00
Ricardo Quesada
3696703db4
forces 64-bit arch
2013-09-19 18:46:07 -07:00
Ricardo Quesada
51834e5291
Xcode template projects fixes
...
Updats the xcode project with recommended fixes from Xcode 5.0
2013-09-19 18:27:11 -07:00
Ricardo Quesada
2ab1b2ff04
Lua template: ios and mac projects in one Xcode file
...
Merged iOS and Mac projects into one single Xcode.proj file
2013-09-19 17:05:00 -07:00
Huabing.Xu
a2dee37b0e
glfw EGLView set alloc on the stack to prevent memory leak
2013-09-18 17:00:21 +08:00
minggo
40d91f0afa
disable compressing png when deploying for iOS device
2013-09-18 11:16:28 +08:00
minggo
38b618bc4f
Merge pull request #3661 from samuele3hu/developTest
...
Modify AppDelegate.cpp file of multi-platform-lua for Design Resolution Size
2013-09-17 18:36:21 -07:00
samuele3hu
423e7adf93
Modify AppDelegate.cpp file of multi-platform-lua
2013-09-17 21:01:43 +08:00
minggo
ddaff9cce6
make cocos2dx depend chipmunk
2013-09-17 19:24:30 +08:00
samuele3hu
cf5e04ad63
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developTest
...
Conflicts:
samples/Cpp/SimpleGame/Classes/HelloWorldScene.cpp
2013-09-16 16:58:30 +08:00
samuele3hu
b563c52e10
Issue:Resolve the carsh of the simple game test sample and modify the main.cpps in the template for the android projects
2013-09-16 16:55:16 +08:00
minggo
27381fc83f
Merge pull request #3562 from bassarisse/develop
...
Win32 icons on template
2013-09-15 23:44:11 -07:00
Dhilan007
b827162113
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:18:58 +08:00
Bruno Assarisse
71c1e10fd8
Win32 icons on template
...
Added icon to HelloCpp template, renamed the icon resource (so GLFW can
read it and put on window and taskbar), and removed unnecessary files
from projects.
2013-09-09 00:42:36 -03:00
minggo
249b4d79a3
Merge pull request #3503 from dabingnn/Iss2460-glfw-refractor
...
Iss2460 glfw refractor
2013-09-05 18:28:31 -07:00
Huabing.Xu
4c12f4029a
issue #2460 : project template for glfw
2013-09-02 13:48:39 +08:00
samuele3hu
564a77edf6
issue #2433:Modify template/multi_platform_lua/Resources/hello.lua
2013-08-30 17:18:47 +08:00
samuele3hu
f56c6f7087
issue #2433:Modify platform config and some test samples
2013-08-30 11:56:35 +08:00
James Chen
0e1770ca82
issue #2732 : [iOS] Adding 'Cocos2d.lua".
2013-08-27 16:57:10 +08:00
James Chen
64ab842a74
issue #2732 : [iOS]Adding 'scripting/auto-generated/js(lua)-bindings' to search path of include files.
2013-08-27 16:53:41 +08:00
James Chen
a7f4e82799
issue #2732 : Adding 'scripting/auto-generated/js(lua)-bindings' to search path of include files.
2013-08-27 16:46:31 +08:00
folecr
cbd7796438
Update nojava.txt with readme.
2013-08-07 12:29:58 -07:00
folecr
5295b85d8e
Update templates for Android
2013-08-05 19:14:47 -07:00
minggo
1d2b1c79c2
closed #2438:remove mac 32-bit support
2013-07-30 18:02:35 +08:00
samuele3hu
38a23890ff
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into TestDevelop
2013-07-30 09:55:28 +08:00
samuele3hu
3499aafd27
issue #2435:Lua template supports mac port
2013-07-30 09:51:15 +08:00
James Chen
5aab0cab7b
[Android] Fixing build errors for ndk-r9.
2013-07-29 14:54:00 +08:00
samuele3hu
3c953a934e
issue #2404:Add more deprecated function and Modify template vs11 solution
2013-07-28 00:16:16 +08:00
minggo
b6b56a252c
make iOS template work ok on armv7s devices
...
build only active architecture only
2013-07-27 21:20:25 +08:00
James Chen
8721951cee
Lua Template Fix.
2013-07-27 15:16:09 +08:00
James Chen
d345ac7f3f
[Android] Usage changes: ccGLInvalidateStateCache --> GL::invalidateStateCache();
2013-07-26 14:00:10 +08:00
James Chen
a1c3631962
issue #2404 : DrawPrimitives deprecated.
2013-07-25 22:38:55 +08:00
minggo
99949331b1
fix error and compilings error in templates
2013-07-24 17:27:29 +08:00
minggo
f6cfe3007f
issue #2412:fix merging conflict
2013-07-23 10:41:11 +08:00
James Chen
1db847ad7c
issue #2344 : ScriptEngineManager::sharedManager --> ScriptEngineManager::getInstance, ScriptEngineManager::purgeSharedManager --> ScriptEngineManager::destroyInstance
2013-07-22 17:24:54 +08:00
minggo
687c088b51
issue #2412:remove blackberry and marmalade port because they don't support c++11
2013-07-19 13:55:03 +08:00
James Chen
56419b9e90
issue #2410 : [Android] Adding listener for CCDrawNode when application resume from background.
...
Reset the order of reloading shaders and textures in main.cpp.
2013-07-17 12:53:30 +08:00
James Chen
759831c1d8
issue #2397 : Application::sharedApplication --> Application::getInstance.
2013-07-15 16:24:42 +08:00
James Chen
33c37f5f9d
issue #2397 : CCTextureCache:sharedTextureCache --> CCTextureCache:getInstance.
2013-07-12 14:44:24 +08:00
James Chen
f8cd252c5c
issue #2397 : sharedNotificationCenter --> getInstance
2013-07-12 14:17:42 +08:00
James Chen
1f8e852020
issue #2397 : Shader::sharedShaderCache() --> Shader::getInstance().
2013-07-12 13:40:01 +08:00
James Chen
2c1b26acf8
issue #2397 : EGLView::sharedOpenGLView() --> EGLView::getInstance()
2013-07-12 13:11:21 +08:00
James Chen
a678d12615
issue #2397 : FileUtils::sharedFileUtils --> FileUtils::getInstance() for all platforms
2013-07-12 12:03:39 +08:00
James Chen
88a28b041e
issue #2397 : Director::sharedDirector --> Director::getInstance() for all files.
2013-07-12 11:50:36 +08:00
James Chen
cd2fae36f1
issue #2371 : Updating multi-platform-template for iOS and Mac
2013-07-05 10:31:20 +08:00
folecr
7d4ce91b6b
Up the minSdkVersion to 9
2013-06-24 15:14:14 -07:00
James Chen
80cb06d3f7
Merge branch 'minggo-iss2305-replace-pthread' of https://github.com/dumganhar/cocos2d-x into minggo-iss2305-replace-pthread
2013-06-24 10:01:57 +08:00
James Chen
53a372669a
closed #2322 : Updating all win32 project configurations, improvement by using Multi-processor Compilation.
2013-06-23 17:25:34 +08:00
James Chen
88a0dbec5e
Merge branch 'iss2305-replace-pthread' of https://github.com/minggo/cocos2d-x into minggo-iss2305-replace-pthread
2013-06-21 21:29:25 +08:00