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

2939 Commits

Author SHA1 Message Date
dumganhar d96e00668b modify setting of box2d in bada project 2011-09-19 23:19:39 +08:00
dumganhar bd10463980 add box2d project files for bada 2011-09-19 23:09:07 +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
minggo 371d4e646a Merge pull request #514 from linshun/iss724 
fixed #724, different results of CCLabelTTF on android & win32
 2011-09-19 03:13:56 -07: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
ciaranj d91c728a52 Updating README file as requested 2011-09-19 07:47:17 +01:00
minggo ed92de6a7c Merge pull request #513 from dumganhar/linux_port 
Linux port
 2011-09-18 23:01:54 -07: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 8bc54e0b64 remove lib/android/Debug/*.so 
remove lib/android/Release/*.so
 2011-09-19 11:03:30 +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
ciaranj 11f03e9c8c Adding a build file that correctly generates LuaCocos2d.cpp 2011-09-18 18:29:17 +01:00
ciaranj 75edaccac9 Updating AccelerometerDelegate related classes 
The checked in .pkg files seemed to be generating lua-bindings for
cocos2d methods that don't exist.  This seems strange, so have fixed it
for now.
 2011-09-18 18:18:02 +01: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 a4bfa976b3 change the base resource path 2011-09-16 10:23:57 +08:00
laschweinski b9ce266ee3 the same as the last one 2011-09-15 18:25:06 +08:00
laschweinski d016f05f92 use relative path instead of the workspace_loc 2011-09-15 18:24:41 +08:00
minggo 55ab2aa708 Merge pull request #509 from minggo/iss719 
fixed #719: update java code to HelloLua & tests
 2011-09-15 01:24:51 -07:00
minggo ae403153c7 fixed #719: update java code to HelloLua & tests 2011-09-15 16:18:50 +08:00
minggo 4c51914cfc Merge pull request #508 from minggo/iss718 
get button value from string.xml & add copyright for java cod
 2011-09-14 23:27:54 -07:00
minggo a70995c220 fixed #717: add R.java of HelloLua 2011-09-15 14:23: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
minggo ea0455a0ba Merge pull request #507 from minggo/iss718 
fixed #718: fixed a typo error
 2011-09-14 23:11:14 -07:00
minggo 61f2ab3cf2 fixed #718: fixed a typo error 2011-09-15 13:49:04 +08:00
minggo aa6bfa3fdc Merge pull request #506 from Macarse/linearLayoutIssue 
Replaced LinearLayout with FrameLayout
 2011-09-14 19:41:32 -07:00
Macarse 208bce312e Replaced LinearLayout with FrameLayout 2011-09-13 20:25:07 -03:00
minggo e7690b1eee Merge pull request #505 from Macarse/externalStorage 
External storage
 2011-09-13 02:00:16 -07:00
Macarse afd1a7a6d9 External storage 2011-09-13 05:42:34 -03: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 8fbe6dcb3f fixed #716: don't convert effect volume to int 2011-09-13 14:10:32 +08:00
minggo e2315d92b5 fixed #709: write doxygen comment in CCSet.h 2011-09-13 09:31:54 +08:00
Walzer 05ee98f26e in doxygen.cocos2d-x, set EXTRACT_ALL = YES, SKIP_FUNCTION_MARCOS = NO to export more functions & members, especially the properties in our property marcos 2011-09-13 08:55:38 +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 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