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

1808 Commits

Author SHA1 Message Date
minggo 266f0ee7ab Merge pull request #586 from leon-li/master 
Fix some minor bugs.
 2011-11-28 18:27:38 -08:00
Leon f108952595 Merge remote branch 'upstream/master' 
Conflicts:
	cocos2dx/support/CCPointExtension.cpp
 2011-11-29 10:15:15 +08:00
dumganhar d108f4f456 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_base 2011-11-28 23:13:02 +08:00
dumganhar 3442d17dbe fixed #880: implement preLoadBackgroundMusic on bada, fix the bug that playEffect repeatly can't work. Modify CC_ASSERT macro define. 2011-11-28 18:05:38 +08:00
minggo f0d22ae504 issue #879: replase assert with CCAssert 2011-11-28 17:28:43 +08:00
dumganhar 112ec42670 fixed #854: support bada pthread and semaphore 2011-11-28 16:07:17 +08:00
dumganhar cad4ff05f3 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_base 
Conflicts:
	cocos2dx/textures/CCTextureCache.cpp
 2011-11-28 15:43:13 +08:00
dumganhar 31ea76c16a remove COCOS2D_DEBUG=1 in helloworld and cocos2dx project 2011-11-28 14:33:29 +08:00
dumganhar 20455bf164 fix a bug that when selecting "target-release" in building configurations, CCFileUtils::getFileData can't work correctly because CC_ASSERT is called uncorrectly. 2011-11-28 14:27:48 +08:00
minggo 8fd6a7298f issue #854: fix warning 2011-11-28 10:12:31 +08:00
Leon 6f99f7efde 1. fix multi touch index. 
2. swap.
3. create gl view.
 2011-11-26 22:37:36 +08:00
Walzer ab7db20809 Fix a typo, CCSprite::get/setHornorParnetTransform to get/setHonorParnetTransform 2011-11-26 17:20:12 +08:00
Walzer 8edbbd56a9 Fix a typo here. Two values are not swapped correctly, max_inclusive is still equal to itself. 2011-11-26 17:07:36 +08:00
minggo 842c64486e issue #854: remove unneeded code 2011-11-25 16:16:37 +08:00
minggo 77b830b36b issue #854: use semaphore instead of condition because the condition may lose message 2011-11-25 16:14:06 +08:00
dumganhar 331dac34de Merge branch 'master' into master_base 
Conflicts:
	cocos2dx/include/CCDirector.h
 2011-11-25 11:06:20 +08:00
dumganhar d94effbcfa Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-11-25 10:56:44 +08:00
minggo 7e61ce7d67 issue #781: add audio functions on linux 2011-11-25 10:48:05 +08:00
minggo 837e5048d2 Merge https://github.com/cocos2d/cocos2d-x into iss781_cocosdenshion 2011-11-25 10:19:29 +08:00
minggo c034f84b2d fixed #760: implement functions in .cpp 2011-11-25 10:17:32 +08:00
minggo 101f076a44 fixed #760: implement functions in .cpp 2011-11-25 10:13:59 +08:00
minggo f5bbad5833 issue #854: implement CCImage::initWithImageFileThreadSafe for iOS 2011-11-25 10:09:29 +08:00
dumganhar 79e204abad add semaphore support on bada 2011-11-25 10:06:26 +08:00
dumganhar c138d7e258 update CCAccelerometer on bada platform 2011-11-24 18:04:25 +08:00
dumganhar e87b00db67 add pthread support for bada 1.0 2011-11-24 17:26:04 +08:00
dumganhar aeb56495a6 add user truetype font support, fix a bug in CCTextureCache.cpp 2011-11-24 15:15:23 +08:00
dumganhar 07da67f253 Merge branch 'master' into master_base 
Conflicts:
	cocos2dx/menu_nodes/CCMenu.cpp
 2011-11-24 11:52:16 +08:00
