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

621 Commits

Author SHA1 Message Date
styck 34759f4411 Enabled the CCUserDefault for Marmalade - works now that libxml2 is being used. 2011-12-08 20:47:42 -08:00
styck 7350fa9bb5 Updated based on G.Zito feedback 2011-12-08 19:51:19 -08:00
styck 96d400d918 Replace expat with libxml2, added libxml2 libraries and header files. Library built from: https://github.com/marmalade/marmalade-libxml2 
Refactored Accelerometer to match other platforms

Updated SimpleAudioEngine.cpp with new functions.  (NOT tested).

Updated app.icf for latest Marmalade

Update deprecated function calls.

Removed CCSAXParser_aiplay.cpp - not used, uses default in platform.
 2011-12-06 18:32:36 -08:00
minggo 2f6fb5b189 Merge pull request #602 from minggo/master 
change file structure in xcode view
 2011-12-01 00:28:17 -08:00
minggo d92bdcc40d change file structure in xcode view 2011-12-01 16:27:11 +08:00
dumganhar 6973525319 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_base 2011-12-01 14:19:07 +08:00
dumganhar ef8e34f9a1 fix a bug in ZwoptexTest. 
step: click ZwoptexTest, back to mainmenu, enter SpriteTest, next to 'SpriteFrame Alias Name' will cause assert.
 2011-12-01 14:15:10 +08:00
minggo ec70d1d240 Merge pull request #600 from dumganhar/master_base 
fix a bug in IntervalTest
 2011-11-30 22:05:07 -08:00
dumganhar f02ce4b15a fix a bug in IntervalTest 2011-12-01 13:56:20 +08:00
minggo 34d10fb3db Merge pull request #598 from dumganhar/master_base 
DemoModernArt test crash on bada
 2011-11-30 20:45:36 -08:00
minggo cddaa3fea2 fixed #885: make SimpleAudioEngine::setEffectVolume() take effect immediately on android 2011-12-01 12:12:14 +08:00
dumganhar bdddc188aa fix a bug that DemoModernArt crash on bada 2011-12-01 12:04:43 +08:00
dumganhar 0ae54cc0fd comment setIsAccelerometerEnabled( true ); in Box2dView.cpp, Box2dTestBed do not use Accelerometer. 2011-11-30 17:37:09 +08:00
dumganhar 262d5969c3 fixed #883: fix a bug in SpriteTest. 2011-11-30 17:29:16 +08:00
minggo adfec68577 fixed #850: update Box2d for linux 2011-11-29 17:12:21 +08:00
minggo c99d254c01 issue #850: update box2d for iOS and android 2011-11-29 15:16:16 +08:00
dumganhar 5a984bcc29 Merge branch 'master_base' into box2d2.2.1 2011-11-28 18:32:38 +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
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
Walzer ab7db20809 Fix a typo, CCSprite::get/setHornorParnetTransform to get/setHonorParnetTransform 2011-11-26 17:20:12 +08:00
dumganhar 10f5082a83 update box2d to version2.2.1 2011-11-25 18:30:27 +08:00
minggo bd595516b8 issue #781: add new functions for sound 2011-11-25 09:56:06 +08:00
dumganhar e87b00db67 add pthread support for bada 1.0 2011-11-24 17:26:04 +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 2bd49545fa add bada1.0 pthread support 2011-11-24 00:07:50 +08:00
dumganhar 035d7326db Merge branch 'master' of https://github.com/cocos2d/cocos2d-x 2011-11-23 21:43:40 +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 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 775c7ff847 Merge pull request #573 from minggo/iss854_pthread 
support pthread
 2011-11-17 18:40:30 -08:00
minggo 0676714436 issue #854: add TextureCacheTest into makefile 2011-11-17 18:32:52 -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
minggo dd8a2deeaf fixed #758: fix the bug that TTF fonts cause low memory on android 2011-11-16 11:40:24 +08:00
dumganhar 0d6ea61b76 fixed some bug:1.setDeviceOrientation, chipmunkDemo glOrthof 2011-11-07 18:18:10 +08:00
dumganhar e9a2818d0d use wvga setting, add SYSTEM_SERVICE 2011-11-02 01:11:06 +08:00
dumganhar 012052b089 modify project configure 2011-10-25 14:32:26 +08:00
dumganhar 4b653c89d1 modify project configure 2011-10-25 14:12:42 +08:00
dumganhar 146d3e1536 modify project config 2011-10-24 14:22:09 +08:00
dumganhar 2c87e5e17e use default manifest.xml 2011-10-24 11:01:39 +08:00
dumganhar 3aef823bd5 rename sdk1.2 to sdk1.0 2011-10-24 11:00:11 +08:00
dumganhar 59a14973ef change splash and icon to cocos2d 2011-10-24 10:54:08 +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
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