James Chen
4da388a2b6
issue #1733 : Updated template projects. Using the same package name on iOS as which on Android.
...
On iOS, org.cocos2d-x.HelloCpp -> org.cocos2dx.hellocpp.
2013-02-20 14:30:05 +08:00
James Chen
fb23323e55
issue #1733 : Renamed testlua to hellolua.
2013-02-20 13:54:07 +08:00
James Chen
5b16c3d499
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss1733-hybrid
2013-02-20 13:42:02 +08:00
James Chen
9cc4b7ab29
fixed a bug of respond touch events in hello.lua. The event type is string now.
2013-02-20 12:03:21 +08:00
James Chen
d3e0aa176b
issue #1733 : Updated hybrid lua template project.
2013-02-20 12:01:47 +08:00
James Chen
a2e0903b74
issue #1733 : Updated cpp hybrid template project.
2013-02-20 10:20:06 +08:00
James Chen
79f097892a
issue #1733 : Adding multi-platform-cpp/proj.win32/HelloCpp.sln
2013-02-20 10:17:50 +08:00
James Chen
a9fede525a
issue #1733 : Marmalade ok.
2013-02-19 18:26:00 +08:00
James Chen
60ab4c4886
issue #1733 : Updated linux makefile.
2013-02-19 18:06:30 +08:00
James Chen
fc1848eb02
issue #1733 : Updated linux makefile.
2013-02-19 17:39:27 +08:00
James Chen
a94aa15031
issue #1733 : Adding extension project for linux.
2013-02-19 17:28:49 +08:00
James Chen
a54edec0e3
issue #1733 : Adding "multi-platform-cpp" and "multi-platform-lua" projects to template folder.
2013-02-19 15:38:30 +08:00
James Chen
96c91390cc
issue #1724 : Adding solution for HelloJavascript.
2013-02-19 10:51:55 +08:00
James Chen
9931bc6eaf
fixed #1724 : Renamed libhellojavascript to libcocos2djs.
2013-02-18 21:53:28 +08:00
James Chen
151b38922e
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss1724-hellojs
...
Conflicts:
template/multi-platform-js/proj.win32/HelloJavascript.vcxproj
2013-02-18 16:32:54 +08:00
James Chen
1d9e9e48bc
fixed #1724 : Moved HelloJavascript to template folder and renamed it with "multi-platform-is".
2013-02-18 16:25:21 +08:00
James Chen
c6d874ab39
fixed #1712 : Updated iOS template.
2013-02-18 13:57:29 +08:00
minggo
3e3f5b83aa
fixed #1703:update xcode template
2013-02-06 16:41:44 +08:00
James Chen
23acb3eacd
issue #1687 : Updating iOS template after refactoring CCFileUtils.
2013-02-03 13:56:44 +08:00
James Chen
f0c2d310ee
Updating Android Template.
2013-01-29 15:03:36 +08:00
James Chen
31681e005e
CCFileUtils::fullPathFromRelativePath -> fullPathForFilename.
2013-01-29 10:40:44 +08:00
minggo
da5b71932f
fix some errors of xcode template
2013-01-28 22:35:38 +08:00
minggo
ba9308089c
fix some errors in xcode template
2013-01-28 21:53:55 +08:00
James Chen
59f2ae13f8
issue #1683 : Updating CCFileUtils for Blackberry and Marmalade.
2013-01-28 20:12:48 +08:00
James Chen
831c414c63
fixed #1645 : JS Project created by xcode template doesn't work correctly.
2013-01-08 15:04:59 +08:00
James Chen
f0f78d72e4
issue #1645 : Updated js template for iOS project.
2013-01-08 10:40:49 +08:00
Dale Ducharme
611db78b39
Removing grskia dependancy and adding in freetype support to the builds.
2013-01-02 18:53:31 -05:00
wanbin
986f332b29
create android project has a error file path
2013-01-01 13:18:10 +08:00
minggo
2fb90d76ce
fixed #1600:update AppDelegate.cpp in xcode template
2012-12-06 11:53:10 +08:00
James Chen
77ad17bbd1
Removed libExtensions dependence for win32 template.
2012-12-04 14:29:05 +08:00
James Chen
dbeb85fa5d
Updated build-win32.bat and win32 template.
2012-12-04 14:09:19 +08:00
minggo
bd025c94c3
use macro CC_TARGET_OS_IPHONE instead of TARGET_OS_IPHONE and make xcode template work ok
2012-11-26 15:08:40 +08:00
James Chen
f2e0df4de3
issue #1565 : Removed VS2008 support.
2012-11-19 14:42:27 +08:00
Rohan Kuruvilla
7381abffb3
Updating template for cocos2d-x JS
2012-11-16 15:56:31 +08:00
James Chen
fa071d3082
Updated js template for iOS.
2012-11-02 16:09:45 +08:00
minggo
21900c26db
update xcode template and version string
2012-11-01 12:06:15 +08:00
James Chen
ffe52a157f
Removed some unused codes about "enableRetinaDisplay".
2012-10-24 16:12:40 +08:00
Rolando Abarca
b0f02a0773
updates on the js front
2012-10-18 17:44:41 -07:00
James Chen
6178594068
issue #1486 : Updated lua templates.
2012-10-12 16:19:33 +08:00
folecr
bc05a650ec
Add a template for the debugger script that is used when generating a new project
2012-10-04 11:48:17 -07:00
walzer
d18eecf247
UIInterfaceOrientationMaskLandscape -> UIInterfaceOrientationMaskAllButUpsideDown, developers still need to set orientation in xcode->targets
2012-09-27 10:28:00 +08:00
walzer
edaf22f14d
fix xcode4 templates compilation error for xcodebuild command line mode, caused by ios6 compatibility.
2012-09-27 00:46:09 +08:00
James Chen
e4b428a875
Updated win32 template.
2012-09-26 17:55:18 +08:00
James Chen
4a3127f41f
Updated android template. Added 'cocos2dx/platform/android/java/res/.gitignore' since res folder is needed for eclipse.
2012-09-25 21:52:30 +08:00
walzer
5b3bb2a087
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
...
Conflicts fixed:
cocos2dx/platform/ios/FontLabel/FontLabel.m
cocos2dx/platform/ios/FontLabel/FontLabelStringDrawing.m
template/xcode4/lib_js.xctemplate/TemplateInfo.plist
2012-09-24 11:03:26 +08:00
walzer
c50a62be7a
issue #1482 , fix typos, mehod -> method.
2012-09-24 10:54:03 +08:00
Walzer
8d51c0ed19
fixed #1482 , deal with ios6 orientation in templates/xcode4, with a little refactoring.
...
1. I think you guys haven't tested Xcode templates before 2.0.2 release. The templates are ALL BROKEN because CCHttpClient requires libcurl, which is excluded by xcode4_template_generator/run_generator.sh. It means developers on 2.0.2 would create a new project with compilation error, damn!
2. ios/AppController.*, ios/RootViewController.*, ios/main.m are moved from cocos2dx_*.xctemplate folder to base_ios.xctemplate folder. I don't want to modify tons of RootViewController clones any more.
2012-09-23 22:11:29 +08:00
Walzer
88b98faa88
fixed #1482 , fix orientation problem caused by ios6 api change.
...
AppDelegate.mm & RootViewController.mm are updated.
2012-09-23 20:24:51 +08:00
Rohan Kuruvilla
100a7a1883
Adding sample game wrapper using CCBReader. Also includes small modification to CCBReader
2012-09-20 18:02:17 -07:00
Rohan Kuruvilla
d1493a862f
Updating template to support CCBuilderReader
2012-09-20 18:02:02 -07:00
Walzer
d098c5900a
Merge pull request #1333 from jzgenius/modify_template_by_viewController
...
[template] modify AppController, add viewController & window variant. al...
2012-09-17 19:36:18 -07:00
jzgenius
19b22be52e
[template] modify AppController, add viewController & window variant. all Xcode template modified.
2012-09-18 09:55:28 +08:00
Donald Alan Morrison
4cbd993091
Minor English Spelling Corrections. A few grammar corrections.
2012-09-17 00:02:24 -07:00
Donald Alan Morrison
7c750dc9c5
Minor changes to comments. One integer literal changed to float literal.
2012-09-14 15:26:38 -07:00
Trent Millar
a12054c00f
Adding the VC++2012 template to install-templates-msvc.bat
...
Tested against VS2012 RTM.
Note, the .sln location is incorect on all the templates. It needs to
move up relative to the cocos2d-x folder.
I can look at fixing this later but for now I guess it must have been
left to the user to manually move it.
2012-09-01 14:32:46 -06:00
James Chen
382b08a947
fixed #1455 : Adding xcode template for cocos2dx-js. Thank rohankuruvilla .
2012-09-01 10:49:15 +08:00
Rohan Kuruvilla
374232ac88
Adding xcode template for cocos2dx-js
2012-08-31 12:07:58 -07:00
James Chen
9857337102
Updated android template.
...
In eclipse, please using import the created project.
2012-08-30 18:27:35 +08:00
James Chen
6a99431338
Updated hello.lua in Template folder.
2012-08-29 21:04:21 +08:00
James Chen
95419d2dea
Updated templates for android,blackberry,win32 and ios.
...
LAYER_CREATE_FUNC ~> CREATE_FUNC
2012-08-29 21:03:47 +08:00
minggo
c1d6edc7ad
fix a bug in android template
2012-08-27 10:50:55 +08:00
James Chen
4eff148f96
Added blackberry template files.
2012-08-24 14:29:51 +08:00
minggo
3d3e5b3a93
fix some bug of xcode template & remove unneeded files
2012-08-23 18:36:08 +08:00
James Chen
3eecc283d0
Merge branch 'iss1437_return_pointer' of https://github.com/minggo/cocos2d-x into iss1437_return_pointer
2012-08-21 16:57:41 +08:00
minggo
ba2049d086
iss1438_android_template
2012-08-21 16:45:23 +08:00
minggo
8c483613e7
issue #1437:make CCApplication::sharedApplication() return pointer
2012-08-21 15:41:00 +08:00
minggo
07ddd43695
issue #1437:make CCApplication::sharedApplication() return pointer
2012-08-21 15:28:43 +08:00
James Chen
fd1343b951
Updated win32 template and fix a bug in win32/CCEGLView.cpp.
2012-08-20 17:08:29 +08:00
minggo
40ee7496cd
fixed #1433:remove fpsxxx.png in win32 template
2012-08-20 15:15:21 +08:00
folecr
868d768156
Cleaner template for build_native.sh
...
* used by projects generated with create-android-project.sh
2012-07-31 22:56:18 -07:00
Walzer
ba224cc283
add CCTouch.cpp into proj.win32, android.mk, xcode4 template.
2012-07-31 23:32:19 +08:00
minggo
851241d3c3
Merge pull request #1116 from minggo/iss1399_adjust_structure
...
Iss1399 adjust structure
2012-07-23 02:19:30 -07:00
minggo
4eb59cd3d0
issue #1399:xcode template works ok after adjusting directory structure
2012-07-23 17:10:56 +08:00
James Chen
722084bbaa
issue #1399 : Updated android template. Added cocos_extension_static dependence for created project by default.
2012-07-23 16:42:07 +08:00
James Chen
d5f783b681
issue #1399 : Updated android template.
2012-07-23 14:56:40 +08:00
James Chen
8291b7aef6
Reverted 'cocosdenshion' to 'CocosDenshion'.
2012-07-23 11:07:31 +08:00
James Chen
c171f24d8e
issue #1399 : Updated win32 template.
2012-07-23 10:31:26 +08:00
James Chen
aba33b5bda
Reverted build_native.sh.
2012-06-28 16:58:32 +08:00
James Chen
a901b0bb12
fixed #1367 : Refactor "createWith***" to "create".
2012-06-27 14:21:29 +08:00
James Chen
95a2696b6b
fixed #1365 : Some files of Resources folder which is copied by build_native.sh will lost authority in cygwin.
2012-06-26 12:09:23 +08:00
James Chen
04a155fd9c
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-06-25 11:55:52 +08:00
James Chen
28ba42db87
fixed #1344 : win32 template cannot work after synchronizing to rc2
2012-06-25 11:55:12 +08:00
minggo
55eca9f516
fixed #1343 : make xcode template work ok
2012-06-22 12:00:27 +08:00
James Chen
1d0b7c40e4
Removed virtual attribute for callback functions in HelloWorldScene.h.
...
Updated templates.
2012-06-21 13:56:56 +08:00
folecr
06f941b8c0
Script uses updated directory name when copying files
2012-06-15 09:17:42 -07:00
James Chen
24cc0796b6
Merge branch 'cocos2dxandroidlibrary' of https://github.com/folecr/cocos2d-x into folecr_android
2012-06-15 17:47:04 +08:00
James Chen
1d0fa4a9aa
fixed #1292 : Updated lua bindings.
2012-06-15 17:26:11 +08:00
James Chen
c17091ac70
fixed #1310 : Updated vs2010 project configuration after synchronizing to rc2.
2012-06-15 15:24:22 +08:00
folecr
6fc2dc5ed9
Use Java code instead of XML to define layout
...
* Android layout for cocos apps are very simple (full screen)
* Avoids creation of R.java for loading the layout
* Can package entire library in jar
* Remove unused layout resource
2012-06-14 19:52:45 -07:00
folecr
172b90cbfe
Android project generation script copies library sources
...
* mkdir parent folder with project name
* create android project in proj.android subfolder
* copy library sources to generated project
* remove unnecessary function that moves files from top directory to proj.android
2012-06-14 19:52:40 -07:00
James Chen
4c1ca36aa8
fixed #1326 : The compilation of Hellolua and testjs project was broken after synchronizing to rc2.
2012-06-15 10:51:53 +08:00
James Chen
37aa196c73
Removed some unused codes.
2012-06-06 14:31:49 +08:00
minggo
414be07f59
Merge pull request #962 from NatWeiss/8b6026f932ef6d0f284b8d73ac5657b79eec10ea
...
fixed #1287:Android template's build_native.sh automatically copies new icons
2012-06-02 18:45:05 -07:00
Nat Weiss
8b6026f932
Android template's build_native.sh automatically copies new icons from your assets directory.
2012-06-01 00:36:16 -07:00
James Chen
ebcc78497f
fixed #1282 : Can not run samples on windows if the display card is ATI. Use opengl directly. Reverted all project configurations to Unicode characterset to avoid textinput error.
2012-06-01 13:44:28 +08:00
minggo
a283bfed4f
fixed #1191 : update xcode template
2012-05-31 09:52:39 +08:00
James Chen
19c96632b5
fixed #1176 : Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' with four spaces.
2012-05-29 16:21:23 +08:00
James Chen
a7ca2cb3a0
fixed #1246 : Updated win32 templates. Copying fps_images.fnt and fps_images.png files.
2012-05-28 16:25:32 +08:00
James Chen
22b2f722b5
fixed #1220 : Using CCString::stringWithContentsOfFile to get string from lua script files.
2012-05-04 14:31:56 +08:00
James Chen
bf0da624b4
issue #1191 : Updated win32 templates, tested by vs2008 and vs2010. Updated win32 project configurations for VS2O10.
2012-05-04 11:16:57 +08:00
James Chen
47b8148064
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1191_gles20_template
2012-05-04 02:08:31 +08:00
James Chen
395dbc90aa
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1204_initInstance
...
Conflicts:
lua/cocos2dx_support/LuaCocos2d.cpp
2012-05-02 18:23:16 +08:00
minggo
7e882ae89e
Merge pull request #879 from minggo/iss1201_android_build
...
simplify writing of Android.mk
2012-05-02 03:19:36 -07:00
James Chen
4580fffed7
issue #1204 : Updated CCApplication.mm and ios template.
2012-05-02 18:18:43 +08:00
minggo
75601fbc02
fixed #1201 : simplify the writing of Android.mk and correct corresponding template
2012-05-02 17:29:16 +08:00
James Chen
61f33a87af
fixed #1206 : Removed some unused files, first release will only support ios, win32 and android.
2012-05-02 14:50:47 +08:00
James Chen
a666dc7edb
fixed #1194 : Updated template file -- cocos2d_chipmunk.xctemplate/Classes/HelloWorldScene.cpp.
2012-05-02 14:31:46 +08:00
James Chen
547bd6910d
fixed #1194 : Updated ios template.
2012-05-02 14:29:36 +08:00
James Chen
99bc442dad
#issue #1194 : Updated chipmuck template for ios platform.
2012-05-02 14:17:14 +08:00
James Chen
41b1bca740
issue #1194 : Updated the chipmuck template for ios platform.
2012-05-02 14:06:12 +08:00
James Chen
849a4ebc7f
issue #1194 : Updated the box2d template for ios platform.
2012-05-02 13:03:47 +08:00
James Chen
4a002ea9cc
issue #1194 : Updated ios template of box2d.
2012-05-02 12:51:48 +08:00
James Chen
5c7e7f6563
issue #1194 : Updated ios template.
2012-05-02 12:01:53 +08:00
James Chen
9886f281ee
issue #1191 : Updated win32 project files.
2012-04-27 18:50:55 +08:00
James Chen
36c9ab18a8
issue #1191 : Updated default.js.
2012-04-27 11:36:38 +08:00
James Chen
6305de4ff6
issue #1191 : Updated win32 template.
2012-04-27 11:35:09 +08:00
James Chen
a771f47a1a
issue #1191 : Updated win32 template.
2012-04-26 15:57:05 +08:00
James Chen
7bf2067942
issue #1191 : Removed some unused files in template folder.
2012-04-26 15:03:44 +08:00
James Chen
230b8a386b
issue #1176 : Changed linebreak symbol to UNIX format ('\n'),replaced 'tab'
...
with four spaces. Also,
1. Used macro NS_CC_BEGIN instead of namespace cocos2d {, NS_CC_END instead
of }.
2. Removed some unused files.
3. Renamed the name of some folders, for example,
"test.android"-->"proj.android" .
2012-04-19 14:35:52 +08:00
James Chen
783b2fe79b
Removed some unused codes regard to WOPHONE.
2012-04-19 10:46:37 +08:00
minggo
5623f5fb58
fixed #1020 : make vs template support lua
2012-03-07 15:03:35 +08:00
Walzer
2acd80bb73
fixed #982 , copy resources as recursively (-r), and let sed works on mac
2012-03-01 16:57:59 +08:00
minggo
a87e76c399
fixed #982 : android template works ok on linux
2012-03-01 02:51:58 +08:00
minggo
c0d2118aac
issue #982 : android template support lua box2d and chipmunk
2012-02-29 17:48:45 +08:00
minggo
bb2ca44c24
fixed #985 : remove xcode3 template
2012-02-28 10:21:59 +08:00
Walzer
9d37b214d5
fix "Resource" to "Resources" in template/android/copy_files.sh
2012-02-25 10:14:06 +08:00
James Chen
525854fc40
modify linux template.
2012-02-15 17:39:10 +08:00
minggo
5c4f9415ec
use gnustl_static
2012-02-15 10:42:48 +08:00
James Chen
c3d23a7923
issue #972 : Modify project setting for all platforms. Use new icons for ios template.
2012-02-14 15:13:54 +08:00
minggo
5ce4968524
merge from cocos2d-x master
2012-02-10 10:46:58 +08:00
minggo
6ae40fc12f
fixed #971 : build cocos2dx as static lib
2012-02-10 10:31:56 +08:00
minggo
141dac47d3
Merge branch 'luafix-master' of https://github.com/dualface/cocos2d-x into lua_support_refactor
2012-02-09 17:58:39 +08:00
YuLei Liao
8b0d201850
update xcode4 lua template
2012-02-09 17:54:25 +08:00
minggo
95906c34bf
Merge branch 'luafix-master' of https://github.com/dualface/cocos2d-x into lua_support_refactor
2012-02-09 16:14:54 +08:00
minggo
52de292e20
fixed #970 : use modules in the android ndk build
2012-02-08 11:14:47 +08:00
minggo
9249328afb
fixed #970 : use modules in the Android NDK build
2012-02-07 14:34:30 +08:00
YuLei Liao
22cddb5240
* update hello.lua
2012-02-07 13:17:23 +08:00
YuLei Liao
7ef0373c8b
* update lua application template files
2012-02-02 22:15:56 +08:00
YuLei Liao
1983949b68
* update project templates AppDelegate
2012-02-02 19:01:30 +08:00
minggo
6c2277757a
fixed #958 : delete SelectorProtocol and implement it in CCObject
2012-01-30 17:47:47 +08:00
dumganhar
8c81fcf232
fixed #940 : replace .ico file with clear image for win32 template.
2012-01-19 11:58:37 +08:00
gzito
bd22d74331
Merge remote-tracking branch 'remotes/upstream/master'
2012-01-14 23:09:50 +01:00
gzito
a9d03e6ad8
Renamed folder from airplay to marmalade
2012-01-14 22:47:19 +01:00
gzito
cfd365f5d7
Updated paths from airplay to marmalade
2012-01-14 22:46:20 +01:00
minggo
dc6a4ce709
Merge pull request #678 from minggo/test
...
make linux template work correctly
2012-01-12 04:24:38 -08:00
minggo
813342fb83
make linux template work correctly
2012-01-12 20:20:09 +08:00
minggo
fd0e8a67ac
Merge pull request #668 from minggo/test
...
make CCTouchDelegate::touchDelegateRetain() and touchDelegateRelease as pure virtual function
2012-01-11 01:45:54 -08:00
minggo
ac2a508225
fixed #940 : add new icons for wohpne
2012-01-11 17:43:12 +08:00
dumganhar
8a2a0744cd
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss939_create_qnx_project
2012-01-10 17:20:14 +08:00
dumganhar
42b13c5b0a
add create qnx project script for mac or linux system.
2012-01-10 17:05:42 +08:00