YuLei Liao
a35faf98c0
Merge remote-tracking branch 'refs/remotes/upstream/master' into luafix-master
2012-02-01 22:42:40 +08:00
minggo
1ae8f001b8
Merge pull request #702 from minggo/iss947_closed_loop
...
fixed #947 : fixed a closed loop
2012-02-01 02:22:02 -08:00
minggo
5e39489c71
fixed #947 : fixed a closed loop
2012-02-01 18:18:31 +08:00
minggo
56677be235
Merge pull request #701 from minggo/iss964_label
...
fixed #964 : compute correct height of a charactor
2012-02-01 02:05:50 -08:00
minggo
7b67c04f2f
fixed #964 : compute correct height of a charactor
2012-02-01 18:04:12 +08:00
YuLei Liao
ea89562271
* import CCLuaEngine
2012-02-01 16:55:46 +08:00
YuLei Liao
871e2b3b9c
* update tolua++ source files
2012-02-01 16:55:28 +08:00
YuLei Liao
e8e4de7077
* update lua source files
2012-02-01 16:48:40 +08:00
YuLei Liao
5a614a6e9b
* import lua module cjson, luasocket
2012-02-01 16:48:22 +08:00
YuLei Liao
9bdde0cb82
* remove script support
2012-02-01 16:45:23 +08:00
YuLei Liao
7685982081
* remove unused files for script support
2012-02-01 16:42:44 +08:00
dumganhar
5c65af137b
Merge pull request #695 from GermanMtz/master
...
fixed #963 : 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 #697 from dducharme/dalebranch
...
fixed #962 : 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 #696 from nkostelnik/master
...
fixed #961 : 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 #694 from minggo/iss959_touch_id
...
fixed #959 : make touch id correct on android
2012-01-30 22:57:04 -08:00
minggo
a2efab73a0
fixed #959 : 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 #692 from dumganhar/moveSel2CCObject
...
fixed #958 : 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 #958 : 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 #958 : move the implement of SelectorProtocol to CCObject
2012-01-30 15:31:59 +08:00
minggo
126558aa1d
Merge pull request #690 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
folecr
b0b5790e06
Simplify inclusion of cocos2d in Android NDK projects: Cocos2DX is the only module that importing projects need to add. Requires Android NDK r7.
...
* Uses NDK modules as the basis of the build system for Android NDK
* Add a cocos2dx module to generate a shared library named cocos2dx_shared. Library name is still libcocos2d.so
* The dependencies of this module are also Android NDK modules
* ... which are prebuilt static libraries from the png, jpeg and xml2 modules.
* Dependency library names set to libjpeg, libpng, etc. even though we are building variants with names like jpeg_shared.
2012-01-29 09:52:38 -08:00
folecr
e6fddbc047
Move libraries & include files for third party dependencies so that it is possible to create Android NDK Modules from prebuilt libs.
2012-01-29 09:33:17 -08: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 #688 from dumganhar/iss756_CCMenu_init
...
fixed #756 : CCMenu can't be initialized by using CCMenu::node() method.
2012-01-27 22:44:07 -08:00
dumganhar
49b57569c9
fixed #756 : CCMenu can't be initialized by using CCMenu::node() method.
2012-01-28 14:38:44 +08:00
folecr
a9d7500ae7
Fix whitespace line ending in one single line.
2012-01-25 18:14:29 -08:00
gzito
f40d3d3db8
Changed use of animation interval in game loop
2012-01-24 23:27:03 +01:00
YuLei Liao
f8dafe6712
* add CCNode::getChildrenCount()
2012-01-21 01:29:41 +08:00
YuLei Liao
279e915b55
* update tolua++ packages
2012-01-21 01:29:30 +08:00
YuLei Liao
26ab000906
* tmp
2012-01-21 01:15:05 +08:00
YuLei Liao
b79828a697
* merge lua fix
2012-01-21 00:47:51 +08:00
YuLei Liao
9660bcd165
* merge upstream/master to master
2012-01-20 19:08:21 +08:00
minggo
94342f85e0
Merge pull request #681 from krstns/master
...
fixed #953 : 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 #685 from dumganhar/iss940_replace_ico
...
fixed #940 : 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 #940 : replace .ico file with clear image for win32 template.
2012-01-19 11:58:37 +08:00
minggo
9bf4a228c7
Merge pull request #684 from dumganhar/iss952_bmfont_support
...
make CCLabelBMFont support other language, such as chinese, korean, japanese.
2012-01-18 18:52:00 -08:00