James Chen
b120874a87
fix compilation errors.
2012-12-29 11:23:31 +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
James Chen
771b99a6b7
Merge pull request #1798 from dumganhar/gles20
...
Compilation warning fix for CCAssert macro.
2012-12-27 00:49:34 -08:00
James Chen
f159df2e13
Compilation warning fix for CCAssert macro.
2012-12-27 16:48:02 +08:00
minggo
4cdc984b0e
Merge pull request #1797 from dumganhar/gles20
...
fixed #1597 : TestCpp crashes when running ActionEaseTest after running ParticlesTest.
2012-12-27 00:10:53 -08:00
James Chen
b62d254f63
fixed #1597 : Added return pointer check.
2012-12-27 16:07:48 +08:00
James Chen
ac7755e68b
fixed #1597 : TestCpp crashes when running ActionEaseTest after running ParticlesTest
2012-12-27 15:42:55 +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
7fc07aea2f
Merge pull request #1796 from CocosRobot/updategeneratedsubmodule_1356586990
...
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2012-12-26 21:45:04 -08:00
CocosRobot
38e5b67cb5
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2012-12-27 13:43:19 +08:00
James Chen
4f859bf133
Merge pull request #1795 from dumganhar/bind-more-actions
...
Binded more actions to js.
2012-12-26 21:41:48 -08:00
James Chen
df5c6aae04
Binded more actions to js.
2012-12-27 13:38:48 +08:00
James Chen
f07987418c
Merge pull request #1794 from dumganhar/sync
...
fixed #1625 : Added stackable action support. Exchanged the order of parameter for 3d actions.
2012-12-26 20:50:32 -08:00
James Chen
c68884a121
issue #1625 : Updated EffectsTest.cpp and EffectsTest.lua.
2012-12-27 11:48:46 +08:00
James Chen
023b32a618
issue #1625 : Updated LuaCocos2d.cpp.
2012-12-27 11:48:14 +08:00
James Chen
d1c33960b2
issue #1625 : Updated lua pkg files.
2012-12-27 11:47:49 +08:00
James Chen
0e7934a8ce
Revert TestCpp/proj.win32/main.cpp.
2012-12-27 11:40:32 +08:00
James Chen
b4211c864e
fixed #1625 : Updated the submodule reference of cocos2d-js-tests.
2012-12-27 11:05:09 +08:00
James Chen
7d9f06b48c
fixed #1625 : Updated TestCpp. 'ccg' --> 'CCSizeMake' . And exchanged the parameter order for 3D action tests.
2012-12-27 10:55:25 +08:00
James Chen
bb486af6a7
Added stackable action support. Exchanged the order of action.
2012-12-26 18:59:31 +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
James Chen
989832480b
Merge pull request #1783 from fape/marm_accelero
...
marmalade acceleromater improvement
2012-12-25 21:51:58 -08:00
minggo
c5e62206e0
Merge pull request #1791 from minggo/gles20
...
issue #1603:delete space when setting language
2012-12-25 18:44:08 -08:00
minggo
d94e4c30b8
issue #1603:delete space when setting language
2012-12-26 10:42:35 +08:00
minggo
8b522c326c
Merge pull request #1790 from minggo/gles20
...
issue #1603:modify android resource path
2012-12-24 22:21:31 -08:00
minggo
e7ca426b3d
issue #1603:modify android resource path
2012-12-25 14:20:35 +08:00
minggo
c47553ece9
Merge pull request #1789 from minggo/gles20
...
issue #1603:modify windows auto-build script
2012-12-24 21:02:35 -08:00
minggo
79530616ea
issue #1603:modify windows auto-build script
2012-12-25 12:57:24 +08:00
James Chen
fe00f1645e
Merge pull request #1788 from dumganhar/gles20
...
Added COCOS2D_DEBUG=1 for libJSBinding.vcxproj of debug mode.
2012-12-24 19:34:55 -08:00
James Chen
a6ded65f59
Added COCOS2D_DEBUG=1 for libJSBinding.vcxproj of debug mode.
2012-12-25 11:33:36 +08:00
minggo
fb0a9d9058
Merge pull request #1787 from minggo/gles20
...
issue #1603:modify auto-building script
2012-12-24 19:12:40 -08:00
minggo
c3e44f0e26
issue #1603:modify auto-building script
2012-12-25 11:11:44 +08:00
James Chen
b5bcd27650
Merge pull request #1786 from dumganhar/iss1602-jsb-sys
...
issue #1620 : Made sys.localStorage support for jsb, works ok on win32 and android. Need to use sqlite3 to implement it, now we are using CCUserDefault.
2012-12-24 18:27:45 -08:00
James Chen
bdb4df293b
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1602-jsb-sys
2012-12-25 10:01:48 +08:00
James Chen
d611970027
Merge pull request #1785 from CocosRobot/updategeneratedsubmodule_1356400482
...
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2012-12-24 17:55:51 -08:00
CocosRobot
3de95c9362
cocos2dxmatoMac-mini : updating submodule reference to latest autogenerated bindings
2012-12-25 09:54:52 +08:00
James Chen
3789999dd5
Merge pull request #1784 from dumganhar/gles20
...
Updated cocos2dx.ini. Only skip CCNode::setPosition and CCSprite::setPosition.
2012-12-24 17:53:37 -08:00
James Chen
e301b9af1e
Updated cocos2dx.ini. Only skip CCNode::setPosition and CCSprite::setPosition.
2012-12-25 09:52:30 +08:00
fape
3550550568
marmalade acceleromater improvement
2012-12-24 17:24:10 +01:00
johnangel
08cd9e37fc
Setting PlatformToolSet to v110_xp for Visual Studio 2012 only.
2012-12-24 10:27:56 +01:00
minggo
ecc515c63f
Merge pull request #1782 from minggo/iss1623-simple_audio_engine
...
fixed #1623:use file descriptor instead of file path to create media pla...
2012-12-24 01:23:41 -08:00
minggo
df73cd12a6
fixed #1623:use file descriptor instead of file path to create media player
2012-12-24 17:20:44 +08:00
minggo
0f669114fc
Merge pull request #1775 from mingulov/music
...
CocosDenshion Android - missing sound effects with some conditions
2012-12-23 22:45:47 -08:00
minggo
7ca4934850
Merge pull request #1781 from minggo/iss1603-adjust-directory
...
issue #1603:modify some auto-building script
2012-12-23 22:27:59 -08:00
minggo
fab196dcbe
issue #1603:modify some auto-building script
2012-12-24 14:26:57 +08:00
James Chen
1f79603d26
Merge pull request #1780 from dumganhar/gles20
...
fixed #1622 : Crash occurs when cc.Node.getChildren is invoked if there are no children.
2012-12-23 19:56:25 -08:00
James Chen
cc7d383737
fixed #1622 : Crash occurs when cc.Node.getChildren is invoked if there are no children.
2012-12-24 11:55:04 +08:00
James Chen
22a2b34637
issue #1620 : Made sys.localStorage support for jsb, works ok on android.
2012-12-24 11:46:27 +08:00
James Chen
388159c8ba
Merge pull request #1779 from dumganhar/iss1621_linux64_eclipse
...
fixed #1621 : Adding linux 64bit target for eclipse project and fix compilation errors.
2012-12-23 19:20:06 -08:00