3eab5d509b
issue #1733 , project-creator for lua works.
2013-02-21 17:11:11 +08:00
d736f38fac
issue #1733 , project-creator for cpp project seems ok
2013-02-21 16:51:22 +08:00
a9f030e913
issue #1733 : Adding HelloLua.win32.sln.
2013-02-20 15:19:42 +08:00
532cbe2466
issue #1733 : Updated the template of hybrid lua project for win32.
2013-02-20 15:11:30 +08:00
212d445b40
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss1733-hybrid
2013-02-20 14:32:20 +08:00
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
fb23323e55
issue #1733 : Renamed testlua to hellolua.
2013-02-20 13:54:07 +08:00
5b16c3d499
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss1733-hybrid
2013-02-20 13:42:02 +08:00
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
d3e0aa176b
issue #1733 : Updated hybrid lua template project.
2013-02-20 12:01:47 +08:00
a2e0903b74
issue #1733 : Updated cpp hybrid template project.
2013-02-20 10:20:06 +08:00
79f097892a
issue #1733 : Adding multi-platform-cpp/proj.win32/HelloCpp.sln
2013-02-20 10:17:50 +08:00
a9fede525a
issue #1733 : Marmalade ok.
2013-02-19 18:26:00 +08:00
60ab4c4886
issue #1733 : Updated linux makefile.
2013-02-19 18:06:30 +08:00
fc1848eb02
issue #1733 : Updated linux makefile.
2013-02-19 17:39:27 +08:00
a94aa15031
issue #1733 : Adding extension project for linux.
2013-02-19 17:28:49 +08:00
a54edec0e3
issue #1733 : Adding "multi-platform-cpp" and "multi-platform-lua" projects to template folder.
2013-02-19 15:38:30 +08:00
96c91390cc
issue #1724 : Adding solution for HelloJavascript.
2013-02-19 10:51:55 +08:00
9931bc6eaf
fixed #1724 : Renamed libhellojavascript to libcocos2djs.
2013-02-18 21:53:28 +08:00
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
1d9e9e48bc
fixed #1724 : Moved HelloJavascript to template folder and renamed it with "multi-platform-is".
2013-02-18 16:25:21 +08:00
c6d874ab39
fixed #1712 : Updated iOS template.
2013-02-18 13:57:29 +08:00
3e3f5b83aa
fixed #1703:update xcode template
2013-02-06 16:41:44 +08:00
23acb3eacd
issue #1687 : Updating iOS template after refactoring CCFileUtils.
2013-02-03 13:56:44 +08:00
f0c2d310ee
Updating Android Template.
2013-01-29 15:03:36 +08:00
31681e005e
CCFileUtils::fullPathFromRelativePath -> fullPathForFilename.
2013-01-29 10:40:44 +08:00
da5b71932f
fix some errors of xcode template
2013-01-28 22:35:38 +08:00
ba9308089c
fix some errors in xcode template
2013-01-28 21:53:55 +08:00
59f2ae13f8
issue #1683 : Updating CCFileUtils for Blackberry and Marmalade.
2013-01-28 20:12:48 +08:00
831c414c63
fixed #1645 : JS Project created by xcode template doesn't work correctly.
2013-01-08 15:04:59 +08:00
f0f78d72e4
issue #1645 : Updated js template for iOS project.
2013-01-08 10:40:49 +08:00
611db78b39
Removing grskia dependancy and adding in freetype support to the builds.
2013-01-02 18:53:31 -05:00
986f332b29
create android project has a error file path
2013-01-01 13:18:10 +08:00
2fb90d76ce
fixed #1600:update AppDelegate.cpp in xcode template
2012-12-06 11:53:10 +08:00
77ad17bbd1
Removed libExtensions dependence for win32 template.
2012-12-04 14:29:05 +08:00
dbeb85fa5d
Updated build-win32.bat and win32 template.
2012-12-04 14:09:19 +08:00
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
f2e0df4de3
issue #1565 : Removed VS2008 support.
2012-11-19 14:42:27 +08:00
7381abffb3
Updating template for cocos2d-x JS
2012-11-16 15:56:31 +08:00
fa071d3082
Updated js template for iOS.
2012-11-02 16:09:45 +08:00
21900c26db
update xcode template and version string
2012-11-01 12:06:15 +08:00
ffe52a157f
Removed some unused codes about "enableRetinaDisplay".
2012-10-24 16:12:40 +08:00
b0f02a0773
updates on the js front
2012-10-18 17:44:41 -07:00
6178594068
issue #1486 : Updated lua templates.
2012-10-12 16:19:33 +08:00
bc05a650ec
Add a template for the debugger script that is used when generating a new project
2012-10-04 11:48:17 -07:00
d18eecf247
UIInterfaceOrientationMaskLandscape -> UIInterfaceOrientationMaskAllButUpsideDown, developers still need to set orientation in xcode->targets
2012-09-27 10:28:00 +08:00
edaf22f14d
fix xcode4 templates compilation error for xcodebuild command line mode, caused by ios6 compatibility.
2012-09-27 00:46:09 +08:00
e4b428a875
Updated win32 template.
2012-09-26 17:55:18 +08:00
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
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
c50a62be7a
issue #1482 , fix typos, mehod -> method.
2012-09-24 10:54:03 +08:00
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
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
100a7a1883
Adding sample game wrapper using CCBReader. Also includes small modification to CCBReader
2012-09-20 18:02:17 -07:00
d1493a862f
Updating template to support CCBuilderReader
2012-09-20 18:02:02 -07:00
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
19b22be52e
[template] modify AppController, add viewController & window variant. all Xcode template modified.
2012-09-18 09:55:28 +08:00
4cbd993091
Minor English Spelling Corrections. A few grammar corrections.
2012-09-17 00:02:24 -07:00
7c750dc9c5
Minor changes to comments. One integer literal changed to float literal.
2012-09-14 15:26:38 -07:00
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
382b08a947
fixed #1455 : Adding xcode template for cocos2dx-js. Thank rohankuruvilla .
2012-09-01 10:49:15 +08:00
374232ac88
Adding xcode template for cocos2dx-js
2012-08-31 12:07:58 -07:00
9857337102
Updated android template.
...
In eclipse, please using import the created project.
2012-08-30 18:27:35 +08:00
6a99431338
Updated hello.lua in Template folder.
2012-08-29 21:04:21 +08:00
95419d2dea
Updated templates for android,blackberry,win32 and ios.
...
LAYER_CREATE_FUNC ~> CREATE_FUNC
2012-08-29 21:03:47 +08:00
c1d6edc7ad
fix a bug in android template
2012-08-27 10:50:55 +08:00
4eff148f96
Added blackberry template files.
2012-08-24 14:29:51 +08:00
3d3e5b3a93
fix some bug of xcode template & remove unneeded files
2012-08-23 18:36:08 +08:00
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
ba2049d086
iss1438_android_template
2012-08-21 16:45:23 +08:00
8c483613e7
issue #1437:make CCApplication::sharedApplication() return pointer
2012-08-21 15:41:00 +08:00
07ddd43695
issue #1437:make CCApplication::sharedApplication() return pointer
2012-08-21 15:28:43 +08:00
fd1343b951
Updated win32 template and fix a bug in win32/CCEGLView.cpp.
2012-08-20 17:08:29 +08:00
40ee7496cd
fixed #1433:remove fpsxxx.png in win32 template
2012-08-20 15:15:21 +08:00
868d768156
Cleaner template for build_native.sh
...
* used by projects generated with create-android-project.sh
2012-07-31 22:56:18 -07:00
ba224cc283
add CCTouch.cpp into proj.win32, android.mk, xcode4 template.
2012-07-31 23:32:19 +08:00
851241d3c3
Merge pull request #1116 from minggo/iss1399_adjust_structure
...
Iss1399 adjust structure
2012-07-23 02:19:30 -07:00
4eb59cd3d0
issue #1399:xcode template works ok after adjusting directory structure
2012-07-23 17:10:56 +08:00
722084bbaa
issue #1399 : Updated android template. Added cocos_extension_static dependence for created project by default.
2012-07-23 16:42:07 +08:00
d5f783b681
issue #1399 : Updated android template.
2012-07-23 14:56:40 +08:00
8291b7aef6
Reverted 'cocosdenshion' to 'CocosDenshion'.
2012-07-23 11:07:31 +08:00
c171f24d8e
issue #1399 : Updated win32 template.
2012-07-23 10:31:26 +08:00
aba33b5bda
Reverted build_native.sh.
2012-06-28 16:58:32 +08:00
a901b0bb12
fixed #1367 : Refactor "createWith***" to "create".
2012-06-27 14:21:29 +08:00
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
04a155fd9c
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-06-25 11:55:52 +08:00
28ba42db87
fixed #1344 : win32 template cannot work after synchronizing to rc2
2012-06-25 11:55:12 +08:00
55eca9f516
fixed #1343 : make xcode template work ok
2012-06-22 12:00:27 +08:00
1d0b7c40e4
Removed virtual attribute for callback functions in HelloWorldScene.h.
...
Updated templates.
2012-06-21 13:56:56 +08:00
06f941b8c0
Script uses updated directory name when copying files
2012-06-15 09:17:42 -07:00
24cc0796b6
Merge branch 'cocos2dxandroidlibrary' of https://github.com/folecr/cocos2d-x into folecr_android
2012-06-15 17:47:04 +08:00
1d0fa4a9aa
fixed #1292 : Updated lua bindings.
2012-06-15 17:26:11 +08:00
c17091ac70
fixed #1310 : Updated vs2010 project configuration after synchronizing to rc2.
2012-06-15 15:24:22 +08:00
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
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
4c1ca36aa8
fixed #1326 : The compilation of Hellolua and testjs project was broken after synchronizing to rc2.
2012-06-15 10:51:53 +08:00
37aa196c73
Removed some unused codes.
2012-06-06 14:31:49 +08:00
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
8b6026f932
Android template's build_native.sh automatically copies new icons from your assets directory.
2012-06-01 00:36:16 -07:00
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
a283bfed4f
fixed #1191 : update xcode template
2012-05-31 09:52:39 +08:00
19c96632b5
fixed #1176 : Changed linebreak symbol to UNIX format ('\n'),replaced 'tab' with four spaces.
2012-05-29 16:21:23 +08:00
a7ca2cb3a0
fixed #1246 : Updated win32 templates. Copying fps_images.fnt and fps_images.png files.
2012-05-28 16:25:32 +08:00
22b2f722b5
fixed #1220 : Using CCString::stringWithContentsOfFile to get string from lua script files.
2012-05-04 14:31:56 +08:00
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
47b8148064
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1191_gles20_template
2012-05-04 02:08:31 +08:00
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
7e882ae89e
Merge pull request #879 from minggo/iss1201_android_build
...
simplify writing of Android.mk
2012-05-02 03:19:36 -07:00
4580fffed7
issue #1204 : Updated CCApplication.mm and ios template.
2012-05-02 18:18:43 +08:00
75601fbc02
fixed #1201 : simplify the writing of Android.mk and correct corresponding template
2012-05-02 17:29:16 +08:00
61f33a87af
fixed #1206 : Removed some unused files, first release will only support ios, win32 and android.
2012-05-02 14:50:47 +08:00
a666dc7edb
fixed #1194 : Updated template file -- cocos2d_chipmunk.xctemplate/Classes/HelloWorldScene.cpp.
2012-05-02 14:31:46 +08:00
547bd6910d
fixed #1194 : Updated ios template.
2012-05-02 14:29:36 +08:00
99bc442dad
#issue #1194 : Updated chipmuck template for ios platform.
2012-05-02 14:17:14 +08:00
41b1bca740
issue #1194 : Updated the chipmuck template for ios platform.
2012-05-02 14:06:12 +08:00
849a4ebc7f
issue #1194 : Updated the box2d template for ios platform.
2012-05-02 13:03:47 +08:00
4a002ea9cc
issue #1194 : Updated ios template of box2d.
2012-05-02 12:51:48 +08:00
5c7e7f6563
issue #1194 : Updated ios template.
2012-05-02 12:01:53 +08:00
9886f281ee
issue #1191 : Updated win32 project files.
2012-04-27 18:50:55 +08:00
36c9ab18a8
issue #1191 : Updated default.js.
2012-04-27 11:36:38 +08:00
6305de4ff6
issue #1191 : Updated win32 template.
2012-04-27 11:35:09 +08:00
a771f47a1a
issue #1191 : Updated win32 template.
2012-04-26 15:57:05 +08:00
7bf2067942
issue #1191 : Removed some unused files in template folder.
2012-04-26 15:03:44 +08:00
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
783b2fe79b
Removed some unused codes regard to WOPHONE.
2012-04-19 10:46:37 +08:00
5623f5fb58
fixed #1020 : make vs template support lua
2012-03-07 15:03:35 +08:00
2acd80bb73
fixed #982 , copy resources as recursively (-r), and let sed works on mac
2012-03-01 16:57:59 +08:00
a87e76c399
fixed #982 : android template works ok on linux
2012-03-01 02:51:58 +08:00
c0d2118aac
issue #982 : android template support lua box2d and chipmunk
2012-02-29 17:48:45 +08:00
bb2ca44c24
fixed #985 : remove xcode3 template
2012-02-28 10:21:59 +08:00
9d37b214d5
fix "Resource" to "Resources" in template/android/copy_files.sh
2012-02-25 10:14:06 +08:00
525854fc40
modify linux template.
2012-02-15 17:39:10 +08:00
5c4f9415ec
use gnustl_static
2012-02-15 10:42:48 +08:00
c3d23a7923
issue #972 : Modify project setting for all platforms. Use new icons for ios template.
2012-02-14 15:13:54 +08:00
5ce4968524
merge from cocos2d-x master
2012-02-10 10:46:58 +08:00
6ae40fc12f
fixed #971 : build cocos2dx as static lib
2012-02-10 10:31:56 +08:00
141dac47d3
Merge branch 'luafix-master' of https://github.com/dualface/cocos2d-x into lua_support_refactor
2012-02-09 17:58:39 +08:00
8b0d201850
update xcode4 lua template
2012-02-09 17:54:25 +08:00
95906c34bf
Merge branch 'luafix-master' of https://github.com/dualface/cocos2d-x into lua_support_refactor
2012-02-09 16:14:54 +08:00
52de292e20
fixed #970 : use modules in the android ndk build
2012-02-08 11:14:47 +08:00
9249328afb
fixed #970 : use modules in the Android NDK build
2012-02-07 14:34:30 +08:00
22cddb5240
* update hello.lua
2012-02-07 13:17:23 +08:00
7ef0373c8b
* update lua application template files
2012-02-02 22:15:56 +08:00
1983949b68
* update project templates AppDelegate
2012-02-02 19:01:30 +08:00
6c2277757a
fixed #958 : delete SelectorProtocol and implement it in CCObject
2012-01-30 17:47:47 +08:00
8c81fcf232
fixed #940 : replace .ico file with clear image for win32 template.
2012-01-19 11:58:37 +08:00
bd22d74331
Merge remote-tracking branch 'remotes/upstream/master'
2012-01-14 23:09:50 +01:00
a9d03e6ad8
Renamed folder from airplay to marmalade
2012-01-14 22:47:19 +01:00
cfd365f5d7
Updated paths from airplay to marmalade
2012-01-14 22:46:20 +01:00
dc6a4ce709
Merge pull request #678 from minggo/test
...
make linux template work correctly
2012-01-12 04:24:38 -08:00
813342fb83
make linux template work correctly
2012-01-12 20:20:09 +08:00
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
ac2a508225
fixed #940 : add new icons for wohpne
2012-01-11 17:43:12 +08:00
8a2a0744cd
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss939_create_qnx_project
2012-01-10 17:20:14 +08:00
42b13c5b0a
add create qnx project script for mac or linux system.
2012-01-10 17:05:42 +08:00
86997d6709
fixed #940 : replace icons and background pictures
2012-01-10 16:45:49 +08:00
98caa29dc2
fixed a typo error and change resource path for linux port when creating linux template
2012-01-04 15:00:14 +08:00
beb57fc486
fixed #919 : make script support global variable
2011-12-23 16:00:31 +08:00
afa8e48783
fixed #919 : linux template supports global variable
2011-12-23 14:45:41 +08:00
0f7c8abfc1
Merge pull request #634 from minggo/iss919_script
...
issue #919 : supporting global variable
2011-12-20 21:51:20 -08:00
b7fbd4fc13
issue #919 : supporting global variable
2011-12-20 16:50:39 +08:00
5764b0edb3
Merge pull request #632 from minggo/iss893_memory_warning
...
fixed #893 : free cached data when receivint memory warning on iOS
2011-12-19 19:44:55 -08:00
80e6c16913
fixed #893 : free cached data when receivint memory warning on iOS
2011-12-20 11:35:50 +08:00
4caa719415
fixed #915 : update codes generated by msvc template
2011-12-20 11:07:54 +08:00
443656f88c
* fix Xcode 4 template, AppController.mm not call AppDelegate:applicationDidEnterBackground() & AppDelegate:applicationWillEnterForeground()
2011-12-06 10:51:12 +08:00
21af60ee9c
update xcode4 templates
2011-12-01 17:00:30 +08:00
4607ba8029
support for android 4.0
2011-11-30 15:30:11 +08:00
c99d254c01
issue #850 : update box2d for iOS and android
2011-11-29 15:16:16 +08:00
c00d59a568
fixed #838 : android template support x86
2011-11-23 16:43:52 +08:00
522386a6b7
issue #854 : pthread work ok on iOS
2011-11-18 09:55:47 +08:00
b0be69e26e
merge HelloLua modifications & updates into xcode4 template for lua.
2011-10-20 15:56:51 +08:00
c1f67374c4
issue #753 , update [windows addSubview:__glView] into box2d/chipmunk/lua xcode4 templates
2011-10-20 15:33:27 +08:00
e3c39fe835
fixed #753 , visual orientation is wrong on ios5 simulator
2011-10-19 21:43:25 +08:00
8b3ce10ece
copy files from HelloWorld/Classes and delete unneeded files
2011-10-18 09:55:56 +08:00
a8511f0cd3
fixed #747 , Rename the resource folder name of win32 template to Resources.
2011-10-13 14:58:36 +08:00
6d358cfad7
make linux template work ok
2011-09-29 02:14:17 -07:00
333e08330b
make create-linux-android-project.sh works ok
2011-09-29 00:49:49 -07:00
0f7a15b1b3
recommit
...
modify eclipse project config
delete libs and use the folder eclipse generated instead.
2011-09-23 09:56:30 +08:00
c24d1d3fd6
Merge branch 'LinuxPort' of https://github.com/laschweinski/cocos2d-x into linux_port
2011-09-16 13:53:18 +08:00
310e79a491
delete the project configurations in base folder
2011-09-07 12:41:39 +08:00
13017359c3
fixed #707 : add search path for lua template
2011-09-05 17:58:30 +08:00
1fc09448a4
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into LinuxPort
...
Conflicts:
cocos2dx/actions/CCActionInstant.cpp
cocos2dx/include/CCActionInstant.h
2011-09-04 14:38:53 +08:00
1ac3fdebca
deleted: Box2D/Box2DConfig.cmake
...
deleted: Box2D/CMakeLists.txt
new file: CocosDenshion/.cproject
new file: CocosDenshion/.project
deleted: HelloCocos2dx/AndroidDebug/Classes/AppDelegate.d
deleted: HelloCocos2dx/AndroidDebug/Classes/AppDelegate.o
deleted: HelloCocos2dx/AndroidDebug/Classes/HelloWorldScene.d
deleted: HelloCocos2dx/AndroidDebug/Classes/HelloWorldScene.o
deleted: HelloCocos2dx/AndroidDebug/Classes/subdir.mk
deleted: HelloCocos2dx/AndroidDebug/android/jni/helloworld/main.d
deleted: HelloCocos2dx/AndroidDebug/android/jni/helloworld/main.o
deleted: HelloCocos2dx/AndroidDebug/android/jni/helloworld/subdir.mk
deleted: HelloCocos2dx/AndroidDebug/libHelloCocos2dx.so
deleted: HelloCocos2dx/AndroidDebug/makefile
deleted: HelloCocos2dx/AndroidDebug/objects.mk
deleted: HelloCocos2dx/AndroidDebug/sources.mk
deleted: HelloCocos2dx/AndroidRelease/Classes/AppDelegate.d
deleted: HelloCocos2dx/AndroidRelease/Classes/AppDelegate.o
deleted: HelloCocos2dx/AndroidRelease/Classes/HelloWorldScene.d
deleted: HelloCocos2dx/AndroidRelease/Classes/HelloWorldScene.o
deleted: HelloCocos2dx/AndroidRelease/Classes/subdir.mk
deleted: HelloCocos2dx/AndroidRelease/android/jni/helloworld/main.d
deleted: HelloCocos2dx/AndroidRelease/android/jni/helloworld/main.o
deleted: HelloCocos2dx/AndroidRelease/android/jni/helloworld/subdir.mk
deleted: HelloCocos2dx/AndroidRelease/libHelloCocos2dx.so
deleted: HelloCocos2dx/AndroidRelease/makefile
deleted: HelloCocos2dx/AndroidRelease/objects.mk
deleted: HelloCocos2dx/AndroidRelease/sources.mk
deleted: HelloCocos2dx/Classes/AppDelegate.cpp
deleted: HelloCocos2dx/Classes/AppDelegate.h
deleted: HelloCocos2dx/Classes/HelloWorldScene.cpp
deleted: HelloCocos2dx/Classes/HelloWorldScene.h
deleted: HelloCocos2dx/Linux/main.cpp
deleted: HelloCocos2dx/Linux/main.h
deleted: HelloCocos2dx/Resource/CloseNormal.png
deleted: HelloCocos2dx/Resource/CloseSelected.png
deleted: HelloCocos2dx/Resource/HelloWorld.png
deleted: HelloCocos2dx/Resource/Icon.png
deleted: HelloCocos2dx/Resource/app.config.txt
deleted: HelloCocos2dx/android/AndroidManifest.xml
deleted: HelloCocos2dx/android/build.properties
deleted: HelloCocos2dx/android/build.xml
deleted: HelloCocos2dx/android/build_native.sh
deleted: HelloCocos2dx/android/default.properties
deleted: HelloCocos2dx/android/gen/org/cocos2dx/application/R.java
deleted: HelloCocos2dx/android/jni/helloworld/main.cpp
deleted: HelloCocos2dx/android/local.properties
deleted: HelloCocos2dx/android/proguard.cfg
deleted: HelloCocos2dx/android/res/drawable-hdpi/icon.png
deleted: HelloCocos2dx/android/res/drawable-ldpi/icon.png
deleted: HelloCocos2dx/android/res/drawable-mdpi/icon.png
deleted: HelloCocos2dx/android/res/layout/game_demo.xml
deleted: HelloCocos2dx/android/res/layout/helloworld_demo.xml
deleted: HelloCocos2dx/android/res/values/strings.xml
deleted: HelloCocos2dx/android/src/org/cocos2dx/application/ApplicationDemo.java
deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxAccelerometer.java
deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxActivity.java
deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxBitmap.java
deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxGLSurfaceView.java
deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxMusic.java
deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxRenderer.java
deleted: HelloCocos2dx/android/src/org/cocos2dx/lib/Cocos2dxSound.java
modified: HelloWorld/Classes/AppDelegate.cpp
deleted: HelloWorld/Linux/CloseNormal.png
deleted: HelloWorld/Linux/CloseSelected.png
deleted: HelloWorld/Linux/HelloWorld.png
deleted: HelloWorld/Linux/Icon.png
deleted: HelloWorld/Linux/Materhorn.ttf
deleted: HelloWorld/Linux/app.config.txt
deleted: HelloWorld/Linux/cocos2dx-hello
deleted: HelloWorld/Linux/libcocos2dx.so
modified: cocos2dx/.cproject
modified: lib/linux/Debug/libcocos2d.so
modified: lib/linux/Release/libcocos2d.so
modified: template/android/mycopy_files.sh
new file: tests/test.linux/.cproject
new file: tests/test.linux/.project
modified: tests/tests/ChipmunkTest/cocos2dChipmunkDemo.cpp
modified: tests/tests/controller.cpp
modified: tests/tests/tests.h
2011-08-28 14:33:04 +08:00
0879cd7466
[android] copy files from Resources
2011-08-23 17:17:09 +08:00
d57d9ca6f6
modified: cocos2dx/.cproject
...
modified: cocos2dx/CCConfiguration.cpp
modified: cocos2dx/CCConfiguration.h
modified: cocos2dx/actions/CCActionGrid3D.cpp
modified: cocos2dx/platform/Linux/CCAplication_linux.cpp
modified: cocos2dx/platform/Linux/CCAplication_linux.h
modified: cocos2dx/platform/Linux/CCImage_Linux.cpp
modified: mycreate-android-project.sh
new file: post.sh
modified: template/android/mycopy_files.sh
modified: tests/AppDelegate.cpp
new file: tests/test.linux/Res
deleted: tests/test.linux/Res/Hello.png
deleted: tests/test.linux/Res/Images/BoilingFoam.plist
deleted: tests/test.linux/Res/Images/BurstPipe.plist
deleted: tests/test.linux/Res/Images/Comet.plist
deleted: tests/test.linux/Res/Images/Comet.png
deleted: tests/test.linux/Res/Images/ExplodingRing.plist
deleted: tests/test.linux/Res/Images/Flower.plist
deleted: tests/test.linux/Res/Images/Fog.png
deleted: tests/test.linux/Res/Images/Galaxy.plist
deleted: tests/test.linux/Res/Images/HelloWorld.png
deleted: tests/test.linux/Res/Images/Icon.png
deleted: tests/test.linux/Res/Images/LavaFlow.plist
deleted: tests/test.linux/Res/Images/Pea.png
deleted: tests/test.linux/Res/Images/Phoenix.plist
deleted: tests/test.linux/Res/Images/PlanetCute-1024x1024.png
deleted: tests/test.linux/Res/Images/SendScoreButton.png
deleted: tests/test.linux/Res/Images/SendScoreButtonPressed.png
deleted: tests/test.linux/Res/Images/SpinningPeas.plist
deleted: tests/test.linux/Res/Images/SpinningPeas.png
deleted: tests/test.linux/Res/Images/Spiral.plist
deleted: tests/test.linux/Res/Images/SpookyPeas.plist
deleted: tests/test.linux/Res/Images/SpookyPeas.png
deleted: tests/test.linux/Res/Images/Upsidedown.plist
deleted: tests/test.linux/Res/Images/atlastest.png
deleted: tests/test.linux/Res/Images/b1-hd.png
deleted: tests/test.linux/Res/Images/b1.png
deleted: tests/test.linux/Res/Images/b2-hd.png
deleted: tests/test.linux/Res/Images/b2.png
deleted: tests/test.linux/Res/Images/background.png
deleted: tests/test.linux/Res/Images/background1-hd.png
deleted: tests/test.linux/Res/Images/background1.png
deleted: tests/test.linux/Res/Images/background2-hd.png
deleted: tests/test.linux/Res/Images/background2.png
deleted: tests/test.linux/Res/Images/background3-hd.png
deleted: tests/test.linux/Res/Images/background3.png
deleted: tests/test.linux/Res/Images/ball-hd.png
deleted: tests/test.linux/Res/Images/ball.png
deleted: tests/test.linux/Res/Images/bitmapFontTest3.fnt
deleted: tests/test.linux/Res/Images/bitmapFontTest3.png
deleted: tests/test.linux/Res/Images/blocks-hd.png
deleted: tests/test.linux/Res/Images/blocks.png
deleted: tests/test.linux/Res/Images/btn-about-normal.png
deleted: tests/test.linux/Res/Images/btn-about-selected.png
deleted: tests/test.linux/Res/Images/btn-highscores-normal.png
deleted: tests/test.linux/Res/Images/btn-highscores-selected.png
deleted: tests/test.linux/Res/Images/btn-play-normal.png
deleted: tests/test.linux/Res/Images/btn-play-selected.png
deleted: tests/test.linux/Res/Images/bugs/RetinaDisplay.jpg
deleted: tests/test.linux/Res/Images/bugs/bug886.jpg
deleted: tests/test.linux/Res/Images/bugs/bug886.png
deleted: tests/test.linux/Res/Images/bugs/circle-hd.plist
deleted: tests/test.linux/Res/Images/bugs/circle-hd.png
deleted: tests/test.linux/Res/Images/bugs/circle.plist
deleted: tests/test.linux/Res/Images/bugs/circle.png
deleted: tests/test.linux/Res/Images/bugs/corner.png
deleted: tests/test.linux/Res/Images/bugs/edge.png
deleted: tests/test.linux/Res/Images/bugs/fill.png
deleted: tests/test.linux/Res/Images/bugs/picture-hd.png
deleted: tests/test.linux/Res/Images/bugs/picture.png
deleted: tests/test.linux/Res/Images/close-hd.png
deleted: tests/test.linux/Res/Images/close.png
deleted: tests/test.linux/Res/Images/debian.plist
deleted: tests/test.linux/Res/Images/f1-hd.png
deleted: tests/test.linux/Res/Images/f1.png
deleted: tests/test.linux/Res/Images/f2-hd.png
deleted: tests/test.linux/Res/Images/f2.png
deleted: tests/test.linux/Res/Images/fire-grayscale.png
deleted: tests/test.linux/Res/Images/fire.png
deleted: tests/test.linux/Res/Images/fps_images.png
deleted: tests/test.linux/Res/Images/grossini-hd.png
deleted: tests/test.linux/Res/Images/grossini.png
deleted: tests/test.linux/Res/Images/grossini_128x256_mipmap.pvr
deleted: tests/test.linux/Res/Images/grossini_dance_01.png
deleted: tests/test.linux/Res/Images/grossini_dance_02.png
deleted: tests/test.linux/Res/Images/grossini_dance_03.png
deleted: tests/test.linux/Res/Images/grossini_dance_04.png
deleted: tests/test.linux/Res/Images/grossini_dance_05.png
deleted: tests/test.linux/Res/Images/grossini_dance_06.png
deleted: tests/test.linux/Res/Images/grossini_dance_07.png
deleted: tests/test.linux/Res/Images/grossini_dance_08.png
deleted: tests/test.linux/Res/Images/grossini_dance_09.png
deleted: tests/test.linux/Res/Images/grossini_dance_10.png
deleted: tests/test.linux/Res/Images/grossini_dance_11.png
deleted: tests/test.linux/Res/Images/grossini_dance_12.png
deleted: tests/test.linux/Res/Images/grossini_dance_13.png
deleted: tests/test.linux/Res/Images/grossini_dance_14.png
deleted: tests/test.linux/Res/Images/grossini_dance_atlas-hd.png
deleted: tests/test.linux/Res/Images/grossini_dance_atlas-mono.png
deleted: tests/test.linux/Res/Images/grossini_dance_atlas.png
deleted: tests/test.linux/Res/Images/grossini_dance_atlas_nomipmap.png
deleted: tests/test.linux/Res/Images/grossini_pvr_rgba4444.pvr
deleted: tests/test.linux/Res/Images/grossini_pvr_rgba8888.pvr
deleted: tests/test.linux/Res/Images/grossinis_sister1-hd.png
deleted: tests/test.linux/Res/Images/grossinis_sister1-testalpha.png
deleted: tests/test.linux/Res/Images/grossinis_sister1-testalpha.ppng
deleted: tests/test.linux/Res/Images/grossinis_sister1.png
deleted: tests/test.linux/Res/Images/grossinis_sister2-hd.png
deleted: tests/test.linux/Res/Images/grossinis_sister2.png
deleted: tests/test.linux/Res/Images/landscape-1024x1024.png
deleted: tests/test.linux/Res/Images/logo-mipmap.pvr
deleted: tests/test.linux/Res/Images/logo-nomipmap.pvr
deleted: tests/test.linux/Res/Images/menuitemsprite.png
deleted: tests/test.linux/Res/Images/paddle-hd.png
deleted: tests/test.linux/Res/Images/paddle.png
deleted: tests/test.linux/Res/Images/particles-hd.png
deleted: tests/test.linux/Res/Images/particles.png
deleted: tests/test.linux/Res/Images/pattern1.png
deleted: tests/test.linux/Res/Images/piece.png
deleted: tests/test.linux/Res/Images/powered.png
deleted: tests/test.linux/Res/Images/r1-hd.png
deleted: tests/test.linux/Res/Images/r1.png
deleted: tests/test.linux/Res/Images/r2-hd.png
deleted: tests/test.linux/Res/Images/r2.png
deleted: tests/test.linux/Res/Images/snow.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-0.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-1.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-2.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-3.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-4.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-5.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-6.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-0-7.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-0.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-1.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-2.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-3.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-4.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-5.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-6.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-1-7.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-0.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-1.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-2.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-3.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-4.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-5.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-6.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-2-7.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-0.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-1.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-2.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-3.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-4.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-5.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-6.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-3-7.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-0.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-1.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-2.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-3.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-4.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-5.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-6.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-4-7.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-0.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-1.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-2.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-3.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-4.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-5.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-6.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-5-7.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-0.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-1.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-2.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-3.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-4.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-5.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-6.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-6-7.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-0.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-1.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-2.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-3.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-4.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-5.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-6.png
deleted: tests/test.linux/Res/Images/sprites_test/sprite-7-7.png
deleted: tests/test.linux/Res/Images/spritesheet1.png
deleted: tests/test.linux/Res/Images/stars-grayscale.png
deleted: tests/test.linux/Res/Images/stars.png
deleted: tests/test.linux/Res/Images/stars2-grayscale.png
deleted: tests/test.linux/Res/Images/stars2.png
deleted: tests/test.linux/Res/Images/streak.png
deleted: tests/test.linux/Res/Images/test-rgba1.png
deleted: tests/test.linux/Res/Images/test_blend.png
deleted: tests/test.linux/Res/Images/test_image-bad_encoding.pvr
deleted: tests/test.linux/Res/Images/test_image.jpeg
deleted: tests/test.linux/Res/Images/test_image.png
deleted: tests/test.linux/Res/Images/test_image.pvr
deleted: tests/test.linux/Res/Images/test_image.pvrraw
deleted: tests/test.linux/Res/Images/test_image_a8.pvr
deleted: tests/test.linux/Res/Images/test_image_ai88.pvr
deleted: tests/test.linux/Res/Images/test_image_bgra8888.pvr
deleted: tests/test.linux/Res/Images/test_image_i8.pvr
deleted: tests/test.linux/Res/Images/test_image_pvrtc2bpp.pvr
deleted: tests/test.linux/Res/Images/test_image_pvrtc4bpp.pvr
deleted: tests/test.linux/Res/Images/test_image_rgb565.pvr
deleted: tests/test.linux/Res/Images/test_image_rgba4444.pvr
deleted: tests/test.linux/Res/Images/test_image_rgba4444.pvr.ccz
deleted: tests/test.linux/Res/Images/test_image_rgba4444.pvr.gz
deleted: tests/test.linux/Res/Images/test_image_rgba4444_mipmap.pvr
deleted: tests/test.linux/Res/Images/test_image_rgba5551.pvr
deleted: tests/test.linux/Res/Images/test_image_rgba8888.pvr
deleted: tests/test.linux/Res/Images/texture1024x1024.png
deleted: tests/test.linux/Res/Images/texture2048x2048.png
deleted: tests/test.linux/Res/Images/texture512x512.png
deleted: tests/test.linux/Res/TileMaps/fixed-ortho-test2.png
deleted: tests/test.linux/Res/TileMaps/hexa-test.tmx
deleted: tests/test.linux/Res/TileMaps/hexa-tiles.png
deleted: tests/test.linux/Res/TileMaps/iso-test-bug787.tmx
deleted: tests/test.linux/Res/TileMaps/iso-test-movelayer.tmx
deleted: tests/test.linux/Res/TileMaps/iso-test-objectgroup.tmx
deleted: tests/test.linux/Res/TileMaps/iso-test-vertexz.tmx
deleted: tests/test.linux/Res/TileMaps/iso-test-zorder.tmx
deleted: tests/test.linux/Res/TileMaps/iso-test.png
deleted: tests/test.linux/Res/TileMaps/iso-test.tmx
deleted: tests/test.linux/Res/TileMaps/iso-test1.tmx
deleted: tests/test.linux/Res/TileMaps/iso-test2-uncompressed.tmx
deleted: tests/test.linux/Res/TileMaps/iso-test2.png
deleted: tests/test.linux/Res/TileMaps/iso-test2.tmx
deleted: tests/test.linux/Res/TileMaps/iso.png
deleted: tests/test.linux/Res/TileMaps/levelmap.tga
deleted: tests/test.linux/Res/TileMaps/ortho-objects.tmx
deleted: tests/test.linux/Res/TileMaps/ortho-test1.png
deleted: tests/test.linux/Res/TileMaps/ortho-test1_bw.png
deleted: tests/test.linux/Res/TileMaps/ortho-test2.png
deleted: tests/test.linux/Res/TileMaps/orthogonal-test-movelayer.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test-vertexz.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test-zorder.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test1.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test1.tsx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test2.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test3.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test4-hd.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test4.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test5.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test6-hd.tmx
deleted: tests/test.linux/Res/TileMaps/orthogonal-test6.tmx
deleted: tests/test.linux/Res/TileMaps/test-object-layer.tmx
deleted: tests/test.linux/Res/TileMaps/tiles-hd.png
deleted: tests/test.linux/Res/TileMaps/tiles.png
deleted: tests/test.linux/Res/TileMaps/tmw_desert_spacing-hd.png
deleted: tests/test.linux/Res/TileMaps/tmw_desert_spacing.png
deleted: tests/test.linux/Res/animations/dragon_animation-hd.png
deleted: tests/test.linux/Res/animations/dragon_animation.png
deleted: tests/test.linux/Res/animations/ghosts.plist
deleted: tests/test.linux/Res/animations/ghosts.png
deleted: tests/test.linux/Res/animations/grossini-aliases.plist
deleted: tests/test.linux/Res/animations/grossini-aliases.png
deleted: tests/test.linux/Res/animations/grossini.plist
deleted: tests/test.linux/Res/animations/grossini.plist.xml
deleted: tests/test.linux/Res/animations/grossini.png
deleted: tests/test.linux/Res/animations/grossini.ztp
deleted: tests/test.linux/Res/animations/grossini_blue.plist
deleted: tests/test.linux/Res/animations/grossini_blue.png
deleted: tests/test.linux/Res/animations/grossini_family.plist
deleted: tests/test.linux/Res/animations/grossini_family.png
deleted: tests/test.linux/Res/animations/grossini_gray.plist
deleted: tests/test.linux/Res/animations/grossini_gray.png
deleted: tests/test.linux/Res/app.config.txt
deleted: tests/test.linux/Res/background.mp3
deleted: tests/test.linux/Res/effect1.wav
deleted: tests/test.linux/Res/effect2.ogg
deleted: tests/test.linux/Res/fonts/A Damn Mess.ttf
deleted: tests/test.linux/Res/fonts/Abberancy.ttf
deleted: tests/test.linux/Res/fonts/Abduction.ttf
deleted: tests/test.linux/Res/fonts/Paint Boy.ttf
deleted: tests/test.linux/Res/fonts/Schwarzwald Regular.ttf
deleted: tests/test.linux/Res/fonts/Scissor Cuts.ttf
deleted: tests/test.linux/Res/fonts/arial16.fnt
deleted: tests/test.linux/Res/fonts/arial16.png
deleted: tests/test.linux/Res/fonts/bitmapFontTest.fnt
deleted: tests/test.linux/Res/fonts/bitmapFontTest.png
deleted: tests/test.linux/Res/fonts/bitmapFontTest2.fnt
deleted: tests/test.linux/Res/fonts/bitmapFontTest2.png
deleted: tests/test.linux/Res/fonts/bitmapFontTest3.fnt
deleted: tests/test.linux/Res/fonts/bitmapFontTest3.png
deleted: tests/test.linux/Res/fonts/bitmapFontTest4.fnt
deleted: tests/test.linux/Res/fonts/bitmapFontTest4.png
deleted: tests/test.linux/Res/fonts/bitmapFontTest5.fnt
deleted: tests/test.linux/Res/fonts/bitmapFontTest5.png
deleted: tests/test.linux/Res/fonts/fps_images-hd.png
deleted: tests/test.linux/Res/fonts/fps_images.png
deleted: tests/test.linux/Res/fonts/futura-48.fnt
deleted: tests/test.linux/Res/fonts/futura-48.png
deleted: tests/test.linux/Res/fonts/konqa32-hd.fnt
deleted: tests/test.linux/Res/fonts/konqa32-hd.png
deleted: tests/test.linux/Res/fonts/konqa32.fnt
deleted: tests/test.linux/Res/fonts/konqa32.png
deleted: tests/test.linux/Res/fonts/larabie-16-hd.png
deleted: tests/test.linux/Res/fonts/larabie-16.png
deleted: tests/test.linux/Res/fonts/tuffy_bold_italic-charmap-hd.png
deleted: tests/test.linux/Res/fonts/tuffy_bold_italic-charmap.png
deleted: tests/test.linux/Res/music.mid
deleted: tests/test.linux/Res/zwoptex/grossini-generic.plist
deleted: tests/test.linux/Res/zwoptex/grossini-generic.png
deleted: tests/test.linux/Res/zwoptex/grossini.plist
deleted: tests/test.linux/Res/zwoptex/grossini.png
CocosDenshion/AndroidDebug/
CocosDenshion/AndroidRelease/
HelloCocos2dx/AndroidDebug/2
HelloCocos2dx/android/assets
HelloCocos2dx/postCompiled.sh
installLinuxLib.sh
2011-08-23 11:28:04 +08:00
ff5222fff8
some files missiong(eclipse with git is too hard to play)
2011-08-21 19:00:26 +08:00
4532220ca8
fix xcode3 templates
...
1. remove setDeviceOrientation since we use RootViewController now
2. fix a typo in box2d template
3. modify _XXX_Prefix.pch to Prefix.pch in proj file
2011-08-17 16:02:56 +08:00
4894f8c6ab
update xcode3 templates
2011-08-17 14:08:47 +08:00
3b97f4d73a
fix all xcode4 templates before version release.
...
1. modify version description in install-teampltes-xcode.sh
2. replace the deprecated methods in box2d/HelloWorldScene.cpp
3. fix the error usage in hello.lua
4. add effect & BGM in HelloLua
5. update baisc cocos2dx library file list
2011-08-17 12:13:13 +08:00
3afe6ebfb2
fixed #638 , add support for pvr ccz format. I've tested it on both ios & android, also with instrument memleak detection. But haven't tested on win32 & marmalde, in thoery it will work.
2011-08-16 11:56:17 +08:00
547905465b
issue #540 , add RootViewController into xcode3 templates; rename _XXX_Prefix.pch to Prefix.pch; remove MIT license in user code.
2011-08-10 14:45:13 +08:00
46808db7fd
issue #658 , rename _PROJECTNAMEASIDENTIFIER__AppController.* to AppController.* in xcode3 template. Left cases: untested in xcode3; have no RootViewController in xcode3 templates.
2011-08-10 11:35:44 +08:00
d386116255
[iOS]fixed #667 : call AppDelegate::applicationDidEnterBackground() & AppDeleaget::applicationWillEnterForeground() when application enter background & enter foreground
2011-08-10 10:24:06 +08:00
0551e86d80
Merge https://github.com/clawoo/cocos2d-x
2011-08-05 10:05:20 +08:00
f7a3dc2150
fixed #658 , rename _PROJECTNAMEASIDENTIFIER__AppDelegate.cpp/.h in xcode3 tempaltes to AppDelegate.cpp/.h, keep consistency to xcode4/android templates.
2011-08-04 21:57:48 +08:00
7481d3ac4a
Make build_native.sh executable when creating a new project
2011-08-04 14:23:12 +03:00
21737d2ce0
issue #347 : update xcode3 template for ttf support
2011-07-29 10:27:49 +08:00
3b60111662
Merge pull request #428 from minggo/iss625
...
fixed #637 : rename derectory name from Resource to Resources
2011-07-27 19:03:06 -07:00
65f3d53aae
fixed #637 : rename derectory name from Resource to Resources
2011-07-28 09:58:44 +08:00
01841b67bb
issue #632 , Modify the template vcproj file.
2011-07-27 14:47:56 +08:00
d905e7d475
fixed #632 . Update the visual studio template for lua supported.
2011-07-27 14:28:22 +08:00
0a8c1cada4
fixed #632 , [win32] Update the visual studio template for lua supported.
2011-07-26 11:15:12 +08:00
dd42936bb3
[android] fixed #610 : remove the support of ndk-r4
2011-07-14 10:37:40 +08:00
87adeb6f92
upgrade xcode3 template
2011-07-08 18:24:58 +08:00
082726f107
Update the win32 template code as same as the HelloLua project.
2011-06-27 17:15:50 +08:00
6649987955
Add Lua support for the win32 new project template.
2011-06-27 16:45:52 +08:00
4b7513a46e
[android] roll back to use dynamic link in tempalte.
2011-06-25 14:13:08 +08:00
70b4d701d3
fixed #538 , xcode template for cocos2d-x lua project
2011-06-24 21:25:51 +08:00
8f4b20391e
Merge pull request #322 from minggo/iss538
...
[Android] modify android template to work on new codes
2011-06-24 03:02:17 -07:00
a02f7c75d9
[Android] modify android template to work on new codes
2011-06-24 17:24:01 +08:00
49b98d2057
Merge remote branch 'origin/master'
2011-06-24 17:00:29 +08:00
5677e74813
[iOS] fixed #538 : add template of lua for xcode3
2011-06-24 15:35:00 +08:00
e39195d996
issue #580 add RootViewController to xcode4 templates, issue #398 fix the duplicate names to cocos2d-x
2011-06-24 12:43:45 +08:00
37e5c21aba
issue #580 add RootViewController to xcode4 templates
2011-06-24 11:38:23 +08:00
a676e0d401
[ios] issue #538 , add xcode4 template for lua project
2011-06-23 17:13:53 +08:00
094b2e7ac0
[ios] add script_support into xcode3 templates
2011-06-23 10:11:09 +08:00
3498a91710
[ios] issue #528 , add script_support into xcode4 template
2011-06-23 10:01:57 +08:00
362ab18c97
issue #398 , xcode4 template for box2d & chipmunk
2011-06-13 20:35:39 +08:00
ac9c735cb5
issue #398 , add template_generator.py & generator shell script, add box2d/chipmunk/cocosdenshion ctemplate
2011-06-13 18:20:57 +08:00
a308196868
issue #398 , cocos2d-x only template for xcode is ok now. hura!
2011-06-13 14:31:25 +08:00
9266be444b
issue #398 , add xcode4 templates, semi-finished.
2011-06-11 16:53:48 +08:00
e7a94c6c00
issue #503 , add chipmunk 5.3.4 new files into xcode3 template
2011-05-21 21:31:45 +08:00
57a14e90c9
Merge pull request #279 from yangws/489
...
fixed #489 For getting full path from relative path, GetCurrentDirectory instead GetModuleName in CCFileUtils_win32.cpp.
2011-05-20 19:24:11 -07:00
2bd72e1793
[android] fixed #501 : remove unneedded
2011-05-20 17:43:29 +08:00
bcfbccc556
[android] fixed #501 : let user input package path
2011-05-20 16:59:19 +08:00
aba77f4cae
issue #489 modified for vs2008.
2011-05-13 14:13:30 +08:00
ec27d588a6
Merge pull request #260 from minggo/iss470
...
[android] fixed #470 : use GAME_ROOT instead of HELLOWORLD_ROOT
2011-05-09 00:32:02 -07:00
687a49b66d
[android] fixed #470 : use GAME_ROOT instead of HELLOWORLD_ROOT
2011-05-09 15:21:08 +08:00
c415bc98d2
fixed #454 Include Box2D.h use Box2D/Box2D.h in vs template.
2011-05-09 10:13:24 +08:00
6c69107f33
fixed #455 : CCUserDefault works ok on iOS
2011-05-06 17:01:41 +08:00
846b529e49
[wophone] fixed #482 , Modify the resource data path for the new WoPhone-SDK.
2011-05-06 10:13:12 +08:00
ccf712a3e3
Merge pull request #247 from yangws/459.
...
fixed #459 template for vs use the Multi-ThreadDLL instead the error setting MT.
2011-05-02 23:39:28 -07:00
f288516b89
fixed #459 template for vs use the Multi-ThreadDLL instead the error setting MT.
2011-05-03 14:28:31 +08:00
8cec640c1a
[airplay] fixed #480 , add template for airplay
2011-05-03 14:06:57 +08:00
07107477f4
[iOS] Modify the template files for XCode.
2011-04-29 16:45:48 +08:00
df00c32d5b
fixed #466 . [wophone] Modify the template and the Makefile.ARM file for wophone.
2011-04-22 11:49:14 +08:00
acb4bb5a16
Merge branch 'master' into iss428
...
Conflicts:
template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj
2011-04-21 14:58:58 +08:00
5d2ac1fc0c
fixed #428 , Use CCArray instead of CCMutableArray as the parameter type of CCNode::m_pChildren.
2011-04-21 14:46:15 +08:00
32342d376a
fixed #460 , make cocos2dx+box2d template can find libxml2, and use libxml2.dylib in ios sdk instead of user/lib/libxml2.dylib
2011-04-19 09:26:41 +08:00
0b7ca9c865
fixed #449 : remove the code that suppots mac platform
2011-04-11 17:04:45 +08:00
09c06d2410
vc2010 project compile ok.
2011-04-07 14:37:19 +08:00
16254a2de1
fixed #440 CCMessageBox works on ios.
2011-03-31 11:08:46 +08:00
c8b0d391cd
fixed #411,Add ZwoptexTest on ios, wophone, android and airplay.Fix the bug in ios templates which generated by merge.
2011-03-30 15:21:18 +08:00
1991a65b0b
Merge branch 'master' into iss391
...
Conflicts:
HelloWorld/ios/HelloWorld.xcodeproj/project.pbxproj
cocos2dx/proj.win32/cocos2d-win32.vcproj
cocos2dx/proj.wophone/Makefile.ARM
cocos2dx/proj.wophone/cocos2d-wophone.vcproj
template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj
template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj
template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj
tests/test.ios/test.xcodeproj/project.pbxproj
2011-03-29 10:20:57 +08:00
e38d3a2277
Merge branch 'master' into iss434
...
Conflicts:
cocos2dx/platform/airplay/CCFileUtils_airplay.h
template/xcode3/cocos2d-x_app/___PROJECTNAME___.xcodeproj/project.pbxproj
template/xcode3/cocos2d-x_box2d_app/___PROJECTNAME___.xcodeproj/project.pbxproj
template/xcode3/cocos2d-x_chipmunk_app/___PROJECTNAME___.xcodeproj/project.pbxproj
2011-03-28 17:06:32 +08:00
2f573a784e
fixed #435 , CocosDenshion crashes at foreground/background switching
2011-03-27 22:17:18 +08:00
71873f3e75
fixed #437 , xcode3 templates doesn't content CCSAXParser.cpp & .h
2011-03-27 21:25:30 +08:00
cee82fe9fa
issue #434,refactor class CCFileUtils on android and ios.
2011-03-26 17:24:37 +08:00
4e1138fa7b
Merge branch 'issue_421' of https://github.com/minggo/cocos2d-x into minggo-issue_421
2011-03-24 15:22:05 +08:00
55143e3b9e
issue #391,implement functions:CCRectFromString, CCPointFromString and CCSizeFromString.
2011-03-24 10:38:08 +08:00
0cdc85ccd5
[android] fixed #421 : create project ok on linux
2011-03-24 09:37:56 +08:00
07736e507f
[android]issue #421:copy c++ files into Classes, copy pictures into Resources
2011-03-23 14:30:14 +08:00
538c5725b0
[android] issue #421 : create project ok on windows
2011-03-23 09:42:23 +08:00
594dab24fc
Merge branch 'iss419' of https://github.com/natural-law/cocos2d-x into natural-law-iss419
2011-03-21 17:29:09 +08:00
09be3e8fe5
[ios]fix #419,Enable the depth test when EAGLView is created.
2011-03-21 17:15:20 +08:00
9854370db3
fixed #410 , recheck the search header paths & libraries paths in xcode3 templates
2011-03-21 12:00:48 +08:00
c4756779f1
[ios] modify the template
2011-03-18 20:47:45 +08:00
ffeb116542
Merge branch 'issue_400' of https://github.com/minggo/cocos2d-x into minggo-issue_400
2011-03-18 16:32:20 +08:00
aba427d384
fixed #400 : change ios template to include CCCamera.cpp
2011-03-18 15:12:24 +08:00
c15c1719ba
fixed #410 , recheck the header search path & library search path in HelloWorld, Tests, and all xcode3 templates
2011-03-18 14:06:04 +08:00
724ac1d0a9
Merge branch 'issue_403' of https://github.com/minggo/cocos2d-x into minggo-issue_403
2011-03-18 10:08:43 +08:00
7c52a521fa
fixed #403 : change UIEvent to CCEvent
2011-03-18 09:39:34 +08:00
12254f95f0
fixed #395 Add initInstance code for all platform in msvc templates.
2011-03-17 11:27:51 +08:00
2802d8efd3
fixed #401 replace ConfigurationName with Cofiguration
2011-03-17 10:03:32 +08:00
4b00e7f0f6
[ios] rename template/ios_mac folder to template/xcode3 folder. Get ready for xcode4 templates
2011-03-15 15:57:36 +08:00
19d8dc6978
Merge branch 'dev' of https://github.com/yangws/cocos2d-x into yangws-dev
2011-03-15 15:44:53 +08:00
42279c5e1d
Rename templates/CCApplicationWizard.vs templates/msvc.
2011-03-15 15:33:18 +08:00
0f4648ee16
[ios] modify ios templates, split the ios-dependance sources from "Classes" folder to "ios" folder.
2011-03-15 15:12:34 +08:00
eef2c04969
[wophone]Test the template for wophone OK.
2011-03-12 10:24:36 +08:00
f35af0366f
replace copy with xcopy in the post event of vs wizard for win32.
2011-03-11 11:12:41 +08:00
9a67fa6df1
Merge branch 'dev' of https://github.com/yangws/cocos2d-x into yangws-dev
2011-03-10 17:16:15 +08:00
3fc701f1d2
fixed #300 Cocos2d-win32 application wizard for vs ok.
2011-03-10 12:00:29 +08:00
06f014604a
[iOS] fixed #388
2011-03-10 11:59:17 +08:00
cb24e03466
Merge branch 'iss377' of https://github.com/natural-law/cocos2d-x into natural-law-iss377
2011-03-10 09:37:26 +08:00
7c6147421b
[wophone]fixed #377,Replace the word "uphone" with "wophone".
2011-03-09 17:28:35 +08:00
fa7f15982f
issue 300 Modify CCAppWiz to adapt 0.8. Add Install wizard scripts for VS2010 VC2010Express VC2008Express.
2011-03-09 15:35:06 +08:00
b54de8a3ef
fixed #360 Modify CCXAppWiz for win32， add initInstance function in class AppDelegate
2011-03-01 14:28:39 +08:00
34a6ca5208
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
...
Conflicts:
cocos2dx/platform/win32/CCXUIImage_win32.cpp
cocos2dx/platform/win32/CCXUIImage_win32.h
tests/test.win32/test.win32.vcproj
2011-01-28 14:33:47 +08:00
e73e291a71
[uphone & win32]Fix the bug of new project wizard.
2011-01-27 15:01:38 +08:00
1a17f3ea55
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
...
Conflicts:
cocos2dx/platform/win32/CCXApplication_win32.cpp
tests/test.win32/test.win32.vcproj
2011-01-22 17:52:06 +08:00
d97c40875e
[win32 & uphone] add COCOS2D_DEBUG=1 into PreprocessorDefinitions of templates in MSVC. ref to this post http://www.cocos2d-x.org/boards/12/topics/392
2011-01-22 15:26:10 +08:00
333f0b5574
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
...
Conflicts:
HelloWorld/AppDelegate.cpp
cocos2dx/particle_nodes/CCParticleSystem.cpp
cocos2dx/proj.win32/cocos2d-win32.vcproj
tests/AppDelegate.cpp
2011-01-20 11:18:35 +08:00
804dc4ef7c
Merge branch 'upto-0.99.5' of https://github.com/cocos2d/cocos2d-x into upto-0.99.5
...
Conflicts:
cocos2dx/platform/CCArchOptimalParticleSystem.h
cocos2dx/platform/win32/CCXBitmapDC.cpp
cocos2dx/proj.win32/cocos2d-win32.vcproj
2011-01-19 15:29:08 +08:00
ec7c24ad8d
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into merge
2011-01-19 10:03:39 +08:00
f992838f96
[uphone]fixed #293,Modify the absolute path method in CCFileUtils.
2011-01-18 18:21:06 +08:00
2e8f3a26f5
Modify template for uphone.
...
make it's helloworldscene code safely.
2011-01-18 15:32:29 +08:00
5829ccd36e
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-01-18 12:00:09 +08:00
a007aa5f84
Modify the template for win32.
...
Make it like the HelloWorld project.
2011-01-18 11:45:22 +08:00
b574a47b9e
[iphone] fixed #302 template for xcode
2011-01-17 17:03:48 +08:00
ad5ee3c9f6
Merge remote branch 'remotes/origin/upto-0.99.5' Fix some conflicts manually.
2011-01-17 16:21:11 +08:00
b5b3930a95
Merge branch 'upto-0.99.5' of https://github.com/minggo/cocos2d-x into minggo-upto-0.99.5
2011-01-15 15:22:31 +08:00
dca425e1b3
[iphone] add project template
2011-01-15 15:15:22 +08:00
acff950860
[uphone]fixed #315,remove the way which use resource in ResourceMap.
2011-01-14 17:42:37 +08:00
aa521489a0
template for vs2008 add CocosDenshion namespace.
2010-12-25 15:44:26 +08:00
4a64f899fe
update label_nodes to 0.99.5.
2010-12-24 17:07:31 +08:00
c4d0a45f3d
add feature header file in CCXAppWiz HelloWorldScene.h
2010-12-11 09:50:46 +08:00
96115bc26e
fixed #233 now don't call preMainLoop when application enter background, test ok on uphone device.
...
fixed a CCXAppWiz.uphone bug, create a empty file named xxxxx_str_str.h when build.
Signed-off-by: yangws <yangws@cocos2d-x.org>
2010-12-03 15:27:55 +08:00
462a8baf33
fixed #225 Create new project from main menu ok.
...
Signed-off-by: yangws <yangws@cocos2d-x.org>
2010-11-26 17:30:34 +08:00
1eb86dc0b9
Wizard Work OK On VS2008 CHS
...
Signed-off-by: yangws <yangws@cocos2d-x.org>
2010-11-26 15:36:44 +08:00
852c57d2c6
add CCLOG support on win32 and uphone
2010-11-23 18:20:46 +08:00
walzer