James Chen
40a0beb7e5
Merge pull request #2958 from natural-law/develop
...
Update the JS binding of plugin.
2013-06-20 19:01:38 -07:00
James Chen
d1e26a46f0
Update AUTHORS [ci skip]
2013-06-21 11:00:14 +09:00
James Chen
dc802ced1e
Merge pull request #2955 from sbc100/nacl_develop_fixes
...
closed #2318 : Adding Native Client support for develop branch and some warnings fixes.
2013-06-20 18:58:40 -07:00
zhangbin
4671e45ab7
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
2013-06-21 09:49:52 +08:00
zhangbin
5ad116328f
Update the JS binding of plugin.
2013-06-21 09:43:28 +08:00
minggo
245dad8cd8
[ti ignore]
2013-06-21 09:25:14 +08:00
minggo
dfe202d431
Merge pull request #2754 from longlene/develop
...
smarter script for creating Android project
2013-06-20 18:23:53 -07:00
Ricardo Quesada
578bce4bc8
Re-adds 'CC' prefix to objective-c classes.
...
And also makes it compile on Mac, which was broken
2013-06-20 17:46:22 -07:00
loong0
1e6d5da5ac
merge the conflict copy_files.sh
2013-06-21 07:24:01 +08:00
Sam Clegg
60bfca0e45
[NaCl] Remove missing functions from lua stdlib.
...
NaCl doesn't support tmpfile() or exec() so remove
these from the lua stdlib build when building for NaCl.
2013-06-20 12:56:15 -07:00
Sam Clegg
2469045640
[NaCl] update build-nacl.sh
2013-06-20 12:56:15 -07:00
Sam Clegg
04d7d5a061
[NaCl] Add support for building using glibc toolchain.
...
BUG=
R=binji@chromium.org
Review URL: https://codereview.chromium.org/14694016
2013-06-20 12:56:14 -07:00
Sam Clegg
f1048557bd
[NaCl] Build for all nacl architectures
2013-06-20 12:56:14 -07:00
Sam Clegg
b5a509e65e
[NaCl] Don't cache font size
...
This avoids churn of the cached font when different
sizes of the same font are requested sequentially.
Review URL: https://codereview.chromium.org/14308007
2013-06-20 12:56:13 -07:00
Sam Clegg
5c4545de3c
[NaCl] Remove use of -lnosys
2013-06-20 12:56:13 -07:00
Sam Clegg
d3110c0a45
[NaCl] Recreate webstore zip archive each build.
2013-06-20 12:56:13 -07:00
Sam Clegg
47878c1855
[NaCl] Remove legacy nacl_mounts usage.
...
Also add nacl SDK version check to ensure the SDK contains
a recent version of nacl_io.
2013-06-20 12:56:12 -07:00
Sam Clegg
203d2e4559
Fix compile warnings in LuaOpengl.cpp
2013-06-20 12:56:12 -07:00
Sam Clegg
40766006bd
[NaCl] Fix NaCl build which had been disabled.
...
Since switching to C++11 the NaCL build was disabled.
This re-enables the ARM configuration which uses a
more recent version of gcc. This means that that NaCl
code paths will at least be test until we can find a way
to re-enable the X86 build.
2013-06-20 12:56:12 -07:00
Sam Clegg
ab1243e8dd
[NaCl] Disable http tests under NaCl
2013-06-20 10:56:26 -07:00
Sam Clegg
3686e8245f
[NaCl] Fix sigslot.h compilation on NaCl ARM
2013-06-20 10:54:11 -07:00
James Chen
9ac7088664
Merge pull request #2954 from dumganhar/develop
...
closed #2315 : [JSB] Iterating through cc.Node children causes crash.
2013-06-20 07:53:42 -07:00
James Chen
8b9090eb55
fixed #2315 : [JSB] Iterating through cc.Node children causes crash.
2013-06-20 22:51:54 +08:00
samuele3hu
71fe43ee97
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into scrollview_develop
2013-06-20 22:40:21 +08:00
samuele3hu
15c69563e2
issue #2276 : Add ScrollView lua binding and test sample
2013-06-20 22:39:30 +08:00
James Chen
032c07b735
Merge pull request #2953 from dumganhar/develop
...
issue #2129 : Removing CC prefix for template.
2013-06-20 07:22:04 -07:00
James Chen
d1bd34fd08
issue #2129 : Removing CC prefix for template.
2013-06-20 22:18:43 +08:00
James Chen
de0e683014
Merge pull request #2949 from dumganhar/develop
...
Bug fixes for the tool to generate luabindings.
2013-06-20 05:56:50 -07:00
James Chen
2ceec2f65d
Merge pull request #2947 from pyrasis/tizen_2.1
...
[Tizen] Fix compile error
2013-06-20 04:58:21 -07:00
James Chen
1b66a98390
Bug fixes for the tool to generate luabindings.
2013-06-20 19:00:23 +08:00
Lee, Jae-Hong
2f8b24d05c
Fix compile error.
2013-06-20 19:20:27 +09:00
James Chen
358cbde2a1
Merge pull request #2946 from dumganhar/develop
...
Compilation Fixes for WIN32
2013-06-20 03:05:13 -07:00
James Chen
8b2b95ab4d
[WIN32] class Action : public Object, public Clonable --> class Action : public Clonable, public Object
2013-06-20 18:02:37 +08:00
James Chen
6ce5064f32
[WIN32] NULL --> nullptr for CCLayer.cpp.
2013-06-20 18:01:53 +08:00
James Chen
a90f51d03a
Merge branch 'develop' of z:/Project/cocos2d-x into develop
2013-06-20 17:38:23 +08:00
James Chen
b37fbfdcc8
Merge pull request #2939 from growingdever/patch-3
...
Update create_project.py
2013-06-20 01:45:23 -07:00
James Chen
c99d39ec36
Merge pull request #2943 from CocosRobot/updategeneratedsubmodule_1371716731
...
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-06-20 01:38:50 -07:00
James Chen
d2199e85a9
Merge pull request #2944 from dumganhar/iss2129-format-codes3
...
issue #2129 : Removing CC prefix and renaming member variables for plugin module.
2013-06-20 01:37:49 -07:00
James Chen
6d60a77622
issue #2129 : Renaming variables.
2013-06-20 16:31:12 +08:00
James Chen
c2f0bcf167
issue #2129 : Warning fix in PluginUtils.h
2013-06-20 16:28:20 +08:00
James Chen
f3d08a8b4e
issue #2129 : Renaming member variables for plugin, m_XXX --> _XXX.
2013-06-20 16:27:50 +08:00
CocosRobot
e651c40d66
[AUTO] : updating submodule reference to latest autogenerated bindings
2013-06-20 08:25:36 +00:00
James Chen
d79ecd038c
Merge pull request #2942 from dumganhar/iss2129-format-codes3
...
closed #2129 : Removing CC prefix to make cocos2d-x more CPP friendly.
2013-06-20 01:19:49 -07:00
James Chen
e280815cfe
issue #2129 : Removing CC prefix for plugin module.
2013-06-20 16:02:39 +08:00
James Chen
36d82c9384
closed #2129 : Updating LuaCocos2d.cpp.
2013-06-20 15:10:44 +08:00
James Chen
150394d648
issue #2129 : Compatible with old class name exported to LUA, I mean keeping CC prefix for luabinding.
2013-06-20 15:10:14 +08:00
James Chen
14b07af56c
issue #2129 : CC_Reader --> _Reader.
2013-06-20 15:08:22 +08:00
minggo
9caa40590a
Merge pull request #2941 from minggo/iss2304-refator-cclayer
...
fix a crash on android
2013-06-20 00:06:55 -07:00
minggo
e39df16d49
use correct pointer to be closed
2013-06-20 15:03:51 +08:00
James Chen
9cbf513c9e
issue #2129 : jsb_CCXXX --> jsb_XXX
2013-06-20 14:58:33 +08:00