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

155 Commits

Author SHA1 Message Date
minggo ddaff9cce6 make cocos2dx depend chipmunk 2013-09-17 19:24:30 +08:00
boyu0 0a53a12f51 issue #2771: update project setting 2013-09-17 14:31:43 +08:00
boyu0 f96bc2355a issue #2771: update android.mk 2013-09-16 22:56:20 +08:00
James Chen 24c8438fa6 [Dispatcher] Updating Android.mk, and some refractor. 2013-09-12 17:31:37 +08:00
boyu0 da566a3c16 issue #2434: add android_generator and generate cocos2dx, extensions and TestCpp's android.mk files 
add PathUtils.py for python library.
 2013-08-22 11:49:34 +08:00
godyZ f0dbc22c16 updata: [cocos2d's code style] add space before backslash and return before else if 2013-08-16 16:10:39 +08:00
godyZ 424b4140a2 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into Atitc_decode 2013-08-16 11:14:47 +08:00
godyZ e8809b2b15 issue #2533:add ATITC compressed texture support 
soft decode test in Win32, ios, Mac. device decode test in HTC G14
Adreno 220 GPU.
 2013-08-16 11:02:44 +08:00
James Chen c84162505e issue #2488: Updating project configurations for new Label classes. 2013-08-15 21:01:45 +08:00
godyZ 46e9eed028 nothing with s3tc 2013-08-08 14:11:22 +08:00
godyZ cd8430f81a Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop 
Conflicts:
	cocos2dx/Android.mk
	cocos2dx/platform/CCImage.h
	cocos2dx/platform/CCImageCommon_cpp.h
	cocos2dx/textures/CCTexture2D.h
	scripting/javascript/bindings/generated
 2013-08-08 10:19:09 +08:00
godyZ 674fe025b0 update s3tc #3 ,standard of code 2013-08-07 16:39:05 +08:00
godyZ 02419ccb00 update s3tc #3 ,android test 2013-08-06 15:33:38 +08:00
boyu0 dc6503f7d4 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into iss2345_refactor_ccimage 2013-08-06 13:37:38 +08:00
folecr 12f25a574d Shared Android makefile uses the platform specific code as a static library 
* Resolve conflicts with latest cocos2x/Android.mk
 * Revert changes to cocos2dx/Android.mk introduced by 9cba2c42c1
 * Update files in label_nodes
 2013-08-05 02:05:36 -07:00
James Chen 5ee6e7d79a Merge branch 'develop' into carlomorgantinizynga-new_develop_merge 
Conflicts:
	cocos2dx/Android.mk
 2013-08-05 10:09:15 +08:00
minggo 9cba2c42c1 closed #2434: simply Android.mk 2013-08-02 17:33:27 +08:00
boyu0 6afa77ddc3 issue #2345: update the png, jpeg and tiff libraries. Fix the testFormatForPvrTCSupport return incorrect answer when GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG undefined. 2013-08-02 16:02:40 +08:00
James Chen 67d710a41c Adding Android support for new label. 2013-08-02 13:46:26 +08:00
boyu0 4348e87e31 Merge CCImageCommonWebp.cpp into CCImageCommon_cpp.h 2013-07-29 17:56:36 +08:00
boyu0 cecfc13bc4 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into 2345 2013-07-27 22:06:30 +08:00
boyu0 02bdfbf169 Combine CCTextureETC to CCImage and CCTexture2D. 2013-07-26 17:34:44 +08:00
minggo 4d7ac6c800 issue #2430:fix conflict 2013-07-25 21:37:12 +08:00
boyu0 a2b611d8c3 Refactor Image and Texture2D, combine TexturePVR to Image and Texture2D, and delete TexturePVR 2013-07-25 21:35:00 +08:00
minggo acdd1cfe9d issue #2430:move GLProgram enum into class 2013-07-25 17:48:22 +08:00
James Chen f8392adce2 issue #2404: Open deprecated warning for Android and Linux. 2013-07-25 15:05:56 +08:00
minggo 7704ab9161 issue #2412:remove platform.cpp/.h 2013-07-19 13:42:45 +08:00
minggo eada29ee40 issue #2404:created CCDprecated.h and move all global functions and variables into it 2013-07-15 16:14:26 +08:00
James Chen 582baa0bac issue #2379: Removing CCZone.cpp for Makefile. 2013-07-09 15:31:28 +08:00
minggo dfde41b932 issue #2129:fix conflicts 2013-07-05 17:32:50 +08:00
Huabing.Xu 041bef148a Merge branch 'origin/develop' 
Conflicts:
	cocos2dx/proj.ios/cocos2dx.xcodeproj/project.pbxproj
	cocos2dx/proj.win32/cocos2d.vcxproj.filters
 2013-07-02 13:47:02 +08:00
Huabing.Xu 4e9e893c8e 1. Add C++ code to decode ETC file 
2. Configuration and function supportsETC()
 2013-07-01 17:40:57 +08:00
James Chen c2ce65a32b issue #2347: Compiled ok for android, marmalade and nacl, windows needs to be tested too. 2013-07-01 17:35:51 +08:00
folecr be6633b560 Add -landroid to LOCAL_LDLIBS and LOCAL_EXPORT_LDLIBS 2013-06-24 15:14:14 -07:00
minggo cd5bcb87af issue #2284: merge master and fixed some conflicts 2013-06-13 17:54:05 +08:00
James Chen 3c69a17752 [Android] Only ignore warning of 'invalid-offsetof' in the library of spidermonkey. 2013-06-06 10:12:44 +08:00
James Chen a5263673fb Fixing compilation errors on Android. 2013-06-05 19:56:23 +08:00
chengstory cfb424a6c9 1. add Component struct. 2013-06-04 17:38:43 +08:00
Jaroslaw Lewandowski 3f7c506638 Ability to save/retrieve CCData into/from CCUserDefault 2013-05-29 01:06:41 +01:00
minggo 6f624351b3 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into ETC1-support 2013-05-28 11:36:05 +08:00
minggo beef61fc90 issue #2161: android supports ETC format now 2013-05-27 14:42:22 +08:00
James Chen 91a355cdb0 Updating cocos2dx/Android.mk. 2013-05-23 17:10:30 +08:00
James Chen 42427634f2 fixed #2142: Adding datavisitor support for other platforms except win32. 2013-05-10 15:37:40 +08:00
folecr e91ec3ede5 Clean up linked libraries 
* LOCAL_LD_LIBS and LOCAL_EXPORT_LDLIBS are the same
 * Remove unused -lEGL
 2013-04-08 22:46:25 -07:00
minggo ac888fee01 issue #1529:CCUserDefault supports default value on iOS 2013-03-11 14:45:07 +08:00
minggo 648e9a7bf1 issue #1529:use NSUserDefaults on iOS and SharedPreferences on Android to implement CCUserDefault 2013-03-06 16:36:44 +08:00
James Chen 537abaec42 fixed #1753: Android works ok now. 2013-02-27 16:57:36 +08:00
James Chen ac17f67686 issue #1712: Adding getting dpi support for iOS and Android. 2013-02-16 19:36:21 +08:00
minggo 60d36ed3aa issue #1703:fix conflicts when synchronized to latest codes 2013-02-06 16:18:37 +08:00
minggo 9a7cca5ed4 issue #1703:remove dependence of libxml2 2013-02-06 14:12:52 +08:00