4a313e0ffe
Update CCLuaEngine.cpp
...
Null pointer check in order to prevent crashes.
2013-03-26 00:24:47 +04:00
196ff7228d
Updating CCLabelBMFont.pkg.
2013-03-20 16:05:45 +08:00
f57a751a48
fixed #1837 : Refactoring schedule binding codes.
...
* 1) We need bind cc.Node.scheduleUpdate and cc.Scheduler.scheduleUpdate manually since `schedules` need to be associated with _schedFunc_target_ht and _schedObj_target_ht
* 2) Bind cc.Scheduler.unscheduleCallbackForTarget.
2013-03-18 15:29:53 +08:00
815733e0b7
issue #1803:add SpriteOffsetAnchorRotationalSkewScale
2013-03-14 15:11:55 +08:00
c0b150c859
Cleanup the tolua++ bindings build system.
...
Update basic.lua to do all the required patching of
the output file without helper scripts such as
build.xml or build.php.
Update README file with current instructions.
Re-generate output file using new build system.
Add build.sh and build.bat for building on POSIX and
win32 respectively.
2013-03-08 11:09:10 -08:00
d5cdba484e
Merge branch 'master' into feature_1802
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-03-07 14:32:31 +08:00
6914c9d902
feature #1802:add touches lua test
2013-03-07 11:55:57 +08:00
44857e5137
Merge pull request #2093 from sbc100/linux_build_system
...
Linux build system
2013-03-06 19:09:49 -08:00
7ad171d8ee
Use same top level Makefile for nacl and linux builds.
...
Also, re-use some of the concepts from the linux build
system (such as quite by default) in the nacl build.
Fix remaining warnings in NaCl builds.
2013-03-06 13:02:55 -08:00
8677dad3c6
Improved build system from linux.
...
This change makes several fundamental improvements to the linux
build system:
- Remove duplication: a lot of the common make logic is now in
a central shared makefile: cocos2dx/proj.linux/cocos2dx.mk
- Quiet by default: unless you specify V=1 on the commandline
the output is now very clean and quiet.
- Dependencies: gcc's automatic dependancy generation is now
used (-MMD). This means that if you change a header file
then all the object that depend on it now get rebuilt.
- Don't store objects in the source tree: previously object
files were stored alongside the sources, which meant that
debug and release object clobbered each other which leads
to confusion and lots of unnecessary rebuilding.Q
- Library dependencies: each binary now depends on the libraries
it links aginst. This means that if the cocos2dx library
changes then all examples will get re-linked.
- Top level Makefile: there is now a top level Makefile that
can be shared/used by any platform the uses make as the
build system (for example NaCl). Everything can be built
by simply running 'make' at the top level. e.g:
make DEBUG=1
make DEBUG=1 clean
2013-03-06 13:02:55 -08:00
3aaa18f7f4
Merge branch 'master' into iss1425-lua
...
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
2013-03-06 20:39:01 +08:00
38878b084b
Fix all compiler warnings produced by gcc.
...
This allows the linux and NaCl builds (and perhaps others)
to be compiles with -Wall and -Werror, and it makes the build
output much less noisy.
2013-03-05 17:01:00 -08:00
bdbdbc27f5
issue #1425:exist lua test case is ok!
...
1.add some lua test case
2.add ccset.pkg
3.fixed ParticleSystem error in lua test case
2013-03-05 14:46:18 +08:00
33c422d1d5
Add new port: Native Client
2013-03-02 12:15:24 -08:00
dcb591eadb
Add missing ccGLServerState to CCNode.pkg.
...
Without this missing enum the resuling cpp file would generate
an unused function warning.
Also, remove the duplication between build_macosx.xml and build.xml.
They only differed in single property. Instead use build.sh, which
should work on all UNIXs, no just maxosx.
2013-03-02 11:28:04 -08:00
8867766241
issue #1425 : exist lua test case is ok.
...
1.fixed some bugs in some lua test case;
2.modify touch event and node event type;
3.fixed some bugs in CCParticleSystem.pkg
2013-03-01 17:09:42 +08:00
b4e13af460
issue #1425 :
1.fixed some bugs in .lua file. like this:local b = a:copy():autorelease()
...
2.fixed bug of CCShakyTiles3D's create() in CCActionTilesGrid.pkg
3.delete method copyWithZone in .pkg files
2013-02-28 10:23:30 +08:00
70612a722b
Fix CCRepeat#create is recieved bad argument on Lua binding.
...
CCRepeat#create must be recieved CCFiniteTimeAction as first argument.
But, CCActionInterval recieved in LuaCocos2d.cpp
2013-02-22 20:24:22 +09:00
ab00de629a
Removed the definition of the touch event type .
2013-02-20 12:06:12 +08:00
1b743b37c9
issue #1731:change CCSize, CCPoint and CCRect to struct in pkg files
2013-02-19 10:08:25 +08:00
0c5bcb3f7b
issue #1702:fix a typo error
2013-02-06 18:04:40 +08:00
8c261c1789
issue #1770 : Updating linux makefile.
2013-02-06 15:59:29 +08:00
c42ef7e44a
Merge pull request #1953 from dualface/add_CCFileUtils_Lua_support
...
issue #1687 : Adding CCFileUtils Lua support. Adding CCFileUtils::addSearchPath, addSearchResolutionsOrder.
2013-02-04 18:59:49 -08:00
4506214cef
issue #1689 : Adding some missing files.
2013-02-04 15:01:44 +08:00
07cd6d2bb2
issue #1689:modify lua samples to make them work correctly
2013-02-04 14:50:45 +08:00
5904512ac6
add CCFileUtils Lua support
2013-02-04 12:41:24 +08:00
a771bc8183
issue #1689:modify lua Android.mk
2013-02-04 12:02:21 +08:00
744bfb3cb2
Merge pull request #1945 from dualface/add_CCLuaObjcBridge
...
add CCLuaObjcBridge
2013-02-03 19:32:17 -08:00
74e497bb2b
restore CCLuaEngine missed methods
2013-02-04 11:28:09 +08:00
7839ceb45b
add CCLuaObjcBridge
2013-02-02 02:05:52 +08:00
3a9346e6ff
issue #1687 : Refactoring CCFileUtils, abstracting the same implementations for all platforms.
2013-02-01 11:20:46 +08:00
c80d438110
issue #1683 : Exporting `fullPathForFilename` to Lua.
2013-01-27 20:26:04 +08:00
f2303b854a
Fixed a typo, and regenerated luabinding codes.
2013-01-23 15:59:13 +08:00
5a41e1fc86
fixed compilation errors for lua project. Rebuild LuaCocos2d.cpp.
2013-01-22 14:40:54 +08:00
16269d952d
Detect VS2012 Update 1
2013-01-10 11:55:30 +01:00
674bb8e728
Setting PlatformToolSet to v110_xp instead of default v110 in Visual Studio 2012 for Windows XP support, leaving default v100 in Visual Studio 2010.
2013-01-07 11:51:05 +01:00
ffd0ca6c0e
Merge pull request #1804 from dualface/fix_ccassert_lua_compatibility
...
[luabinding] fix CCAssert Lua compatibility
2013-01-03 23:51:47 -08:00
e74e597dba
[luabinding] fix CCAssert Lua compatibility
2012-12-30 02:27:25 +08:00
0ee9cf027b
Merge pull request #1803 from dumganhar/iss1627-vs2012
...
fixed #1627 : VS version check in project file.
2012-12-28 22:54:04 -08:00
9bd302e35b
fixed #1627 : VS version check in project file.
2012-12-29 13:54:46 +08:00
d1e39a9c00
[luabinding] add CCDirector::setDisplayStats()
2012-12-29 11:16:07 +08:00
f2f3aa55bf
Merge branch 'gles20' of https://github.com/johnangel/cocos2d-x into iss-vs2012
...
Conflicts:
samples/Cpp/HelloCpp/proj.win32/HelloCpp.vcxproj
samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj
samples/Javascript/CocosDragonJS/proj.win32/CocosDragonJS.vcxproj
samples/Javascript/MoonWarriors/proj.win32/MoonWarriors.vcxproj
samples/Javascript/TestJavascript/proj.win32/TestJavascript.vcxproj
samples/Javascript/WatermelonWithMe/proj.win32/WatermelonWithMe.vcxproj
samples/Lua/HelloLua/proj.win32/HelloLua.vcxproj
samples/Lua/TestLua/proj.win32/TestLua.win32.vcxproj
scripting/javascript/bindings/generated
scripting/lua/proj.win32/liblua.vcxproj
2012-12-29 09:48:22 +08:00
0adc6abe30
Merge pull request #1776 from dualface/make_ccassert_compatible_lua
...
[luabinding] make CCAssert compatible Lua
2012-12-26 23:28:32 -08:00
023b32a618
issue #1625 : Updated LuaCocos2d.cpp.
2012-12-27 11:48:14 +08:00
09b1d9f520
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into make_ccassert_compatible_lua
2012-12-26 18:37:51 +08:00
57bccc7e4a
remove CC_LUA_ENGINE_ENABLED macro
2012-12-26 18:33:55 +08:00
08cd9e37fc
Setting PlatformToolSet to v110_xp for Visual Studio 2012 only.
2012-12-24 10:27:56 +01:00
fcce930188
repair linux eclipse build & add 64-bit project configurations
2012-12-22 07:14:59 +04:00
cc69e39c8a
[luabinding] make CCAssert compatible Lua
2012-12-22 10:13:37 +08:00
6700a1c4ce
issue #1603 : fixed some warnings for liblua.vcxproj.
2012-12-20 17:28:49 +08:00
flamingo