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

347 Commits

Author SHA1 Message Date
dumganhar de545096de modify bada project setting 2011-09-28 18:21:17 +08:00
minggo fe5eeb70d5 add files from HelloWorld/Classes 2011-09-28 17:31:50 +08:00
minggo dcf803f032 modify proj setting because all cpp files of HelloWorld are moved into Classes 2011-09-28 16:46:53 +08:00
minggo 8c63344c16 merge cocos2d-x master 2011-09-28 15:32:30 +08:00
minggo 3912be7f9d not get value of ok button from xml file 2011-09-28 15:27:31 +08:00
minggo 446bd86fce make HelloWorld and tests runs ok on linux 2011-09-27 22:56:06 -07:00
dumganhar 2c274cb061 delete old 1.2 project 2011-09-28 09:46:40 +08:00
dumganhar 962de59a8c add Target-Debug and Target-Release folder 2011-09-28 09:45:35 +08:00
dumganhar c44998d89a add helloworld sdk1.2 project 2011-09-28 09:43:52 +08:00
dumganhar 260c2fc920 move old 1.2 project to sdk1.2 folder 
add sdk2.0 project
 2011-09-28 09:36:18 +08:00
dumganhar c3cbeaefc6 add lib empty folder 2011-09-27 17:22:59 +08:00
minggo d4283b1f11 Merge branch 'linux_port' 2011-09-27 17:01:51 +08:00
minggo f3a85ae3cb remove unneeded folder 2011-09-27 17:01:12 +08:00
minggo 6e08502e9d fixed #736: remove android:installLocation in AndroidManifest.xml 2011-09-27 16:56:45 +08:00
minggo 13e17ab80e make tests build ok on linux android 2011-09-27 01:51:29 -07:00
minggo c7f75fc570 make box2d build ok on linux 2011-09-26 23:30:40 -07:00
minggo 4f7e349c0a set HelloWorld dependence and make it run ok on android emulator 2011-09-26 22:38:59 -07:00
dumganhar 5b28b0ac83 modify helloworld project setting for bada 2011-09-26 17:52:09 +08:00
dumganhar 5cd671651a add helloworld lib folder for bada 2011-09-26 17:48:36 +08: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
zhangxiaoming 1cac9520cc make HelloWorld & tests build needed libraries, not use prebuilt libraries of cocos2d and cocosdenshion 2011-09-21 02:27:42 -07:00
dumganhar eb9b3e3787 modify makefile 2011-09-20 18:13:24 +08:00
dumganhar eeb0956fb8 add linux makefiles 2011-09-20 14:38:12 +08:00
dumganhar c93be8b828 modify <cstdio> to <stdio.h> 
delete old project files
 2011-09-20 12:39:44 +08:00
dumganhar eb32cf9fe2 modify some files of bada project 2011-09-20 02:19:26 +08:00
dumganhar ca2027fbad modify bada project 2011-09-19 23:35:46 +08:00
dumganhar edb2cbbad6 modify bada project files 2011-09-19 18:17:19 +08:00
minggo 5ff9bd0c9e remame BitMapTotalHeight to bitmapTotalHeight 2011-09-19 18:15:47 +08:00
dumganhar 0e7fc78e4e commit some files of bada project 2011-09-19 18:05:40 +08:00
dumganhar c94adc58b9 changed bada projects directory, add bada macro 2011-09-19 17:53:45 +08:00
seanlin 6d8225b7bd fixed #724, different results of CCLabelTTF on android & win32 2011-09-19 16:47:39 +08:00
dumganhar 3c795073e0 Merge branch 'master' into bada 
Conflicts:
	HelloWorld/iphone/HelloWorld.xcodeproj/project.pbxproj
	cocos2dx/CCamera.cpp
	cocos2dx/cocoa/NSData.cpp
	cocos2dx/label_nodes/CCBitmapFontAtlas.cpp
	cocos2dx/platform/CCFileUtils_platform.h
	cocos2dx/platform/CCXApplication_platform.h
	cocos2dx/platform/CCXCocos2dDefine_platform.h
	cocos2dx/platform/CCXEGLView_platform.h
	cocos2dx/platform/CCXMath.h
	cocos2dx/platform/CCXUIAccelerometer_platform.h
	cocos2dx/platform/CCXUIImage_platform.h
	cocos2dx/platform/ccxCommon_platform.h
	cocos2dx/platform/config_platform.h
	cocos2dx/platform/platform.h
	cocos2dx/support/base64.cpp
	cocos2dx/tileMap_parallax_nodes/CCTMXXMLParser.cpp
	tests/AppDelegate.cpp
	tests/test.iphone/test.iphone.xcodeproj/project.pbxproj
 2011-09-19 13:42:08 +08:00
