YuLei Liao
bbad5a4392
* merge upstream/master to master
2011-12-25 11:48:03 +08:00
dumganhar
a09bebb32b
fixed #903 : 1.pass 'id' parameter to setTouchInfo function;
...
2.when double press happens, deal with it as single press.
2011-12-23 20:33:42 +08:00
minggo
edbbe25a98
issue #888 : remove the setting for android building
2011-12-23 10:40:02 +08:00
minggo
12237cf288
fixed #911 : add some comment
2011-12-22 16:29:25 +08:00
minggo
7422a424da
fixed #911 : make CCTextureCache::addUIImage() work ok when key is null
2011-12-22 16:26:56 +08:00
minggo
a96285b617
fixed #923 : init iamge type and refactor a little codes
2011-12-22 15:38:31 +08:00
minggo
a0fe048f11
fixed #923 : cache texture with correct image type
2011-12-22 10:48:54 +08:00
minggo
21f05c2d6f
issue #903 : fix a compiling error
2011-12-22 09:56:09 +08:00
minggo
bb4b1d02bb
Merge pull request #608 from GMTDev/patch-2
...
issue #903 : Update CCTouch to include the ID/PID of the touch
2011-12-20 21:48:30 -08:00
GavT
36f8e43dd8
Update cocos2dx/include/CCTouch.h
2011-12-20 20:40:48 -08:00
gzito
a39be9506f
Defines documentation to avoid warning in Marmalade
2011-12-20 22:34:23 +01:00
gzito
d37417f7da
Re-added libXml2
2011-12-20 22:10:01 +01:00
gzito
298f12e7a3
Removed libxml2 (precompiled version)
2011-12-20 22:05:01 +01:00
minggo
01cf5793ad
fixed #922 : rename CCTexture2D::setPVRImagesHavePremultipliedAlpha() and change it to a static method
2011-12-20 14:59:15 +08:00
minggo
28d0737bf3
fixed #917 : implement CCFileUtils::getFileDataFromZip() on iOS
2011-12-20 14:18:53 +08:00
dumganhar
a8d5b6544a
Merge pull request #629 from gzito/master
...
Optimized ttf to bitmap, cached last loaded ttf & fixed ttf alpha. Other minor fixes. Added authors info.
2011-12-19 18:46:07 -08:00
minggo
faa8b59b6d
fixed #920 : export functions in CCAffineTransform
2011-12-20 10:39:10 +08:00
gzito
59bccb6bf8
Added last loaded font caching & minor fixes
2011-12-19 23:08:35 +01:00
gzito
e3c5d6886e
Added authors info
2011-12-19 22:57:04 +01:00
gzito
e389ae5469
Optimized CCImage and fixed alpha value
2011-12-19 22:56:44 +01:00
YuLei Liao
318a4c5ba8
merge upstream/master to master
2011-12-17 12:02:24 +08:00
dumganhar
2f63d6a158
Merge pull request #624 from dumganhar/issue#918
...
fixed #918 : modify filter of airplay to marmalade.
2011-12-15 19:11:49 -08:00
dumganhar
af221f8710
fixed #918 : modify filter of airplay to marmalade.
2011-12-16 11:08:37 +08:00
minggo
ffe8890498
Merge pull request #621 from minggo/iss892_RTTI
...
issue #892 : use RTTI instead of selectorRetain() and selectorRelease()
2011-12-15 18:52:46 -08:00
dumganhar
8298e0b6ff
Merge branch 'master' of https://github.com/styck/cocos2d-x into pullrequest#611
...
Conflicts:
tests/test.marmalade/test.mkb
2011-12-15 13:03:07 +08:00
dumganhar
f3b7b519fc
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into pullrequest#619
2011-12-15 11:38:15 +08:00
dumganhar
265558d9c7
Merge branch 'dev' of https://github.com/guavagames/cocos2d-x into pullrequest#619
2011-12-15 11:36:42 +08:00
minggo
15fca8b4b4
issue #892 : use RTTI instead of selectorRetain() and selectorRelease()
2011-12-15 10:26:31 +08:00
minggo
8813d94257
Merge pull request #617 from minggo/issue906
...
remove unneeded code in CCImage_android.cpp
2011-12-14 18:08:24 -08:00
Didiet Noor
00e504356a
Fixing Warning on CLang 3.0 on XCode 4.2
2011-12-15 01:46:55 +08:00
Didiet Noor
8c69c70fc3
Fixed Path Issues on QNX, CocosDenshion Test back to original
2011-12-15 00:31:17 +08:00
Didiet Noor
7f7ef29b21
Fixes on QNX project accidentally including marmalade
2011-12-14 16:50:26 +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
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
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
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
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
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
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
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
dumganhar
de7754697f
fixed #904 : use relative path for bada 2.0 projects
2011-12-07 18:26:38 +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
bfdb908d01
add Cocos2dx project
...
add HelloWorld project and rename proj.blackberry fold to proj.qnx
2011-12-06 14:56:37 +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
YuLei Liao
442e06e62e
* add CCNode:getPositionLua(), return CCPoint
2011-12-04 11:35:55 +08:00
YuLei Liao
cf12806558
merge luafix-0.9.2
2011-12-01 22:02:16 +08:00
YuLei Liao
f860edc744
Merge remote-tracking branch 'refs/remotes/upstream/master'
2011-12-01 22:00:21 +08:00
minggo
f0e80b32f4
fixed #854 : cache texture on android
2011-12-01 17:04:56 +08:00
YuLei Liao
2d9e8f065b
* add CCNode:getPositionX(), CCNode:getPositionY(), CCNode:setPositionX(), CCNode:setPositionY()
2011-12-01 14:58:39 +08:00
YuLei Liao
f3e654056c
* fix merge error 2
2011-11-30 21:50:00 +08:00
YuLei Liao
25f1cf16fd
* fix merge error 1
2011-11-30 21:47:23 +08:00
YuLei Liao
45fe3b3090
* merge luafix-0.9.2
2011-11-30 21:42:18 +08:00
YuLei Liao
216ad9b9cb
* merge upstream/master to master
2011-11-30 21:38:20 +08:00
YuLei Liao
a680ba4a8a
* CCTouch:locationInView() & CCTouch:previousLocationInView() return const reference
2011-11-30 21:29:57 +08:00
YuLei Liao
31285fea17
* add Touch & MultiTouches lua support
2011-11-30 21:27:50 +08:00
minggo
a5f389894a
Merge pull request #593 from minggo/box2d
...
change version and support android 4.0
2011-11-29 23:34:33 -08:00
minggo
4607ba8029
support for android 4.0
2011-11-30 15:30:11 +08:00
dumganhar
445982a252
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_base
2011-11-30 09:35:15 +08:00
dumganhar
68297f0121
fix a bug when COCOS2D_DEBUG >=1, CCAssert haven't the second param.
2011-11-30 09:32:07 +08:00
dumganhar
3f97e7db44
fix a bug when COCOS2D_DEBUG >= 1 in CCScheduler.cpp
2011-11-30 09:26:45 +08:00
YuLei Liao
4bf68e79fd
* merge upstream/master to master
2011-11-29 19:56:20 +08:00
YuLei Liao
ebd381af26
* merge luafix-0.9.2 to master
2011-11-29 19:20:49 +08:00
YuLei Liao
9070248d17
* [fix] MenuItem::activate() not call script function with tag value
2011-11-29 17:40:18 +08:00
minggo
adfec68577
fixed #850 : update Box2d for linux
2011-11-29 17:12:21 +08:00
YuLei Liao
90ae1aabc7
* add CCScene::registerScriptEventsHandler(), CCScene::unregisterScriptEventsHandler()
2011-11-29 17:10:58 +08:00
YuLei Liao
6117e15354
* [fix] CCFileUtils::getDoubleResolutionImage() not display HD file path.
2011-11-29 15:52:13 +08:00
YuLei Liao
0739c1f262
* rename LuaEngine to CCLuaEngine
...
* add #if LUA_ENGINE
* format source files
2011-11-29 15:42:12 +08:00
YuLei Liao
31b47c3fc6
* remove needless code
2011-11-29 12:38:28 +08:00
dumganhar
0fff92236f
add f project
2011-11-29 12:38:20 +08:00
YuLei Liao
f1351610d8
* merge CCLuaSupport to CCLuaEngine
2011-11-29 12:35:48 +08:00
minggo
266f0ee7ab
Merge pull request #586 from leon-li/master
...
Fix some minor bugs.
2011-11-28 18:27:38 -08:00
Leon
f108952595
Merge remote branch 'upstream/master'
...
Conflicts:
cocos2dx/support/CCPointExtension.cpp
2011-11-29 10:15:15 +08:00
dumganhar
d108f4f456
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_base
2011-11-28 23:13:02 +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
minggo
f0d22ae504
issue #879 : replase assert with CCAssert
2011-11-28 17:28:43 +08:00
dumganhar
112ec42670
fixed #854 : support bada pthread and semaphore
2011-11-28 16:07:17 +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
dumganhar
31ea76c16a
remove COCOS2D_DEBUG=1 in helloworld and cocos2dx project
2011-11-28 14:33:29 +08:00
dumganhar
20455bf164
fix a bug that when selecting "target-release" in building configurations, CCFileUtils::getFileData can't work correctly because CC_ASSERT is called uncorrectly.
2011-11-28 14:27:48 +08:00
minggo
8fd6a7298f
issue #854 : fix warning
2011-11-28 10:12:31 +08:00
Leon
6f99f7efde
1. fix multi touch index.
...
2. swap.
3. create gl view.
2011-11-26 22:37:36 +08:00
Walzer
ab7db20809
Fix a typo, CCSprite::get/setHornorParnetTransform to get/setHonorParnetTransform
2011-11-26 17:20:12 +08:00
Walzer
8edbbd56a9
Fix a typo here. Two values are not swapped correctly, max_inclusive is still equal to itself.
2011-11-26 17:07:36 +08:00
minggo
842c64486e
issue #854 : remove unneeded code
2011-11-25 16:16:37 +08:00
minggo
77b830b36b
issue #854 : use semaphore instead of condition because the condition may lose message
2011-11-25 16:14:06 +08:00
dumganhar
331dac34de
Merge branch 'master' into master_base
...
Conflicts:
cocos2dx/include/CCDirector.h
2011-11-25 11:06:20 +08:00
dumganhar
d94effbcfa
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-11-25 10:56:44 +08:00
minggo
7e61ce7d67
issue #781 : add audio functions on linux
2011-11-25 10:48:05 +08:00
minggo
837e5048d2
Merge https://github.com/cocos2d/cocos2d-x into iss781_cocosdenshion
2011-11-25 10:19:29 +08:00
minggo
c034f84b2d
fixed #760 : implement functions in .cpp
2011-11-25 10:17:32 +08:00
minggo
101f076a44
fixed #760 : implement functions in .cpp
2011-11-25 10:13:59 +08:00
minggo
f5bbad5833
issue #854 : implement CCImage::initWithImageFileThreadSafe for iOS
2011-11-25 10:09:29 +08:00
dumganhar
79e204abad
add semaphore support on bada
2011-11-25 10:06:26 +08:00
dumganhar
c138d7e258
update CCAccelerometer on bada platform
2011-11-24 18:04:25 +08:00
dumganhar
e87b00db67
add pthread support for bada 1.0
2011-11-24 17:26:04 +08:00
dumganhar
aeb56495a6
add user truetype font support, fix a bug in CCTextureCache.cpp
2011-11-24 15:15:23 +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
4612e6e1d6
update pthread.cpp
2011-11-24 11:37:59 +08:00
dumganhar
42775d4ec5
update pthread implement
2011-11-24 10:58:09 +08:00
dumganhar
2bd49545fa
add bada1.0 pthread support
2011-11-24 00:07:50 +08:00
dumganhar
cfa42fa8a1
Merge branch 'newest' into master_base
2011-11-23 21:47:21 +08:00
dumganhar
035d7326db
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2011-11-23 21:43:40 +08:00
dumganhar
15e3a6b1cf
update CCFileUtils_bada.cpp and CCImage_bada.cpp
2011-11-23 18:40:36 +08:00
minggo
c3a034a19b
fixed #760 : add functions to get/add m_pNotificationNode
2011-11-23 17:18:53 +08:00
minggo
6aedc258b4
fixed #838 : tests and HelloLua support x86
2011-11-23 15:51:30 +08:00
YuLei Liao
a8240abbe2
* revert CCFileUtils_ios.mm to 0.9.2
2011-11-23 13:48:15 +08:00
YuLei Liao
4ff2bf96d1
* ccConfig: add LUA_ENGINE macro, turn on Lua support when LUA_ENGINE defined
2011-11-23 13:41:48 +08:00
YuLei Liao
01c8f5f47e
* CCFileUtils_ios dump error message to console
2011-11-23 13:36:32 +08:00
minggo
8b20639d75
issue #838 : HelloWorld support x86
2011-11-23 11:02:18 +08:00
YuLei Liao
151b373239
* ccConfig: add LUA_ENGINE macro, turn on Lua support when LUA_ENGINE defined
2011-11-23 00:58:31 +08:00