dumganhar 4612e6e1d6 update pthread.cpp 2011-11-24 11:37:59 +08:00
dumganhar 42775d4ec5 update pthread implement 2011-11-24 10:58:09 +08:00
dumganhar 2bd49545fa add bada1.0 pthread support 2011-11-24 00:07:50 +08:00
dumganhar cfa42fa8a1 Merge branch 'newest' into master_base 2011-11-23 21:47:21 +08:00
dumganhar 035d7326db Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-11-23 21:43:40 +08:00
dumganhar 15e3a6b1cf update CCFileUtils_bada.cpp and CCImage_bada.cpp 2011-11-23 18:40:36 +08:00
minggo c3a034a19b fixed #760: add functions to get/add m_pNotificationNode 2011-11-23 17:18:53 +08:00
minggo 6aedc258b4 fixed #838: tests and HelloLua support x86 2011-11-23 15:51:30 +08:00
minggo 8b20639d75 issue #838: HelloWorld support x86 2011-11-23 11:02:18 +08:00
minggo bc60ed7856 issue #854: optimize CCTextureCache::addImageAsync() 2011-11-22 16:47:24 +08:00
minggo efa9275d7f save the codes for testing 2011-11-21 12:04:21 +08:00
minggo 51eb56075b Merge https://github.com/cocos2d/cocos2d-x into iss854_pthread 2011-11-21 09:36:55 +08:00
minggo 4226fcf355 issue #854: add CCThread_ios.mm 2011-11-21 09:34:49 +08:00
minggo d48da20b0f synchrolize to master 2011-11-18 18:53:53 +08:00
U-zhangxm-PC\zhangxm d84b6c25be issue #223: merge bada branch and fix some error 2011-11-18 18:45:05 +08:00
minggo 50a2e2d5e9 Merge pull request #574 from minggo/iss854_pthread 
remove unneeded files
 2011-11-17 18:59:03 -08:00
minggo 5d8043ce7e issue854: remove unneeded files 2011-11-18 10:54:36 +08:00
minggo a7d6c90adb Merge pull request #571 from jbyu/master 
fix memory-leak for lua engine
 2011-11-17 18:53:14 -08:00
minggo 522386a6b7 issue #854: pthread work ok on iOS 2011-11-18 09:55:47 +08:00
minggo 81b8fc0ce8 fixed #854: fix a bug of CCTextureCache 2011-11-17 14:34:41 +08:00
minggo cb75465913 issue #854: add test case for CCTextureCache 2011-11-17 10:10:13 +08:00
Phenix Yu dccf577ad3 getLastValidIterator() may return a invalid iterator m_array.end(). 
don't know where this code came from.
 2011-11-16 11:08:26 +08:00
minggo cc79e533a3 issue #854: add pthread for win32 and implement CCTextureCache::addImageAsync() 2011-11-16 11:04:29 +08:00
Phenix Yu 786feb6a8d Merge remote-tracking branch 'remotes/upstream/master' 
Conflicts:
	HelloLua/Classes/AppDelegate.cpp
	HelloLua/Resource/hello.lua
	HelloLua/ios/HelloLua.xcodeproj/project.pbxproj
	HelloLua/win32/HelloLua.win32.vcproj
	HelloLua/win32/HelloLua.win32.vcxproj.filters
	cocos2dx/include/ccMacros.h
	cocos2dx/platform/ios/AccelerometerDelegateWrapper.mm
	lua/cocos2dx_support/LuaCocos2d.cpp
	lua/cocos2dx_support/LuaEngineImpl.cpp
	template/xcode3/cocos2d-x_lua_app/___PROJECTNAME___.xcodeproj/project.pbxproj
	template/xcode4/cocos2dx_lua.xctemplate/Resources/hello.lua
	template/xcode4/cocos2dx_lua.xctemplate/TemplateInfo.plist
	tests/test.win32/test.win32.vcxproj.filters
 2011-11-15 14:43:55 +08:00