dumganhar eadaba8930 modify CCRect::CCRectMake to CCRectMake in CCTMXLayer.cpp 
modify HelloWorld project setting, use relative path
remove lib/linux/Debug/*.so and lib/linux/Release/*.so
remove some temp files
 2011-09-19 10:51:05 +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
minggo 194f47bc54 fixed #718: get button value from string.xml & add copyright for java codes 2011-09-15 14:17:07 +08:00
Macarse 208bce312e Replaced LinearLayout with FrameLayout 2011-09-13 20:25:07 -03:00
Macarse afd1a7a6d9 External storage 2011-09-13 05:42:34 -03:00
laschweinski 8f5c327937 add all eclipse project files to the corresponding directory 2011-09-07 12:44:03 +08:00
laschweinski 310e79a491 delete the project configurations in base folder 2011-09-07 12:41:39 +08:00
laschweinski 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
Augusto Souza 28b1f317f4 Revert "First version of unloadBackgroundMusic for android - Feature #687" 
This reverts commit a157b775f8.
 2011-08-30 09:30:12 -03:00
laschweinski ffcbf4772f helloworld debug release makefiles 2011-08-28 17:06:05 +08:00
laschweinski c977f3e07c commit debug and release makefile 2011-08-28 16:44:20 +08:00
laschweinski 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
Augusto Souza a157b775f8 First version of unloadBackgroundMusic for android - Feature #687 2011-08-28 01:02:12 -03:00
Augusto Souza 32f8060c49 Prevent null point exception in preloadBackgroundMusic 2011-08-28 00:59:51 -03:00
Augusto Souza 3a0c2cb4fb First version of a preloadBackgroundMusic for Android - Feature #687 2011-08-27 23:24:52 -03:00
laschweinski 0958b2aaf6 new file: HelloWorld/Classes/AppDelegate.cpp 
new file:   HelloWorld/Classes/AppDelegate.h
	new file:   HelloWorld/Classes/HelloWorldScene.cpp
	new file:   HelloWorld/Classes/HelloWorldScene.h
	new file:   HelloWorld/postCompiled.sh
 2011-08-25 19:11:06 +08:00
laschweinski a8f6f18705 new file: HelloWorld/.cproject 
new file:   HelloWorld/.project
	HelloWorld/Classes/
	HelloWorld/android/assets
	HelloWorld/postCompiled.sh
	cocos2dx/platform/third_party/linux/
	installLinuxLib.sh
 2011-08-25 19:06:42 +08:00
laschweinski 606c8803bc modified: CocosDenshion/Linux/FmodAudioPlayer.cpp 
modified:   CocosDenshion/Linux/FmodAudioPlayer.h
	deleted:    HelloWorld/AppDelegate.cpp
	deleted:    HelloWorld/AppDelegate.h
	deleted:    HelloWorld/HelloWorldScene.cpp
	deleted:    HelloWorld/HelloWorldScene.h
	modified:   cocos2dx/.cproject
	modified:   cocos2dx/actions/CCActionInstant.cpp
	modified:   cocos2dx/include/CCActionInstant.h
	modified:   lib/android/Debug/libcocos2d.so
	modified:   lib/android/Release/libcocos2d.so
	modified:   lib/linux/Debug/libcocos2d.so
	modified:   lib/linux/Debug/libcocosdenshion.so
	modified:   lib/linux/Release/libcocos2d.so
	modified:   lib/linux/Release/libcocosdenshion.so
	HelloWorld/AndroidDebug/
	HelloWorld/AndroidRelease/
	HelloWorld/Classes/
	HelloWorld/android/assets
	HelloWorld/postCompiled.sh
	cocos2dx/platform/third_party/linux/
	installLinuxLib.sh
	tests/Res/gui_close.WAV
 2011-08-25 19:04:29 +08:00
root 11679d9723 Merge branch 'master' into LinuxPort 2011-08-23 11:49:46 +08:00
minggo ae21fcaf48 [android] fixed #670: pause & resume effect when app enter background & foreground 2011-08-22 16:58:54 +08:00
laschweinski ff5222fff8 some files missiong(eclipse with git is too hard to play) 2011-08-21 19:00:26 +08:00
laschweinski 60e794fcc8 add files include test and cocosDenshion 2011-08-19 14:43:19 +08:00
laschweinski dbf3a94200 modified: HelloWorld/HelloWorldScene.cpp 
modified:   tests/AppDelegate.cpp
	HelloWorld/Linux/
	cocos2dx/.settings/
	cocos2dx/platform/Linux/
	tests/test.linux/
 2011-08-17 18:09:51 +08:00
laschweinski 5d20ebe24b modified: HelloWorld/AppDelegate.cpp 
modified:   HelloWorld/HelloWorldScene.cpp
	modified:   cocos2dx/cocoa/CCNS.cpp
	modified:   cocos2dx/include/CCActionInstant.h
	modified:   cocos2dx/misc_nodes/CCRenderTexture.cpp
	modified:   cocos2dx/particle_nodes/CCParticleSystemQuad.cpp
	modified:   cocos2dx/platform/CCAccelerometer_platform.h
	modified:   cocos2dx/platform/CCApplication_platform.h
	modified:   cocos2dx/platform/CCArchOptimalParticleSystem.h
	modified:   cocos2dx/platform/CCCommon.cpp
	modified:   cocos2dx/platform/CCEGLView_platform.h
	modified:   cocos2dx/platform/CCGL.cpp
	modified:   cocos2dx/platform/CCGL.h
	modified:   cocos2dx/platform/CCImage.cpp
	modified:   cocos2dx/platform/CCPlatformConfig.h
	modified:   cocos2dx/platform/CCPlatformMacros.h
	modified:   cocos2dx/platform/CCSAXParser.h
	modified:   cocos2dx/platform/CCStdC.h
	modified:   cocos2dx/support/CCUserDefault.cpp
	modified:   cocos2dx/support/data_support/ccCArray.h
	modified:   tests/AppDelegate.cpp
	deleted:    tests/Res/music.mid
	modified:   tests/tests/controller.cpp
	modified:   tests/tests/tests.h
	HelloWorld/Linux/
	cocos2dx/.settings/
	cocos2dx/platform/Linux/
	tests/test.linux/
 2011-08-17 11:36:54 +08:00
Walzer 286f92fc43 fix at smoke test, add arch=i386 into HelloWorld.xcodeproj, otherwise the proj cannot run in xcode4 + simulator 2011-08-17 11:09:12 +08:00
minggo d386116255 [iOS]fixed #667: call AppDelegate::applicationDidEnterBackground() & AppDeleaget::applicationWillEnterForeground() when application enter background & enter foreground 2011-08-10 10:24:06 +08:00
minggo ada4c2af80 [android] fixed #643: swap axes according to the orientation 2011-08-09 15:50:42 +08:00
minggo 76da5f2e84 fixed #656: remove unneeded methods & android can let user set resource path 2011-08-04 17:19:58 +08:00
minggo 7fc0dae3d9 [android] fixed #655: fix a bug that CCLabelTTF lost the last characters 2011-08-04 12:08:12 +08:00
minggo a3b4043755 issue #347: add tests for FontTest & it works ok on android 2011-07-29 15:57:27 +08:00
minggo 21737d2ce0 issue #347: update xcode3 template for ttf support 2011-07-29 10:27:49 +08:00
minggo cfb3765035 issue #347: iOS support font defined by ttf file 2011-07-29 10:15:10 +08:00
minggo 50038b7cc2 Merge https://github.com/cocos2d/cocos2d-x into iss347 2011-07-28 18:06:20 +08:00
minggo 648117ebb5 issue #347: android can use ttf file 2011-07-28 17:20:37 +08:00
natural-law a7404dc2bf fixed #639, Initialize the m_tPosition of CCParticleSystem with the setter. 2011-07-28 16:16:51 +08:00
minggo 1bb9e8139a issue 33: iOS & Android support looping playing effect 2011-07-26 15:52:41 +08:00
minggo b308effdc5 [android] fixed #631: Send \n to engine when user input nothing 2011-07-26 11:41:28 +08:00
minggo 13a1629299 fixed #624: insert white space in front of \n 2011-07-22 12:10:41 +08:00
minggo 640d811809 [android] fixed #618: invoke java code(System.exit()) to finish programe 2011-07-19 16:01:22 +08:00
minggo dd42936bb3 [android] fixed #610: remove the support of ndk-r4 2011-07-14 10:37:40 +08:00
minggo fb436a6339 [Android] break string & wrap word 2011-07-11 15:02:41 +08:00
Max Aksenov fd04420c9b [airplay] fix - if you do not use this "MemFlags0 = USE_STACK_ALLOCATOR" then it solves the problems related to incorrect memory allocation ... I tested it on Marmalade Mac Simulator and IPad device. Not tested on Maramlade Windows Simulator.... 2011-07-09 13:04:29 -07:00
Walzer 80c819d8b6 Merge remote branch 'origin/master' 2011-07-04 16:25:29 +08:00
Walzer d325f1991e [ios] 1. debug builds can run on device (add “Valid Architectures") 2. add correct header search paths for HelloLua release build 2011-07-04 16:25:11 +08:00
natural-law 7d7f3a9241 fixed #562, Upgrade folder sprite_nodes to rc3. 2011-07-01 16:11:31 +08:00
minggo 25b3b15151 Merge pull request #339 from minggo/iss549 
[Android] fixed #549: Add comments for playEffect()
 2011-06-30 18:28:08 -07:00
minggo 67b85322ed [Android] fixed #549: Add comments for playEffect() 2011-07-01 09:24:40 +08:00
minggo 12f816687d Merge pull request #336 from liswei/master 
update wophone setup project (such as helloworld,tests)
 2011-06-29 20:08:01 -07:00
liswei 39fb944297 update wophone setup project (such as helloworld,tests) 2011-06-30 09:36:51 +08:00
minggo 6c47f53b13 [Android] fixed #547: line wrap OK on Android 2011-06-29 15:45:30 +08:00
minggo e8853583df Merge pull request #329 from minggo/master 
Fix some bug
 2011-06-27 18:23:26 -07:00
yangws 3b6265aa58 Compile ok on vs2010 2011-06-27 17:02:58 +08:00
minggo 5e15545dbd [Android] fix an error when string is 2011-06-27 16:01:25 +08:00
natural-law 72f17ecbdf fixed #542, Record the volume user specified though the background music is not playing. 2011-06-27 11:43:27 +08:00
Walzer 688131c958 [android] in main.cpp, change view->create(320,480) to (480,320) to fit the lastest modification, in both HelloWorld, HelloLua, Tests 2011-06-25 12:11:40 +08:00
Walzer 00568c229a [android] back to shared library link 2011-06-25 11:21:16 +08:00
minggo a02f7c75d9 [Android] modify android template to work on new codes 2011-06-24 17:24:01 +08:00
minggo e8fda66ccc Merge https://github.com/cocos2d/cocos2d-x 2011-06-24 13:55:52 +08:00
minggo 8440d6a267 [android] fixed #364: show string correct & line break ok 2011-06-24 13:55:00 +08:00
Walzer 8f770ec929 issue #540 for HelloWorld/ios, split main.m, add pause/resume/startAnimation/stopAnimation controls 2011-06-24 11:22:11 +08:00
minggo 10cdd7f798 [android] fixed #364: line break ok on Android 2011-06-23 14:44:20 +08:00
minggo 71c13b34bf Merge https://github.com/cocos2d/cocos2d-x into iss535 2011-06-22 17:00:11 +08:00
minggo 1122a7c7d0 [android] use Android widget Bitmap other than skia to drawstring 2011-06-22 16:58:50 +08:00
yangws 01f277674e Add icon for Helloworld and tests on Android. 2011-06-22 13:59:31 +08:00
yangws 4d8596169e Sync java code in Helloworld and tests. 2011-06-22 11:37:42 +08:00
minggo 4f7db6b134 fixed #528: modify HelloWorld to works ok 2011-06-22 10:18:51 +08:00
Walzer 175e9394bc Merge https://github.com/minggo/cocos2d-x into lua 2011-06-21 15:22:00 +08:00
minggo 022e2b9998 issue #528: refactor ok on win32 2011-06-20 17:31:38 +08:00