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

302 Commits

Author SHA1 Message Date
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
minggo 86997d6709 fixed #940: replace icons and background pictures 2012-01-10 16:45:49 +08:00
minggo 98caa29dc2 fixed a typo error and change resource path for linux port when creating linux template 2012-01-04 15:00:14 +08:00
minggo beb57fc486 fixed #919: make script support global variable 2011-12-23 16:00:31 +08:00
minggo afa8e48783 fixed #919: linux template supports global variable 2011-12-23 14:45:41 +08:00
minggo 0f7c8abfc1 Merge pull request #634 from minggo/iss919_script 
issue #919: supporting global variable
 2011-12-20 21:51:20 -08:00
minggo b7fbd4fc13 issue #919: supporting global variable 2011-12-20 16:50:39 +08:00
minggo 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
minggo 80e6c16913 fixed #893: free cached data when receivint memory warning on iOS 2011-12-20 11:35:50 +08:00
minggo 4caa719415 fixed #915: update codes generated by msvc template 2011-12-20 11:07:54 +08:00
YuLei Liao 443656f88c * fix Xcode 4 template, AppController.mm not call AppDelegate:applicationDidEnterBackground() & AppDelegate:applicationWillEnterForeground() 2011-12-06 10:51:12 +08:00
Walzer 21af60ee9c update xcode4 templates 2011-12-01 17:00:30 +08:00
minggo 4607ba8029 support for android 4.0 2011-11-30 15:30:11 +08:00
minggo c99d254c01 issue #850: update box2d for iOS and android 2011-11-29 15:16:16 +08:00
minggo c00d59a568 fixed #838: android template support x86 2011-11-23 16:43:52 +08:00
minggo 522386a6b7 issue #854: pthread work ok on iOS 2011-11-18 09:55:47 +08:00
Walzer b0be69e26e merge HelloLua modifications & updates into xcode4 template for lua. 2011-10-20 15:56:51 +08:00
Walzer c1f67374c4 issue #753, update [windows addSubview:__glView] into box2d/chipmunk/lua xcode4 templates 2011-10-20 15:33:27 +08:00
Walzer e3c39fe835 fixed #753, visual orientation is wrong on ios5 simulator 2011-10-19 21:43:25 +08:00
minggo 8b3ce10ece copy files from HelloWorld/Classes and delete unneeded files 2011-10-18 09:55:56 +08:00
natural-law a8511f0cd3 fixed #747, Rename the resource folder name of win32 template to Resources. 2011-10-13 14:58:36 +08:00
minggo 6d358cfad7 make linux template work ok 2011-09-29 02:14:17 -07:00
minggo 333e08330b make create-linux-android-project.sh works ok 2011-09-29 00:49:49 -07:00
laschweinski 0f7a15b1b3 recommit 
modify eclipse project config
delete libs and use the folder eclipse generated instead.
 2011-09-23 09:56:30 +08:00
minggo c24d1d3fd6 Merge branch 'LinuxPort' of https://github.com/laschweinski/cocos2d-x into linux_port 2011-09-16 13:53:18 +08:00
laschweinski 310e79a491 delete the project configurations in base folder 2011-09-07 12:41:39 +08:00
minggo 13017359c3 fixed #707: add search path for lua template 2011-09-05 17:58:30 +08:00