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

2643 Commits

Author SHA1 Message Date
minggo 6c6793c3cd Merge pull request #501 from minggo/master 
change CC_DIRECTOR_FPS_INTERVAL to 0.5, it is more reliable
 2011-09-05 19:58:25 -07:00
minggo e69d16e7d6 change CC_DIRECTOR_FPS_INTERVAL to 0.5, it is more reliable 2011-09-06 10:52:37 +08:00
RongHong 63bded4082 Merge branch 'master' into renderendcrash 2011-09-06 09:53:07 +08:00
RongHong 624e27497a fixed #696 Some android machines may crash at CCRenderTexture::end(bool bIsTOCasheTexture) 2011-09-06 09:51:35 +08:00
minggo 6bc5aab41b Merge pull request #499 from minggo/iss707 
make require works ok on android
 2011-09-05 18:42:04 -07:00
minggo a739dcbd6c fixed #707: add Cocos2dxLuaLoader.cpp & Cocos2dxLuaLoader.h into vs2010 project 2011-09-05 18:11:10 +08:00
minggo 13017359c3 fixed #707: add search path for lua template 2011-09-05 17:58:30 +08:00
minggo edb86b1154 issue #707: require works ok on iOS 2011-09-05 17:42:08 +08:00
minggo d6cc12ffe4 issue #707: require works ok on android 2011-09-05 17:13:52 +08:00
minggo 86536c3683 issue #707: add lua loader on android 2011-09-05 16:14:51 +08:00
minggo d86ce612c0 issue #707: add lua loader on android 2011-09-05 16:11:48 +08:00
laschweinski 91f8ed7eb4 CCParticleSystemPoint now derive from CCParticleSystemQuade in linux 2011-09-05 11:57:10 +08:00
laschweinski 717698bf65 fix some compiling mistake 2011-09-05 10:12:14 +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
minggo 018036eb28 Merge pull request #498 from minggo/iss703 
fixed #703: refactor Accelerometer
 2011-08-31 18:30:22 -07:00
minggo f61fde764b fixed #703: refactor Accelerometer 2011-08-31 17:14:29 +08:00
Walzer 6347f878c2 fixed #662, SimpleAudioEngine::playEffect() assertion bug on marmalade 2011-08-31 16:35:40 +08:00
Walzer a68fb803a0 Merge pull request #497 from walzer/master 
add more languages to CCApplication::getCurrentLanguage() method
 2011-08-30 23:21:38 -07:00
Walzer 1402350870 fixed #676, add more languages into CCApplication::getCurrentLanguage(). Android & iPhone port is done, other platforms no yet. 2011-08-31 14:20:33 +08:00
minggo ec7040f4b0 Merge pull request #496 from minggo/iss704 
fixed #704
 2011-08-30 20:56:49 -07:00
minggo d42336df56 remove functions of AccelerometerKeep & AccelerometerDestroy declation 2011-08-31 11:34:45 +08:00
Walzer cdd5911a36 Merge commit '8790401042a21da46aefa13a4461104673ba7d96' 2011-08-31 11:25:56 +08:00
minggo e92bce5590 print error message & pop error code 2011-08-31 11:25:49 +08:00
minggo 8790401042 Merge pull request #491 from Menki/master 
Feature #687 - add preloadBackgroundMusic and unloadBackgroundMusic to Android
 2011-08-30 19:01:41 -07: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
minggo 444a31b17b Merge pull request #495 from liswei/issue702 
fixed #702 tests crashs at the start on wophone device
 2011-08-30 01:51:08 -07:00
liswei dd90e8ce86 issue #702 add invalid point judgement 2011-08-30 16:40:57 +08:00
liswei c8619240c4 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into issue702 2011-08-30 16:39:13 +08:00
liswei ab2a6cb2bb fixed #702 tests crashs at the start on wophone device 2011-08-30 15:59:06 +08:00
Walzer 81c230e5de Merge pull request #494 from walzer/master 
fix a typo in CC_SWAP32 marco, change CCZHeader.version from unsigned char to unsigned short
 2011-08-30 00:33:48 -07:00
Walzer 554e3fda52 fixed #701, CCZHeader.version should be an unsigned short, instead of unsigned char. Keep the same to cocos2d-iphone 2011-08-30 15:26:17 +08:00
Walzer 9f1e26f8a0 fixed #700, a stupid typo in CC_SWAP32 marco 2011-08-30 15:20:41 +08:00
Walzer c050670e0c Merge branch 'master' of https://github.com/cocos2d/cocos2d-x (reverse-merged from commit e0a186fce09031664650892555c29f1e2e2201bb) 
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x (reverse-merged from commit e0a186fce09031664650892555c29f1e2e2201bb)
 2011-08-30 14:50:02 +08:00
minggo ab470ad76d Merge pull request #493 from minggo/iss675 
issue 675
 2011-08-29 22:52:21 -07:00
minggo 0cfbf4344a fix a compiling error on wophone 2011-08-30 10:54:32 +08:00
minggo 414791a684 issue #675: initialize acceleration_ 2011-08-30 10:34:29 +08:00
minggo 92f741aa73 issue #675: remove unneeded header file 2011-08-30 09:49:55 +08:00
minggo fe50587841 issue #675: revert test code 2011-08-30 09:47:55 +08:00
minggo c7fd375539 issue #675: make wophone support only one accelerometer delegate 2011-08-30 09:45:11 +08:00
minggo b38105a70b issue 675: dispatch accelerometer data to one delegate 2011-08-29 18:18:39 +08:00
minggo 762360650b Merge pull request #492 from minggo/iss698 
fixed #698:Not invoke init() in the construction of CCSprite
 2011-08-28 20:27:17 -07:00
minggo a411f4877c fixed #698:Not invoke init() in the construction of CCSprite 2011-08-29 11:00:31 +08:00
laschweinski b0660dd578 update eclipse project file 2011-08-29 10:28:00 +08:00
laschweinski f86cba983f test debug and release 2011-08-28 17:09:40 +08:00
laschweinski ffcbf4772f helloworld debug release makefiles 2011-08-28 17:06:05 +08:00
laschweinski a362d3131c update debug and release makefiles again 2011-08-28 16:58:10 +08:00
laschweinski c977f3e07c commit debug and release makefile 2011-08-28 16:44:20 +08:00
laschweinski e64bfd6c68 commit subdir.mk 
delete all obsolete *.d and *.o files
 2011-08-28 15:43:50 +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
laschweinski 71c442b79c chipmunk/CMakeCache.txt 
chipmunk/CMakeFiles/
	chipmunk/CMakeLists.txt
	chipmunk/Makefile
	chipmunk/cmake_install.cmake
	chipmunk/src/CMakeFiles/
	chipmunk/src/Makefile
	chipmunk/src/cmake_install.cmake
	cocos2dx/platform/third_party/linux/curl/
	cocos2dx/platform/third_party/linux/libraries/libcurl.a
 2011-08-28 14:28:24 +08:00