minggo
|
5ce4968524
|
merge from cocos2d-x master
|
2012-02-10 10:46:58 +08:00 |
minggo
|
bee77a7d9f
|
issue #973: add tool for mack
|
2012-02-10 10:43:36 +08:00 |
minggo
|
3c41164b23
|
Merge pull request #716 from minggo/iss971_rtti
build cocos2dx as static lib and remove some unneeded codes
|
2012-02-09 18:35:28 -08:00 |
minggo
|
6ae40fc12f
|
fixed #971: build cocos2dx as static lib
|
2012-02-10 10:31:56 +08:00 |
Walzer
|
0171304dae
|
Update README.mdown
|
2012-02-09 21:17:11 +08:00 |
YuLei Liao
|
c02aa9e666
|
* update windows vs2008 project
|
2012-02-09 20:08:13 +08:00 |
YuLei Liao
|
1d6d966717
|
fix CCScriptEngineManager::purgeSharedManager()
|
2012-02-09 20:07:55 +08:00 |
minggo
|
1123e6768e
|
Merge pull request #717 from minggo/master
fix a typo error
|
2012-02-09 02:18:40 -08:00 |
minggo
|
481f1c2532
|
fix a typo error
|
2012-02-09 18:17:25 +08:00 |
minggo
|
6988964a6e
|
refactor lua support
|
2012-02-09 18:12:45 +08:00 |
minggo
|
141dac47d3
|
Merge branch 'luafix-master' of https://github.com/dualface/cocos2d-x into lua_support_refactor
|
2012-02-09 17:58:39 +08:00 |
YuLei Liao
|
8b0d201850
|
update xcode4 lua template
|
2012-02-09 17:54:25 +08:00 |
YuLei Liao
|
e74b842a58
|
update HelloLua
|
2012-02-09 17:48:15 +08:00 |
minggo
|
357c825fa5
|
issue #971: set JavaVM at JNI_Onload()
|
2012-02-09 16:27:15 +08:00 |
minggo
|
95906c34bf
|
Merge branch 'luafix-master' of https://github.com/dualface/cocos2d-x into lua_support_refactor
|
2012-02-09 16:14:54 +08:00 |
minggo
|
153d2b8192
|
issue #971: build cocos2dx as static lib and remove some unneeded codes
|
2012-02-09 15:49:14 +08:00 |
YuLei Liao
|
1858b7be18
|
* remove lua exts
|
2012-02-09 14:13:01 +08:00 |
YuLei Liao
|
6ebdf9cb4b
|
* add CCScriptSupport
|
2012-02-09 14:07:11 +08:00 |
YuLei Liao
|
00d6ddd34e
|
* update luasocket 2.0.2 source files
|
2012-02-08 19:51:08 +08:00 |
YuLei Liao
|
5d50cf3308
|
* update lua 5.1.4 source files
|
2012-02-08 19:49:25 +08:00 |
minggo
|
ee08c4629e
|
Merge pull request #714 from minggo/ndk_module
fixed #970: use modules in the android ndk build
|
2012-02-07 19:16:01 -08:00 |
minggo
|
52de292e20
|
fixed #970: use modules in the android ndk build
|
2012-02-08 11:14:47 +08:00 |
dumganhar
|
437f27ff47
|
Merge pull request #713 from dumganhar/iss951_rm_NSMutableSet
fixed #951: removed definition of NSMutableSet.
|
2012-02-06 23:37:29 -08:00 |
dumganhar
|
ca94a11190
|
fixed #951: removed definition of NSMutableSet.
|
2012-02-07 15:35:10 +08:00 |
YuLei Liao
|
2b1f83a61b
|
add addLuaLoader(loader_Android)
|
2012-02-07 15:16:15 +08:00 |
minggo
|
29c18c67ca
|
Merge pull request #712 from minggo/ndk_module
Use modules in the Android NDK build
|
2012-02-06 22:36:45 -08:00 |
minggo
|
9249328afb
|
fixed #970: use modules in the Android NDK build
|
2012-02-07 14:34:30 +08:00 |
dumganhar
|
d83e18b7ba
|
Merge pull request #711 from dumganhar/iss967_pvr_tex_reload
fixed #967: PVR Textures cannot be reloaded after GL context lost on android.
|
2012-02-06 22:22:07 -08:00 |
YuLei Liao
|
5497d25e0f
|
remove unused wophone files
|
2012-02-07 13:36:43 +08:00 |
YuLei Liao
|
22cddb5240
|
* update hello.lua
|
2012-02-07 13:17:23 +08:00 |
YuLei Liao
|
7a96d13fb6
|
rename all FuncID to Handler
|
2012-02-07 11:43:29 +08:00 |
dumganhar
|
1e807d00c3
|
fixed #967: fixed PVR Textures can not be reloaded after GL context lost on android.
|
2012-02-07 11:18:39 +08:00 |
dumganhar
|
ee2139023a
|
Merge pull request #708 from Wartortle/master
fixed #969: Addition of Accelerometer Simulation for Win32.
|
2012-02-06 18:57:41 -08:00 |
minggo
|
8770976884
|
Merge branch 'android_ndk_modules' of https://github.com/folecr/cocos2d-x into ndk_module
|
2012-02-07 10:48:07 +08:00 |
minggo
|
3874450200
|
Merge pull request #710 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 #954: correct accelerometer data when set orientation to portrait in tablet
|
2012-02-07 10:19:40 +08:00 |
Wartortle
|
aa06de2fb3
|
Second half of commit for adding Accelerometer simulation to Win32.
|
2012-02-06 11:38:53 +00:00 |
Wartortle
|
ffc4457991
|
On Win32 platform, there's now support for simulating the Accelerometer
using the up/down/left/right/comma/period keys.
|
2012-02-06 11:29:28 +00:00 |
minggo
|
babbd64f0d
|
Merge pull request #691 from winbinar/master
fixed #626: Fix bug #626
|
2012-02-05 23:00:31 -08:00 |
YuLei Liao
|
4fe0c10e10
|
merge upstream/master
|
2012-02-06 10:54:51 +08:00 |
dumganhar
|
b32b4eebd6
|
Merge pull request #707 from moadib/qnx_fileutils
fixed #968: 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 |
YuLei Liao
|
19dc9e65e6
|
Merge commit '69a7e2a2e3c65ae0636b1edc20f87cc455abc28e' into luafix-master
|
2012-02-04 11:47:02 +08:00 |
YuLei Liao
|
d906d1b86c
|
Merge commit 'e31a1d0fa85118eca488a0fdee3c22fd2c3fb5c0' into luafix-master
|
2012-02-04 11:46:41 +08:00 |
YuLei Liao
|
69a7e2a2e3
|
* change unsigned int CCObject::m_uLuaID -> int CCObject::m_nLuaID, because LUA_INTEGER is int.
|
2012-02-04 11:34:17 +08:00 |
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 |