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

98 Commits

Author SHA1 Message Date
dumganhar c93be8b828 modify <cstdio> to <stdio.h> 
delete old project files
 2011-09-20 12:39:44 +08:00
dumganhar 54475335fb delete old bada project -- box2d and chipmunk 2011-09-19 23:35:05 +08:00
dumganhar 3bb956689b add chipmunk project for bada 2011-09-19 23:20:58 +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
laschweinski c977f3e07c commit debug and release makefile 2011-08-28 16:44:20 +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
Walzer 63ffc574d7 fixed #601, update Chipmunk from 5.3.4 to 5.3.5. Only tested on iOS now. 2011-07-11 10:34:03 +08:00
Walzer 08b26402d5 fixed #594, but find a new bug #597 2011-07-08 14:27:37 +08:00
yangws 3b6265aa58 Compile ok on vs2010 2011-06-27 17:02:58 +08:00
Walzer 00568c229a [android] back to shared library link 2011-06-25 11:21:16 +08:00
minggo a8b6b850de use precompile macro to cantrol if enable lua support 2011-06-01 17:51:08 +08:00
minggo dfbb0096e8 Merge pull request #283 from natural-law/master 
Compile tests OK on wophone.
 2011-05-24 18:45:18 -07:00
natural-law f89a93fcf8 Compile tests OK on wophone. 2011-05-24 17:52:24 +08:00
yangws c757dd4aeb fixed #503 new chipmunk code compiled ok on vs2010. 2011-05-24 16:18:47 +08:00
Walzer e8835ee4c2 issue #503, add chipmunk new files into win32 vcproj 2011-05-21 17:10:29 +08:00
Walzer a9027574eb issue #503, ChipmunkTest & ios xcodeproject upgraded, run on ios simulator ok 2011-05-21 16:19:01 +08:00
Walzer 2db1f2350c issue #503, new files in chipmunk 5.3.4 2011-05-21 14:58:54 +08:00
Walzer 948c6d750e issue #503, chippmunk library is upgraded from 5.1 to 5.3.4, which is usd in cocos2d-iphone 0.99.5 & 1.0.0-rc 2011-05-21 14:58:22 +08:00
walzer cb65469103 [airplay] move .mkf to proj.airplay folder, improve SimpleAudioEngine implementation, integrate chipmunk 2011-04-04 00:40:39 +08:00
unknown 795f1b985f Add VC2010 project files on win32 2011-03-10 19:50:17 +08:00
natural-law 93aebbc469 [wophone]fixed #386,Resolve the compile conflict on wophone sdk.Modify the makefiles for wophone. 2011-03-10 14:24:13 +08:00
natural-law 7c6147421b [wophone]fixed #377,Replace the word "uphone" with "wophone". 2011-03-09 17:28:35 +08:00
minggo b5a99f90df issue #375: rename file names and object names 2011-03-07 17:11:57 +08:00
Leon 96f4f5c9fd fix some compiling warning for iOS 2010-12-17 23:44:19 +08:00
minggo 53753b65b5 merge bada platform 2010-12-15 18:05:02 +08:00
minggo a33823706d fixed #259 2010-12-14 09:42:39 +08:00
minggo 534a55eaa1 issue #220: All tests run on android emulator, but the effect of some tests are wrong 2010-12-06 09:51:21 +08:00
minggo 7fa8d72076 commit before merging the code from https://walzer@github.com/cocos2d/cocos2d-x.git 2010-11-29 15:54:32 +08:00
yangws d96599e787 2010-11-19 02:48:08 +00:00
Walzer 26bfa32ca6 issue #211 don't check out 2010-11-18 14:56:54 +00:00
Walzer 79ed40ef38 issue #211 don't check out 2010-11-18 13:47:14 +00:00
Walzer 6afe5752f2 rename directories 2010-11-18 12:32:01 +00:00
Ming 31809a3774 issue #208 2010-11-18 06:50:28 +00:00
yangws b181701039 change win32 porject name 2010-11-17 02:46:43 +00:00
yangws 0618af9711 change win32 project name 2010-11-17 02:16:21 +00:00
Walzer 94806c9194 merge with tag/0.99.4-uphone-0.9.0 2010-11-11 03:18:58 +00:00
Walzer 2935faebfc change default Makefile.ARM to build static libraries. 2010-10-26 09:51:37 +00:00
Walzer 36da6992b0 Makefile.ARM: CXX_FLAGS += -fvisibility=default 2010-10-18 02:36:00 +00:00
yangws f9b550a7b0 add user files 2010-10-13 05:11:55 +00:00
yangws 040f68160a issue #176 add test code in test_win32, which same with test_uphone . 2010-10-12 09:15:44 +00:00
yangws bcfe035023 fixed #177 build chipmunk on win32 ok. 2010-10-11 08:45:37 +00:00
yangws 30417e37f9 2010-09-21 07:06:01 +00:00
Ming 1c122e1f3e issue #145 2010-09-13 07:38:26 +00:00
Ming 7ac911f120 issue #145 2010-09-13 03:09:23 +00:00
Ming 8b69cb8463 2010-09-11 02:33:45 +00:00
Ming 4ae590a03a 2010-09-10 08:12:12 +00:00
Walzer 382efc72a4 issue #124, optimize the Chipmunk-LogoSmash demo 2010-09-06 07:23:00 +00:00
Walzer fee1ce8f09 fixed #124, chipmunk done! 2010-09-04 10:18:14 +00:00