minggo
c2e53d5673
Merge pull request #3665 from minggo/merge-physics
...
Merge physics
2013-09-17 08:18:55 -07:00
Huabing.Xu
c1599300f6
fix template cpp not compiled in ipad retina
2013-09-17 20:05:24 +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
LinWenhai
368d668e7b
Update RootViewController.mm
...
fix not hide status on ios7
2013-09-13 09:42:26 +08:00
LinWenhai
644c3ebff5
Update RootViewController.h
...
Fix not hide status bar on iOS 7
2013-09-13 09:40:43 +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
Huabing.Xu
4c12f4029a
issue #2460 : project template for glfw
2013-09-02 13:48:39 +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
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
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
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
510b29a2ff
Merge branch 'android-textures-fix' of https://github.com/jotel/cocos2d-x into shared-codes
...
Conflicts:
cocos2dx/textures/CCTextureCache.cpp
2013-07-16 16:33:02 +08:00
James Chen
759831c1d8
issue #2397 : Application::sharedApplication --> Application::getInstance.
2013-07-15 16:24:42 +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
88a28b041e
issue #2397 : Director::sharedDirector --> Director::getInstance() for all files.
2013-07-12 11:50:36 +08:00
Jaroslaw Lewandowski
626ba2686f
Solving 'black screen' on android
2013-07-09 21:21:43 +01:00
James Chen
cd2fae36f1
issue #2371 : Updating multi-platform-template for iOS and Mac
2013-07-05 10:31:20 +08: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
minggo
0a768da240
issue #2305 : use 4.7 toolchain to fix compiling errors
2013-06-21 17:17:23 +08:00
James Chen
0879a12516
issue #2129 : Re-adds 'CC' prefix to objective-c classes for all projects.
2013-06-21 11:14:03 +08:00
James Chen
d1bd34fd08
issue #2129 : Removing CC prefix for template.
2013-06-20 22:18:43 +08:00
James Chen
247dcb7a4c
[win32] multi-platform-xxx template only support vs2012 now.
2013-06-19 15:23:09 +08:00
minggo
cd5bcb87af
issue #2284 : merge master and fixed some conflicts
2013-06-13 17:54:05 +08:00
James Chen
be0efac2d7
[Mac] Updating multi-platform-cpp/proj.mac/HelloCpp.xcodeproj.
2013-06-10 14:57:18 +08:00
James Chen
47b2a65faf
[Template] Updating iOS template project of multi-platform-cpp.
2013-06-10 14:18:24 +08:00
James Chen
ec8ab8bd8b
Updating multi-platform-xxx template for win32.
2013-06-07 12:57:28 +08:00
James Chen
d72e9d10b5
Updating multi-platform-xxx template for win32.
2013-06-07 12:50:02 +08:00
James Chen
d5bbcce165
[iOS] Enabling multiple touch event for TestJavascript, multi-platform-js, multiplatform-lua.Disabling multiple touch event for multi-platform-cpp.
2013-06-06 18:09:44 +08:00
James Chen
6f52d72b82
[iOS] Enabling multiple touch event for TestJavascript, multi-platform-js, multiplatform-lua.Disabling multiple touch event for multi-platform-cpp.
2013-06-06 18:07:11 +08:00
James Chen
d32eaedd59
Removing CODE_SIGN_IDETITY section in prom.pbxproj.
...
Conflicts:
samples/Cpp/TestCpp/proj.ios/TestCpp.xcodeproj/project.pbxproj
samples/Cpp/TestCpp/proj.mac/TestCpp.xcodeproj/project.pbxproj
2013-06-06 15:05:54 +08:00
James Chen
f22d320797
Removing CODE_SIGN_IDETITY section in prom.pbxproj.
2013-06-06 14:24:58 +08:00
minggo
d71e07db4e
fixed conflict
2013-06-05 13:48:31 +08:00
minggo
b0937a5a2d
issue #2257:change copyright of template
2013-06-05 11:25:39 +08:00
James Chen
bb635c280c
Updating multi-platform-xxx template for iOS and Android after enabling c++ 11.
2013-06-04 20:52:29 +08:00
James Chen
b88a222fc5
Updating multi-platform-xxx template for iOS and Mac.
2013-06-04 20:37:24 +08:00