dumganhar
|
c80002a1b0
|
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into marmalade
|
2011-12-13 10:03:10 +08:00 |
dumganhar
|
625d299717
|
Merge branch 'master' of https://github.com/gzito/cocos2d-x into marmalade
|
2011-12-13 10:01:29 +08:00 |
gzito
|
d4ea6d4ef5
|
Rollback changes about CCDirector::sharedInstance as pointer
Optimized a little bit CCImage::initWithString
Fixed CCApplication::run in order to handle closing Marmalade simulator
|
2011-12-12 14:50:35 +01:00 |
dumganhar
|
e7a653b71d
|
delete helloworld project on airplay platform
|
2011-12-12 19:05:57 +08:00 |
dumganhar
|
4b9cbb85ff
|
#issue 908: Merge marmalade to latest cocos2d-x source
Merge branch 'master' of https://github.com/gzito/cocos2d-x into marmalade
Conflicts:
cocos2dx/platform/CCFileUtils.cpp
cocos2dx/platform/CCPlatformConfig.h
cocos2dx/support/zip_support/ioapi.cpp
|
2011-12-12 17:46:21 +08:00 |
minggo
|
ba462e99a6
|
fixed #906: remove unneeded code in CCImage_android.cpp
|
2011-12-12 17:02:21 +08:00 |
minggo
|
aea75de4cf
|
Merge pull request #616 from dumganhar/blackberry
add Blackberry port, support Playbook Tablet
|
2011-12-12 00:58:11 -08:00 |
dumganhar
|
baf3755142
|
remove some '__QNX__' macros
|
2011-12-12 16:14:12 +08:00 |
dumganhar
|
dea2713f51
|
fixed #907: add blackberry port
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into blackberry
Conflicts:
cocos2dx/platform/CCSAXParser.h
|
2011-12-12 11:49:49 +08:00 |
minggo
|
95b43ac563
|
Merge pull request #614 from minggo/issue892_RTTI
Use RTTI to simplify codes
|
2011-12-11 19:40:34 -08:00 |
minggo
|
8c5c3300aa
|
Merge pull request #612 from dumganhar/issue904
Issue904
|
2011-12-11 19:33:07 -08:00 |
styck
|
b1cdb6543d
|
Updated ccLanguageType CCApplication::getCurrentLanguage() to return the current language
Added tests for Marmalade and enabled language and font testing
|
2011-12-11 17:18:01 -08:00 |
gzito
|
cc2ad0c514
|
Added marmalade support, removed airplay
|
2011-12-11 10:24:38 +01:00 |
gzito
|
47e108a8c5
|
Added marmalade support, removed airplay
|
2011-12-11 10:19:41 +01:00 |
styck
|
f3b662a5a8
|
marmalade updates
|
2011-12-10 22:29:39 -08:00 |
styck
|
dc6476ebe0
|
marmalade updates
|
2011-12-10 21:54:07 -08:00 |
styck
|
9fc2061c6b
|
mamarlade updates
|
2011-12-10 21:20:15 -08:00 |
styck
|
bcf63d0e96
|
Merged from gitbub.gom/gzito, marmalade support, remove airplay
|
2011-12-10 20:59:48 -08:00 |
gzito
|
2be5240a5d
|
Fixed CCFileUtils::getWriteblePath on Marmalade
|
2011-12-10 16:34:54 +01:00 |
gzito
|
f27f9180ff
|
Merge remote-tracking branch 'remotes/styck/master'
|
2011-12-10 11:10:59 +01:00 |
Giovanni Zito
|
aabe452f2e
|
Updated for Marmalade
|
2011-12-09 22:15:52 +01:00 |
Giovanni Zito
|
287f480c97
|
Added initWithString (TTF) and jpeg support
|
2011-12-09 22:05:12 +01:00 |
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 |
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 |
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 |