Phenix Yu 441f8e6da9 Merge branch 'master' of https://github.com/jbyu/cocos2d-x 
Conflicts:
	cocos2dx/CCScheduler.cpp
	lua/cocos2dx_support/LuaEngine.cpp
	lua/cocos2dx_support/LuaEngine.h
 2011-11-15 14:00:52 +08:00
minggo 5273819e83 offer a thread safe function to read contents of xml file, and the engine use it internal 2011-11-15 10:41:18 +08:00
dumganhar 0fa48e2cfb Update cocos2dx/platform/CCPlatformMacros.h 2011-11-14 11:35:04 +08:00
dumganhar 7cb27a76ae modify accelerometer and Platform Functions 2011-11-13 22:45:41 +08:00
dumganhar d346fa8650 close debug draw 2011-11-13 01:22:05 +08:00
dumganhar d8de253542 add messagebox support 2011-11-13 01:13:25 +08:00
dumganhar 5704fdc146 Merge branch 'testMP_static_lib' into newest 2011-11-13 01:05:22 +08:00
dumganhar 25ab866557 when CCTextureAtlas::resizeCapacity, should 
glDeleteBuffers(2, m_pBuffersVBO);
// initial binding
glGenBuffers(2, &m_pBuffersVBO[0]);
otherwise, CCSpriteBatchNode will have a bug the can't draw more than one sprite on bada 2.0 device.
 2011-11-13 00:57:05 +08:00
dumganhar ea3b57ea2c modify multi touch support 2011-11-13 00:54:44 +08:00
dumganhar 8fd2917888 fixed a bug that Accelerometer value error if use HVGA resource in WVGA device 2011-11-13 00:54:05 +08:00
dumganhar 2abe0c0d32 CCAssert will show system messagebox, this easy for debuging code. 2011-11-10 16:49:05 +08:00
dumganhar 4e924986a2 add static lib project 2011-11-10 16:47:17 +08:00
dumganhar ca3b91855a debug issue #852 2011-11-10 16:44:58 +08:00
Walzer dcb4f14a5b According to this thread, http://www.cocos2d-x.org/boards/6/topics/5075?r=5177, we must prevent yOffset to become a negative value. I use the laziest approach. 2011-11-09 22:11:36 +08:00
dumganhar 33db1c7951 use unix text format 2011-11-08 18:11:43 +08:00
dumganhar a81b078286 fixed a bug in calloc(0) return NULL. 2011-11-08 15:59:51 +08:00
dumganhar 920b41271d add TextInput support 2011-11-08 15:59:04 +08:00
dumganhar 0d6ea61b76 fixed some bug:1.setDeviceOrientation, chipmunkDemo glOrthof 2011-11-07 18:18:10 +08:00
dumganhar 7d2a26ec10 comment some applog 2011-11-07 00:28:09 +08:00
dumganhar 16fba505b6 add multitouch support 2011-11-05 11:36:27 +08:00
dumganhar 2998726364 revert language 2011-11-02 01:23:07 +08:00
dumganhar 240aa4c077 add russian language support 2011-11-01 23:32:26 +08:00
dumganhar cf3cecc108 revert to normal version 2011-11-01 23:02:26 +08:00
dumganhar cff6437b76 revert to normal ccLanguageType 2011-11-01 17:12:39 +08:00
Leon 785b79d263 fix compile errors under ubuntu 11.10 2011-10-31 23:50:08 -07:00
dumganhar f43530c010 Merge branch 'test' of https://github.com/dumganhar/cocos2d-x into bada 
Conflicts:
	CocosDenshion/proj.bada/sdk1.0/.cproject
	CocosDenshion/proj.bada/sdk2.0/.cproject
	cocos2dx/platform/bada/CCApplication_bada.cpp
 2011-10-31 09:34:40 +08:00
