Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,709 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

259 Commits

Author SHA1 Message Date
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