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

3771 Commits

Author SHA1 Message Date
Giovanni Zito af29be2d26 Shared instance is now a pointer instead of a static instance. Also the CCEGLView::release notifies application about quit 2011-12-09 22:04:35 +01:00
Giovanni Zito 362a82f41c mainloop modified to handle correctly quit requests 2011-12-09 22:03:38 +01:00
Giovanni Zito c17d7de0a1 For CC_PLATFORM_MARMALADE used pointers instead of static instances for singletons 2011-12-09 22:02:19 +01:00
Giovanni Zito 5584039f47 libFreeType and libJpeg for Marmalade 2011-12-09 21:58:32 +01:00
dumganhar 1c9ecabd89 modify all projects config 2011-12-09 17:03:11 +08:00
dumganhar 6d2a298035 Merge branch 'bbf' into blackberry 2011-12-09 15:58:16 +08:00
dumganhar 5dea9b8205 fix a crash bug in SimpleAudioEngine.cpp 
update helloworld and tests main.cpp and AppDelegate.cpp files
 2011-12-09 15:54:35 +08:00
Giovanni Zito f1ab4893f6 Fixed isBackgroundMusicPlaying so that returns a bool value 2011-12-09 08:01:42 +01:00
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
dumganhar 190fbb60a7 Merge branch 'Forf_2' into bbf 2011-12-09 10:39:27 +08:00
dumganhar b398d75e21 modify tests 'Res' link to 'Resource', remove the coupling between CocosDenshion and Cocos2dx 2011-12-09 10:32:00 +08:00
Giovanni Zito c5b0a76742 Added support to play more than one sound fx at once 2011-12-08 19:27:20 +01:00
Giovanni Zito 269efd0b74 Added support to play more than one sound fx at once 2011-12-08 19:26:44 +01:00
Giovanni Zito 0a7a000c2d Changed symbols from "airplay" to "marmalade", added files and folders for marmalade 2011-12-08 12:21:48 +01:00
Giovanni Zito 0c1b058629 Changed symbols from "airplay" to "marmalade", added files and folders for marmalade 2011-12-08 12:16:32 +01:00
dumganhar b11bcacea8 modify Device-Debug project setting, finished running on device! 2011-12-08 18:22:06 +08:00
Giovanni Zito 1eb8ba656e Added marmalade folder 2011-12-08 11:15:20 +01:00
Giovanni Zito 7b0cb1bc8b Accelerometer stuff 2011-12-08 10:48:03 +01:00
Giovanni Zito e077107575 Used CONSTANT definitions for touch 2011-12-08 09:30:18 +01:00
YuLei Liao b3ecaedfeb Merge branch 'refs/heads/luafix-0.10.0' 2011-12-08 15:47:28 +08:00
YuLei Liao d49456cbd1 * merge upstream/master to master 2011-12-08 15:47:20 +08:00
YuLei Liao 2ece926122 * tolua_pushusertype_ccobject() & tolua_remove_ccobject_by_refid() return errcode 2011-12-08 15:44:49 +08:00
YuLei Liao 7e170c7517 * add LUA_ENGINE_DEBUG & LUALOG macro 2011-12-08 15:44:13 +08:00
Giovanni Zito 8b4b802839 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	cocos2dx/platform/CCSAXParser.h
 2011-12-08 08:41:16 +01:00
GavT 3d86583818 Update cocos2dx/platform/android/jni/TouchesJni.cpp 2011-12-07 20:25:51 -08: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
YuLei Liao 7ecd0d2fab * check metatable not found 2011-12-08 00:31:16 +08:00
YuLei Liao aa0251bcef * remove stackDump() 2011-12-08 00:30:58 +08:00
YuLei Liao 1184559ce1 * add tolua_stack_dump() 2011-12-08 00:30:46 +08:00
YuLei Liao 6be1e0a8d6 * change CCLuaEngine::executeFunctionByRefID() to public 2011-12-08 00:29:22 +08: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
GavT 6ab60118af Update cocos2dx/include/CCTouch.h 2011-12-06 20:31:40 -08:00
GavT 190891bab7 Pass on index/ID/PID of the touch from UITouch to CCTouch and the users touch handlers. Needed for multi touch apps that need to tell which touch/finger was let go. As discussed here by GavT: http://www.cocos2d-x.org/boards/6/topics/4043?r=5751#message-5751 
Files Modified: Eagleview.mm, CCTouch.h
 2011-12-06 20:06:38 -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