dumganhar 853126036d add ogg source for cocosDenshion project 2011-10-29 15:38:15 +08:00
dumganhar fd90641c49 merge testf branch 2011-10-29 14:47:13 +08:00
Leon b7f0385a2b bundle 64 bit linux static libs 2011-10-28 12:19:26 +08:00
Leon 1b42b1d801 Merge remote branch 'upstream/master' 2011-10-28 11:37:02 +08:00
minggo 2c14402107 fixed #776: merge pull request and remove unneeded codes 2011-10-28 09:46:19 +08:00
dumganhar d061e8323d modify project configure 2011-10-27 19:22:14 +08:00
dumganhar 5db8a24389 fixed one issue in cocosdenshion 2011-10-26 18:38:27 +08:00
dumganhar dd73456576 Merge branch 'bada' into f 2011-10-25 17:40:20 +08:00
dumganhar 146d3e1536 modify project config 2011-10-24 14:22:09 +08:00
dumganhar 3aef823bd5 rename sdk1.2 to sdk1.0 2011-10-24 11:00:11 +08:00
laschweinski e53649ccaa add a member function to get key string of a texture. 2011-10-22 19:39:31 +08:00
laschweinski 5589335d3a Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into linux_port1 2011-10-22 19:27:35 +08:00
laschweinski 04633242ba fix a bug in audio player 2011-10-22 19:10:50 +08:00
dumganhar eb901be664 project config change 2011-10-21 09:49:57 +08:00
dumganhar da794c1613 Merge branch 'master' into bada 2011-10-21 09:28:29 +08:00
Leon 5c4a3c3fda Merge remote branch 'upstream/master' 2011-10-20 18:34:10 +08:00
dumganhar fdbb989ce5 make sdk1.2 to sdk1.0 2011-10-20 18:31:10 +08:00
Walzer 67bbbb2800 1. relative to bug #754, FontTest should use "fonts/abc.ttf" as external ttf name 
2. fixed a tiny bug, FontTest can show font name on the top correctly
 2011-10-20 14:56:39 +08:00
dumganhar 6451d8b6bf use ceil to compute viewport 2011-10-20 13:44:21 +08:00
Leon 70a4942ea6 fix some warning 2011-10-19 15:24:19 +08:00
Leon 77b3a32e16 fix compile error on 64 bit Linux 2011-10-19 15:12:38 +08:00
Walzer ae411f9503 fix some warnings detected by xcode4.2, fix a stupid typo in RayCasts.h 2011-10-18 17:41:19 +08:00
dumganhar 3c4c4e515a modify project settings 2011-10-18 11:11:09 +08:00
dumganhar 6af6257fa9 Merge branch 'testf1016' of github.com:dumganhar/cocos2d-x into FishGameBada 
Conflicts:
	CocosDenshion/bada/CCAudioOut.cpp
	CocosDenshion/bada/CCAudioOut.h
 2011-10-17 13:45:16 +08:00
dumganhar 064014aeae make some special configure 2011-10-16 22:44:29 +08:00
dumganhar ee53c29e5c switch to 2.0 WVGA 2011-10-16 13:23:48 +08:00
dumganhar 1ffd3a4350 add language support 2011-10-14 15:54:18 +08:00
dumganhar 8dfa18efb9 commit some file for private use 2011-10-14 15:38:58 +08:00
Walzer 47c9020b85 fixed #738: caculate label height if not set 2011-10-14 14:33:08 +08:00
dumganhar 3f89f3088b remove mouse test log 2011-10-14 09:21:03 +08:00
dumganhar fd3f496b76 use system orientation 2011-10-13 11:55:48 +08:00
minggo 2b2405e2dc fixed #750: add comment 2011-10-13 10:56:02 +08:00
minggo aaa16b4a4f fixed #750: change the key to full path, because retrieve it use full path 2011-10-13 10:54:22 +08:00
moadib 5feee662e7 More simple and correct way to detect language for win32 application, also added detection of all languages contained in ccLanguageType enumeration . 
Added support for detect russian language.
 2011-10-12 09:32:59 +04:00
