minggo
|
ffd0ca6c0e
|
Merge pull request #1804 from dualface/fix_ccassert_lua_compatibility
[luabinding] fix CCAssert Lua compatibility
|
2013-01-03 23:51:47 -08:00 |
dualface
|
e74e597dba
|
[luabinding] fix CCAssert Lua compatibility
|
2012-12-30 02:27:25 +08:00 |
James Chen
|
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 |
James Chen
|
9bd302e35b
|
fixed #1627: VS version check in project file.
|
2012-12-29 13:54:46 +08:00 |
dualface
|
d1e39a9c00
|
[luabinding] add CCDirector::setDisplayStats()
|
2012-12-29 11:16:07 +08:00 |
James Chen
|
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 |
minggo
|
0adc6abe30
|
Merge pull request #1776 from dualface/make_ccassert_compatible_lua
[luabinding] make CCAssert compatible Lua
|
2012-12-26 23:28:32 -08:00 |
James Chen
|
023b32a618
|
issue #1625: Updated LuaCocos2d.cpp.
|
2012-12-27 11:48:14 +08:00 |
dualface
|
09b1d9f520
|
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into make_ccassert_compatible_lua
|
2012-12-26 18:37:51 +08:00 |
dualface
|
57bccc7e4a
|
remove CC_LUA_ENGINE_ENABLED macro
|
2012-12-26 18:33:55 +08:00 |
johnangel
|
08cd9e37fc
|
Setting PlatformToolSet to v110_xp for Visual Studio 2012 only.
|
2012-12-24 10:27:56 +01:00 |
ivzave
|
fcce930188
|
repair linux eclipse build & add 64-bit project configurations
|
2012-12-22 07:14:59 +04:00 |
dualface
|
cc69e39c8a
|
[luabinding] make CCAssert compatible Lua
|
2012-12-22 10:13:37 +08:00 |
James Chen
|
6700a1c4ce
|
issue #1603: fixed some warnings for liblua.vcxproj.
|
2012-12-20 17:28:49 +08:00 |
James Chen
|
4660e72eda
|
issue #1603: Moved the position of some projects.
|
2012-12-20 12:58:21 +08:00 |
unknown
|
adb68ddbb6
|
Enable Windows XP support in Visual Studio 2012 Update 1.
Not tested with Visual Studio 2010, not sure will it work with PlatformToolset v110_xp.
|
2012-12-19 19:28:25 +01:00 |
dualface
|
98ea80329e
|
fix android compile warning
|
2012-12-14 18:01:54 +08:00 |
James Chen
|
190e6c1de5
|
Merge branch 'linux-lua' of https://github.com/dumganhar/cocos2d-x into lua-linux
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
|
2012-12-10 17:25:23 +08:00 |
dualface
|
f815cdc423
|
merge gles20
|
2012-12-10 17:00:16 +08:00 |
dualface
|
268aa45d2c
|
rename CCNode:scheduleUpdateScriptHandlerWithPriority() to CCNode::scheduleUpdateWhitPriorityLua()
remove unused functions
|
2012-12-10 16:09:23 +08:00 |
dualface
|
77d4da6e22
|
[lua] remove va_list
|
2012-12-10 14:28:26 +08:00 |
dualface
|
b6e605b9ae
|
[lua] fix CCSequence export
|
2012-12-10 14:19:18 +08:00 |
dualface
|
4ca6cf8c7a
|
[lua] update LuaCocos2d.cpp
|
2012-12-10 14:09:00 +08:00 |
dualface
|
c8753f72ef
|
[scripting] add CCNode::scheduleUpdateScriptHandlerWithPriority()
|
2012-12-10 13:48:27 +08:00 |
James Chen
|
6a7a365365
|
Updated eclipse project configurations for linux
|
2012-12-06 14:57:03 +08:00 |
James Chen
|
b044a89d6f
|
Merge branch 'gles20' of https://github.com/ivzave/cocos2d-x into linux-lua
Conflicts:
scripting/lua/cocos2dx_support/LuaCocos2d.cpp
|
2012-12-06 14:55:18 +08:00 |
minggo
|
75845b56c0
|
Merge pull request #1694 from dualface/update_luabinding
Update luabinding
|
2012-12-03 18:59:23 -08:00 |
minggo
|
bbcbfa71ef
|
Merge pull request #1704 from minggo/cclayer_script_support
Cclayer script support
|
2012-12-03 18:55:11 -08:00 |
James Chen
|
9f168faeb0
|
Merge pull request #1696 from fape/lua_marmalade
fixed #1591: Update for Lua marmalade.
* Add ignore marmalade generated Visual Studio directory
* Update Lua and HelloLua marmalade project file
* Add TestLua marmalade project
|
2012-12-03 18:51:39 -08:00 |
fape
|
aac98975da
|
update lua marmalade project
|
2012-12-02 15:29:10 +01:00 |
dualface
|
0e65257bc2
|
[luabinding] remove duplicate ccLanguageType
|
2012-12-02 16:17:17 +08:00 |
dualface
|
5bc95780c0
|
update luabinding
|
2012-12-02 15:48:15 +08:00 |
dualface
|
308a01e629
|
[luabinding] add tolua.isnull()
|
2012-12-02 15:29:00 +08:00 |
dualface
|
e0ee27cb17
|
[luabinding] fix CCLayer:getScriptTOuchHandlerEntry()
[luabinding] add CCLayer keypad, accelerometer support
|
2012-12-02 15:17:34 +08:00 |
minggo
|
542c407346
|
make lua work
|
2012-11-23 10:36:26 +08:00 |
minggo
|
33529afc07
|
Merge pull request #1592 from fape/luaCocos2d
fix compile: rename kOrientation to kCCTransitionOrientation
|
2012-11-19 17:36:25 -08:00 |
ivzave
|
28ca22bfde
|
added lua support for linux platform
|
2012-11-19 14:56:02 +04:00 |
James Chen
|
f2e0df4de3
|
issue #1565: Removed VS2008 support.
|
2012-11-19 14:42:27 +08:00 |
fape
|
355d8df79e
|
fix compile: rename kOrientation to kCCTransitionOrientation
|
2012-11-17 19:02:04 +01:00 |
James Chen
|
ceced09c2d
|
CCLuaEngine::executeAccelerometerEvent return 0 by default.
|
2012-11-12 10:37:42 +08:00 |
James Chen
|
833b5b1be8
|
Merge branch 'gles20' of https://github.com/mrmop/cocos2d-x into iss1557-marmalade
Conflicts:
cocos2dx/base_nodes/CCNode.cpp
cocos2dx/sprite_nodes/CCSprite.cpp
samples/TestCpp/Classes/TouchesTest/Ball.cpp
samples/TestCpp/Classes/VisibleRect.cpp
samples/TestCpp/Classes/VisibleRect.h
|
2012-11-12 10:20:04 +08:00 |
James Chen
|
21e4f80fbd
|
Added "executeAccelerometerEvent" for CCScriptEngineProtocol class. Exported Accelerometer event to JS.
|
2012-11-06 14:18:13 +08:00 |
James Chen
|
8ed7d63309
|
Updated LuaBindings codes since CCEGLViewProtocol::getSize has been renamed to CCEGLViewProtocol::getDesignResolutionSize.
|
2012-10-30 10:35:19 +08:00 |
Mat Hopwood
|
2b265929e2
|
Marmalade Sample data removed and merged changes
* Marmalade samples now use Resources folder, excess data removed
* Merged in James' changes
* CCNode::updateTransform() added
|
2012-10-25 21:40:37 +01:00 |
Mat Hopwood
|
24115675b0
|
Marmalade Cocos2d-x Main Repo Changes
These are changes to the main Cocos2d-x repo that Marmalade would like
to request for inclusion in the main repo
|
2012-10-19 16:38:58 +01:00 |
Mat Hopwood
|
988835560d
|
Marmalade Support
Full Marmalade support added for Cocos2d-x
|
2012-10-19 16:26:34 +01:00 |
johnangel
|
a2e1400402
|
Merge remote branch 'upstream/gles20' into gles20
|
2012-10-16 08:42:30 +02:00 |
James Chen
|
99a7dcefa4
|
issue #1486: Updated lua bindings.
|
2012-10-12 16:04:26 +08:00 |
johnangel
|
ad7dacc281
|
Merge remote branch 'upstream/gles20' into gles20
|
2012-10-08 16:35:43 +02:00 |
dualface
|
8d104b8244
|
[Lua] add CCApplication:getTargetPaltform()
|
2012-09-25 16:43:36 +08:00 |