Commit Graph

3244 Commits

Author SHA1 Message Date
minggo 3874450200 Merge pull request from minggo/iss954_accerometer
correct accelerometer data when set orientation to portrait in tablet
2012-02-06 18:23:15 -08:00
minggo a7c96b5371 fixed : correct accelerometer data when set orientation to portrait in tablet 2012-02-07 10:19:40 +08:00
minggo babbd64f0d Merge pull request from winbinar/master
fixed : Fix bug 
2012-02-05 23:00:31 -08:00
dumganhar b32b4eebd6 Merge pull request from moadib/qnx_fileutils
fixed : Fixed a bug about "Out of bound" in CCFileUtils::getWriteablePath() for BlackBerry
2012-02-05 06:13:42 -08:00
moadib f5b8aa79c5 Fixed "out of bound" error in CCFileUtils::getWriteablePath() for BlackBerry 2012-02-05 16:49:47 +04:00
dumganhar 7a5734977c Merge pull request from dumganhar/iss965_remove_some_dynamic
fixed : Remove some dynamic_cast callings since selector_protocol.h was removed
2012-02-02 01:53:05 -08:00
dumganhar f6d6d0dd49 fixed : Remove some dynamic_cast callings since selector_protocol.h was removed 2012-02-02 17:46:45 +08:00
minggo cf2807b870 Merge pull request from minggo/iss933_userdefault
refactor userdefault
2012-02-01 22:35:23 -08:00
minggo 2b91b1c7cf fixed : free doc 2012-02-02 14:24:51 +08:00
minggo 591b7d0619 fixed : profile CCUserDefault 2012-02-02 14:18:13 +08:00
minggo 1ae8f001b8 Merge pull request from minggo/iss947_closed_loop
fixed : fixed a closed loop
2012-02-01 02:22:02 -08:00
minggo 5e39489c71 fixed : fixed a closed loop 2012-02-01 18:18:31 +08:00
minggo 56677be235 Merge pull request from minggo/iss964_label
fixed : compute correct height of a charactor
2012-02-01 02:05:50 -08:00
minggo 7b67c04f2f fixed : compute correct height of a charactor 2012-02-01 18:04:12 +08:00
dumganhar 5c65af137b Merge pull request from GermanMtz/master
fixed : Member variable added to keep the current window active status
2012-01-31 23:09:54 -08:00
martinezgerman c78bf39601 Member variable added to keep the current window active status 2012-01-31 22:55:44 -08:00
martinezgerman acdd00f03b Functionality to detect when the application goes to the background and return from it, notifying only ones per time to the application 2012-01-31 21:38:44 -08:00
martinezgerman e8f9c5f675 merging the original update 2012-01-31 20:06:39 -08:00
dumganhar 64c892de79 Merge pull request from dducharme/dalebranch
fixed : Updating the following:
CocosDenshion - now using OpenAL exclusively for audio, added ogg/vorbis support there
Accelerometer - fixing the accelerometer for different initial orientations of the device
Application - paying attention to the locale of the device and setting the current language accordingly
CCEGLView - paying attention to navigator events (menu, application go to background, application enters foreground), fixed up orientation code, fixed up screen event pointer code
2012-01-31 18:44:09 -08:00
minggo c1a53e2ed7 Merge pull request from nkostelnik/master
fixed : Fixed mad behaviour in second stage of CCEaseBackInOut
2012-01-31 02:17:57 -08:00
Nicholas Kostelnik edaf2cf269 fixed issue with CCEaseBackInOut being erratic on the second stage of the transititon 2012-01-31 09:57:58 +00:00
martinezgerman 38cd599bdc Functionality to detect when the application goes to the background and return from it 2012-01-31 00:25:09 -08:00
minggo a02e3b8c60 Merge pull request from minggo/iss959_touch_id
fixed : make touch id correct on android
2012-01-30 22:57:04 -08:00
minggo a2efab73a0 fixed : make touch id correct on android 2012-01-31 14:49:02 +08:00
Dale Ducharme 32e4cc1af2 Updating the following:
CocosDenshion - now using OpenAL exclusively for audio, added ogg/vorbis support there
Accelerometer - fixing the accelerometer for different initial orientations of the device
Application - paying attention to the locale of the device and setting the current language accordingly
CCEGLView - paying attention to navigator events (menu, application go to background, application enters foreground), fixed up orientation code, fixed up screen event pointer code
2012-01-30 20:27:58 -05:00
dumganhar 2b76c2e2fe Merge pull request from dumganhar/moveSel2CCObject
fixed : move the implement of SelectorProtocol to CCObject
2012-01-30 02:30:01 -08:00
dumganhar a909be3264 remove selector_protocol.h for vs2010 project 2012-01-30 18:27:03 +08:00
dumganhar 3865da92e2 Merge branch 'iss958_merge' of https://github.com/minggo/cocos2d-x into moveSel2CCObject 2012-01-30 18:20:58 +08:00
minggo 6c2277757a fixed : delete SelectorProtocol and implement it in CCObject 2012-01-30 17:47:47 +08:00
dumganhar c6ec949950 remove some functions in CCObject 2012-01-30 16:07:01 +08:00
dumganhar 6eb65442d4 remove some logs 2012-01-30 15:46:56 +08:00
dumganhar f44b38eaf8 fixed : move the implement of SelectorProtocol to CCObject 2012-01-30 15:31:59 +08:00
minggo 126558aa1d Merge pull request from gzito/master
Some minor fixes for Marmalade port
2012-01-29 21:35:57 -08:00
winbinar 231446a8a5 Update cocos2dx/textures/CCTextureCache.cpp 2012-01-30 07:10:49 +02:00
winbinar 910ded54c5 Update cocos2dx/textures/CCTextureCache.cpp 2012-01-30 07:10:19 +02:00
gzito fe79a2c5d2 Merge branch 'master' of git://github.com/cocos2d/cocos2d-x 2012-01-28 10:54:31 +01:00
dumganhar 6c4c837d13 Merge pull request from dumganhar/iss756_CCMenu_init
fixed : CCMenu can't be initialized by using CCMenu::node() method.
2012-01-27 22:44:07 -08:00
dumganhar 49b57569c9 fixed : CCMenu can't be initialized by using CCMenu::node() method. 2012-01-28 14:38:44 +08:00
gzito f40d3d3db8 Changed use of animation interval in game loop 2012-01-24 23:27:03 +01:00
minggo 94342f85e0 Merge pull request from krstns/master
fixed : Added tolua++ for Mac
2012-01-19 02:21:39 -08:00
dumganhar 57eee38f4e Merge branch 'master' into moveSel2CCObject 2012-01-19 15:46:31 +08:00
dumganhar e0bebb5f6c Merge pull request from dumganhar/iss940_replace_ico
fixed : replace .ico file with clear image for win32 template.
2012-01-18 20:01:39 -08:00
dumganhar 98b1ec0b30 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss940_replace_ico 2012-01-19 11:59:52 +08:00
dumganhar 8c81fcf232 fixed : replace .ico file with clear image for win32 template. 2012-01-19 11:58:37 +08:00
minggo 9bf4a228c7 Merge pull request from dumganhar/iss952_bmfont_support
make CCLabelBMFont support other language, such as chinese, korean, japanese.
2012-01-18 18:52:00 -08:00
dumganhar a23893507d fixed 952: make CCLabelBMFont support other language, such as chinese, korean, japanese. 2012-01-18 18:43:41 +08:00
dumganhar 543d96a73f issue 952: make CCLabelBMFont support other language, such as chinese, korean, japanese. 2012-01-18 18:02:39 +08:00
gzito 08d2e5ef51 Merge branch 'master' of git://github.com/cocos2d/cocos2d-x 2012-01-17 21:21:48 +01:00
gzito b400570265 Workaround for issue . Prevents "ERROR: 5 in device 25" to be reported in X86 Marmalade Mac OSX simulator 2012-01-17 10:57:31 +01:00
gzito 9e180e9c01 Added true type fonts file for Marmalade version 2012-01-17 10:53:47 +01:00