moadib 0283a4b254 Added dll-export macro to CCSaxParser declaration 2011-10-11 22:44:18 +04:00
dumganhar 64388023f6 Merge branch 'master' into bada 2011-10-10 13:47:16 +08:00
dumganhar f162a5fcaa add m_pAccelDelegate != NULL to avoid crash 2011-10-10 10:24:52 +08:00
dumganhar eb9cb31ca4 use shared lib for cocos2dx project 2011-10-09 18:15:31 +08:00
minggo 9695b6df86 fixed #745: export CCTime to dll 2011-10-09 10:19:12 +08:00
dumganhar 2f00b8ff1c update to sdk2.0.2 2011-10-09 01:11:33 +08:00
dumganhar fdea17b4f9 don't use DeviceOrientation, save orientation before running DirectorTest 2011-10-08 18:17:01 +08:00
dumganhar f97de356e7 add release version 2011-10-08 11:47:32 +08:00
minggo ba2f2fbc8b Merge https://github.com/reflog/cocos2d-x into reflog 2011-10-08 11:28:16 +08:00
Eli Yukelzon d23b044782 fill for polygon drawing 2011-10-05 10:50:00 +02:00
dumganhar beaa489406 add scale support 2011-09-30 17:19:16 +08:00
dumganhar 1830b4e2e9 add default file path = /Res 2011-09-30 10:02:37 +08:00
dumganhar 1b5365282a add accelerometer support 2011-09-29 18:12:08 +08:00
dumganhar 9ff00c7c83 use utf-8 for displaying chinese 
remove Gbk_Unicode.c Gbk_Unicode.h
 2011-09-29 17:29:38 +08:00
dumganhar d6049846bb Merge branch 'master' into bada 2011-09-29 16:18:47 +08:00
minggo 33c7caf555 Merge pull request #535 from minggo/master 
fixed a assert error
 2011-09-29 01:13:49 -07:00
minggo a56034f177 fixed a assert error 2011-09-29 16:07:18 +08:00
dumganhar db4d51496e Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into bada 
Conflicts:
	cocos2dx/platform/CCAccelerometer_platform.h
	cocos2dx/platform/CCApplication_platform.h
	cocos2dx/platform/CCArchOptimalParticleSystem.h
	cocos2dx/platform/CCEGLView_platform.h
	cocos2dx/platform/CCPlatformConfig.h
	cocos2dx/platform/CCSAXParser.h
	cocos2dx/platform/CCStdC.h
	tests/AppDelegate.cpp
	tests/tests/Box2DTestBed/Tests/EdgeShapes.h
 2011-09-29 16:03:37 +08:00
dumganhar bd2266fe4c use timer as gameloop, can change FPS by using setAnimationInterval 
modify some project setting
 2011-09-29 15:52:16 +08:00
minggo 333e08330b make create-linux-android-project.sh works ok 2011-09-29 00:49:49 -07:00
dumganhar cda492593c modify gameloop method 
modify some project setting
 2011-09-29 02:32:01 +08:00
dumganhar de545096de modify bada project setting 2011-09-28 18:21:17 +08:00
minggo 4ad422defd make tests run ok on linux android 2011-09-27 20:36:21 -07:00
dumganhar 56eb3060ee uiimage to uiImage 2011-09-28 09:49:57 +08:00
dumganhar 800940dd82 fixed some bug in bada port 2011-09-28 09:49:18 +08:00
dumganhar 1a8c6b06c7 add bada 2.0 project 
move 1.2 project to sdk1.2 folder
 2011-09-27 17:15:50 +08:00
dumganhar a54ab3c293 add bada 2.0 project 
move 1.2 project to sdk1.2 folder
 2011-09-27 17:09:14 +08:00
dumganhar cd18394b09 add bada 2.0 project 
move 1.2 project to sdk1.2 folder
 2011-09-27 17:06:11 +08:00
minggo d4283b1f11 Merge branch 'linux_port' 2011-09-27 17:01:51 +08:00
dumganhar 294c796e55 add bada 2.0 project 
move 1.2 project to sdk1.2 folder
 2011-09-27 17:00:13 +08:00
