YuLei Liao
e31a1d0fa8
* add CC_LUA_ENGINE_README.mdown
2012-02-03 20:05:56 +08:00
YuLei Liao
c5fa5d75f8
* merge upstream/master to master
2012-02-03 15:16:33 +08:00
dumganhar
6fbf2f1d09
move SelectorProtocol to CCObject
2012-02-03 15:05:29 +08:00
folecr
3eeb0c8687
fix library name - the makefiles expect the full name of the library including the lib prefix
2012-02-02 23:01:50 -08:00
YuLei Liao
bc8051f607
* CCLuaEngine::executeTouchesEvent() convert touch positions to OpenGL coordinate
2012-02-03 14:32:57 +08:00
folecr
cab83bb4a6
Fix header file location to match convention in include directives in the cocos source
2012-02-02 20:07:37 -08:00
folecr
516c56a793
Add EXPORT_C_INCLUDES and correct the paths to third party modules
2012-02-02 20:04:29 -08:00
YuLei Liao
7ef0373c8b
* update lua application template files
2012-02-02 22:15:56 +08:00
YuLei Liao
4dbc5997f0
* update tolua++ packages
2012-02-02 22:15:34 +08:00
YuLei Liao
8b36c6901c
* update xcode4 lua template
2012-02-02 19:56:17 +08:00
YuLei Liao
1a5d4e00eb
* update xcode4 template generator
2012-02-02 19:56:05 +08:00
YuLei Liao
c4a7ec6d9a
* update xcode4 template generator
2012-02-02 19:14:01 +08:00
YuLei Liao
7ace6f6986
* remove unused include
2012-02-02 19:13:50 +08:00
YuLei Liao
1983949b68
* update project templates AppDelegate
2012-02-02 19:01:30 +08:00
YuLei Liao
92f99f7526
* change CC_LUA_ENGINE_ENABLED default value to 0
2012-02-02 19:01:12 +08:00
YuLei Liao
bfe8e752cf
* add CCLuaEngine::executeString()
2012-02-02 19:00:43 +08:00
dumganhar
7a5734977c
Merge pull request #704 from dumganhar/iss965_remove_some_dynamic
...
fixed #965 : Remove some dynamic_cast callings since selector_protocol.h was removed
2012-02-02 01:53:05 -08:00
dumganhar
f6d6d0dd49
fixed #965 : Remove some dynamic_cast callings since selector_protocol.h was removed
2012-02-02 17:46:45 +08:00
YuLei Liao
6539183499
* fix some issues
2012-02-02 16:35:19 +08:00
YuLei Liao
9c7826e716
Merge remote-tracking branch 'refs/remotes/upstream/master' into luafix-master
2012-02-02 15:58:22 +08:00
YuLei Liao
9164e90515
* fix some issues
2012-02-02 15:58:10 +08:00
minggo
cf2807b870
Merge pull request #703 from minggo/iss933_userdefault
...
refactor userdefault
2012-02-01 22:35:23 -08:00
YuLei Liao
712541d0ef
* update tolua++ packages
2012-02-02 14:26:38 +08:00
minggo
2b91b1c7cf
fixed #933 : free doc
2012-02-02 14:24:51 +08:00
minggo
591b7d0619
fixed #933 : profile CCUserDefault
2012-02-02 14:18:13 +08:00
YuLei Liao
1dd0330351
* add CCMenuItem script support
2012-02-02 10:39:36 +08:00
YuLei Liao
003fa1f1a0
* add some methods for fast read/write position
...
* add CCNode::getChildrenCount() for Lua
2012-02-02 10:39:19 +08:00
YuLei Liao
32ec256ffb
* add Touch event script support
2012-02-02 10:38:26 +08:00
YuLei Liao
9c29758222
* add Lua object reference ID to CCObject
2012-02-02 10:38:04 +08:00
YuLei Liao
47d88bfbba
* add macro defines for Lua engine
2012-02-02 10:37:21 +08:00
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