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

3011 Commits

Author SHA1 Message Date
Giovanni Zito 8b4b802839 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	cocos2dx/platform/CCSAXParser.h
 2011-12-08 08:41:16 +01:00
dumganhar fa07d16f73 switch to WVGA 2011-12-08 11:07:17 +08:00
Giovanni Zito b60eac2505 integrating libXml2 2011-12-07 23:49:52 +01:00
dumganhar de7754697f fixed #904: use relative path for bada 2.0 projects 2011-12-07 18:26:38 +08:00
Walzer 80736e0a1f Merge pull request #609 from styck/master 
Fix Airplay/Marmalade platform functionality and replace expat with libxml2
 2011-12-07 01:20:27 -08:00
minggo a3986a9e21 issue 892: add cpp flag to support rtti on android 2011-12-07 16:51:54 +08:00
dumganhar 2c94bcc075 add some files for qnx 2011-12-07 16:22:40 +08:00
minggo 3bf11dba7e issue #892: modify pkg for lua 2011-12-07 15:24:03 +08:00
minggo cdc842051f issue #892: use RTTI to simplify codes, work ok on win32 2011-12-07 14:28:22 +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
Giovanni Zito 97967ffcb3 Specific classes for Marmalade platform 2011-12-07 00:08:04 +01:00
dumganhar 6d7baa9684 add platform files for qnx 2011-12-06 17:19:36 +08:00
dumganhar 520e3365c1 modify some project settings 2011-12-06 16:17:49 +08:00
dumganhar dfbf2c0cdb add tests project for blackberry 2011-12-06 15:03:14 +08:00
dumganhar bfdb908d01 add Cocos2dx project 
add HelloWorld project and rename proj.blackberry fold to proj.qnx
 2011-12-06 14:56:37 +08:00
minggo d97e1b705f Merge pull request #607 from dualface/fix-xcode4-template 
* fix Xcode 4 template, AppController.mm not call AppDelegate:applicationDidEnterBackground() & AppDelegate:applicationWillEnterForeground()
 2011-12-05 19:46:14 -08:00
YuLei Liao 443656f88c * fix Xcode 4 template, AppController.mm not call AppDelegate:applicationDidEnterBackground() & AppDelegate:applicationWillEnterForeground() 2011-12-06 10:51:12 +08:00
dumganhar 5408fd1ee7 add CocosDenshion project for blackberry 2011-12-06 10:34:09 +08:00
dumganhar f28793ace6 add chipmunk project for blackberry 2011-12-06 10:04:08 +08:00
dumganhar a3ace6f20d modify some box2d source files for blackberry 2011-12-06 09:51:58 +08:00
dumganhar 791f384e4f add blackberry box2d project 2011-12-06 09:50:24 +08:00
Walzer 70d5a088f1 fixed #887, define GL_GLEXT_PROTOTYPES = 1 automatically when compile on ndk-r7 2011-12-04 20:18:17 +08:00
Walzer e14a3f52ad changelog of 0.10.0 2011-12-02 10:36:58 +08:00
minggo e71044fce3 Merge pull request #606 from dumganhar/master 
Add two license files used for bada port
 2011-12-01 04:15:13 -08:00
dumganhar 9b36298ccf add two license used for bada port 2011-12-01 19:26:03 +08:00
minggo 75d40c2e98 Merge pull request #603 from dumganhar/master_base 
modify helloworld .cproject, use xcopy /y /s to copy resource
 2011-12-01 01:28:46 -08:00
minggo 262d17d010 Merge pull request #604 from minggo/master 
fixed #854: cache texture on android
 2011-12-01 01:06:38 -08:00
minggo f0e80b32f4 fixed #854: cache texture on android 2011-12-01 17:04:56 +08:00
dumganhar d71b467ca5 modify helloworld .cproject, use xcopy /y /s to copy resource 2011-12-01 17:02:11 +08:00
Walzer 014286cf36 Merge branch 'master' of http://github.com/cocos2d/cocos2d-x 2011-12-01 17:01:04 +08:00
Walzer 21af60ee9c update xcode4 templates 2011-12-01 17:00:30 +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
minggo e5fb91198b Merge pull request #601 from dumganhar/master_base 
fix a bug in ZwoptexTest.
 2011-11-30 22:39:08 -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 ed030139b8 Merge pull request #599 from minggo/master 
make SimpleAudioEngine::setEffectVolume() take effect immediately
 2011-11-30 20:45:12 -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
minggo b6b92944d6 Merge pull request #597 from minggo/master 
fixed #580: update Box2d for vs2010
 2011-11-30 18:09:33 -08:00
minggo ea9cd75e67 fixed #580: update Box2d for vs2010 2011-12-01 10:08:15 +08:00
minggo 427f33d01d Merge pull request #596 from tszming/master 
Lua support: fix for the rename of getHornorParentTransform & setHornorParentTransform
 2011-11-30 02:31:02 -08:00
Tsz Ming WONG a7fddfc641 Fix for the rename of getHornorParentTransform/setHornorParentTransform: ab7db20809 2011-11-30 18:19:34 +08:00
minggo c7ba8c13b7 Merge pull request #594 from dumganhar/master_base 
Fix a bug in SpriteTest and comment one line of unused code
 2011-11-30 02:04:31 -08:00
minggo db72782c5b Merge pull request #595 from minggo/master 
fix type error according the change of CCSprite
 2011-11-30 01:51:56 -08:00
minggo f693a5a10e fix type error according the change of CCSprite 2011-11-30 17:49:52 +08:00
dumganhar 0ae54cc0fd comment setIsAccelerometerEnabled( true ); in Box2dView.cpp, Box2dTestBed do not use Accelerometer. 2011-11-30 17:37:09 +08:00