minggo 4f7e349c0a set HelloWorld dependence and make it run ok on android emulator 2011-09-26 22:38:59 -07:00
dumganhar 6cf5592499 modify Gbk_Unicode.c 2011-09-26 17:50:31 +08:00
dumganhar c78a4cb485 modify cocos2dx project setting for bada 2011-09-26 17:50:05 +08:00
dumganhar 13b091fb15 modify CCImage, make text being showed correctly 2011-09-26 15:40:56 +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
moadib 267cce29a9 Added testing ability for case when application enters background and returns in foreground on windows platform. 
When application minimized applicationDidEnterBackground() called, when restored applicationWillEnterForeground().

Also break; forgotten in WM_KEYDOWN.
 2011-09-22 13:11:51 +04:00
moadib 0ad5ec3557 fixed typo for win32 keypad testing ability 2011-09-22 10:27:10 +04:00
moadib 5537ba7e9e Added keypad testing ability for windows platform. Shift+F1 emulated Back key pressing, and Shift+F2 emulated Menu key pressing 2011-09-21 16:21:11 +04: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 eeb0956fb8 add linux makefiles 2011-09-20 14:38:12 +08:00
minggo 762e342b4d fixed #727: invoke DeleteLocalRef() to resolve memory leak 2011-09-20 14:25:16 +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 81243eecdf modify libpng version to 1.4.5 
modify libjpeg txt mode to windows \r\n style
 2011-09-20 02:17:44 +08:00
dumganhar 8ad2125139 add source code of libjpeg ,libpng ,zlib for bada 2011-09-20 02:16:20 +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
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
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
laschweinski d016f05f92 use relative path instead of the workspace_loc 2011-09-15 18:24:41 +08:00
minggo 61f2ab3cf2 fixed #718: fixed a typo error 2011-09-15 13:49:04 +08:00
minggo dcc5726665 Merge pull request #504 from minggo/iss715 
fixed #715: make sure selected image is valid
 2011-09-12 23:34:27 -07:00
minggo bdb7cfdd71 fixed #715: make sure selected image is valid 2011-09-13 14:29:15 +08:00
minggo d763cc3884 Merge pull request #503 from minggo/master 
fixed #709: write doxygen comment in CCSet.h
 2011-09-12 23:23:21 -07:00
minggo e2315d92b5 fixed #709: write doxygen comment in CCSet.h 2011-09-13 09:31:54 +08:00
Walzer 8082b91c0e fix CCPointMake marco in CCPointExtension.h. The bug is reported in forum http://www.cocos2d-x.org/boards/6/topics/3730 2011-09-10 08:48:15 +08: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
minggo ae056a07b1 Merge pull request #502 from minggo/iss686 
fixed #686: set z tag of appended tile
 2011-09-05 23:52:00 -07:00
minggo e2bb1d49e5 fixed #686: set z tag of appended tile 2011-09-06 14:01:08 +08:00
minggo 8ccc3321a3 Merge pull request #500 from flyingpacer/renderendcrash 
Renderendcrash
 2011-09-05 20:52:50 -07:00
RongHong 53227073a7 fixed #696 to modify some end() usilization 2011-09-06 11:43:09 +08:00
RongHong fea3da3156 fixed #696 Some android machines may crash at CCRenderTexture::end(bool bIsTOCasheTexture) 2011-09-06 11:33:48 +08:00
minggo e69d16e7d6 change CC_DIRECTOR_FPS_INTERVAL to 0.5, it is more reliable 2011-09-06 10:52:37 +08:00
RongHong 624e27497a fixed #696 Some android machines may crash at CCRenderTexture::end(bool bIsTOCasheTexture) 2011-09-06 09:51:35 +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 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
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 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
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 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 a411f4877c fixed #698:Not invoke init() in the construction of CCSprite 2011-08-29 11:00:31 +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