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
df5c6aae04
Binded more actions to js.
2012-12-27 13:38:48 +08:00
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
d1c33960b2
issue #1625 : Updated lua pkg files.
2012-12-27 11:47:49 +08:00
c5e62206e0
Merge pull request #1791 from minggo/gles20
...
issue #1603:delete space when setting language
2012-12-25 18:44:08 -08:00
d94e4c30b8
issue #1603:delete space when setting language
2012-12-26 10:42:35 +08:00
8b522c326c
Merge pull request #1790 from minggo/gles20
...
issue #1603:modify android resource path
2012-12-24 22:21:31 -08:00
e7ca426b3d
issue #1603:modify android resource path
2012-12-25 14:20:35 +08:00
c47553ece9
Merge pull request #1789 from minggo/gles20
...
issue #1603:modify windows auto-build script
2012-12-24 21:02:35 -08:00
79530616ea
issue #1603:modify windows auto-build script
2012-12-25 12:57:24 +08:00
fb0a9d9058
Merge pull request #1787 from minggo/gles20
...
issue #1603:modify auto-building script
2012-12-24 19:12:40 -08:00
c3e44f0e26
issue #1603:modify auto-building script
2012-12-25 11:11:44 +08:00
e301b9af1e
Updated cocos2dx.ini. Only skip CCNode::setPosition and CCSprite::setPosition.
2012-12-25 09:52:30 +08:00
08cd9e37fc
Setting PlatformToolSet to v110_xp for Visual Studio 2012 only.
2012-12-24 10:27:56 +01:00
fab196dcbe
issue #1603:modify some auto-building script
2012-12-24 14:26:57 +08:00
380cadebce
issue #1603:modify some path for auto building
2012-12-21 18:06:36 +08:00
b0e752eac3
issue #1603:modify path of cocos2d-x
2012-12-21 17:40:54 +08:00
9beac15305
issue #1603 : modify some pathes
2012-12-21 15:05:22 +08:00
7b81217c3c
issue #1603:modify pathes for auto test
2012-12-21 14:06:20 +08:00
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
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
f815cdc423
merge gles20
2012-12-10 17:00:16 +08:00
65d81b0de7
fixed #1608 : Updated tools/tolua++/CCAction.pkg.
2012-12-10 16:50:02 +08:00
268aa45d2c
rename CCNode:scheduleUpdateScriptHandlerWithPriority() to CCNode::scheduleUpdateWhitPriorityLua()
...
remove unused functions
2012-12-10 16:09:23 +08:00
77d4da6e22
[lua] remove va_list
2012-12-10 14:28:26 +08:00
b6e605b9ae
[lua] fix CCSequence export
2012-12-10 14:19:18 +08:00
0662ceac9d
[lua] update export
2012-12-10 14:07:24 +08:00
86f6473270
[lua] fix invalid export
2012-12-10 14:04:56 +08:00
c8753f72ef
[scripting] add CCNode::scheduleUpdateScriptHandlerWithPriority()
2012-12-10 13:48:27 +08:00
d5533fcf15
fix a type information in CCBAnimationManager
2012-12-10 11:30:07 +08:00
48783d2224
Merge pull request #1662 from guanqun/fix-group-type
...
when user specified 'group' parameter, it should be parsed as an 'int'
2012-12-06 18:02:09 -08:00
cf25a8033a
Updated the submodule reference of cxx-generator.
2012-12-06 17:20:08 +08:00
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
320d532e15
add Hungarian language support
2012-12-05 11:31:05 +01:00
a256d35a5b
fix some confilcs
2012-12-05 14:01:05 +08:00
0e65257bc2
[luabinding] remove duplicate ccLanguageType
2012-12-02 16:17:17 +08:00
5bc95780c0
update luabinding
2012-12-02 15:48:15 +08:00
15d02e4db8
Merge branch 'iss1581-fix-jsbinding-bugs' of https://github.com/dumganhar/cocos2d-x into iss1583-js-tests
...
Conflicts:
scripting/javascript/bindings/cocos2d_specifics.cpp
2012-11-30 21:43:44 +08:00
344fc5ca6f
issue #1583 : Updated tools/tojs/cocos2dx.ini.
2012-11-30 21:16:34 +08:00
a814066601
issue #1581 : JSBinding bug fixes.
...
Some fixes of JSBinding codes:
[1] Check whether the proxy was already added in JS_NEW_PROXY
[2] In struct schedFunc_proxy_t, JSScheduleWrapper* --> CCArray*
Reason: One js function may correspond to many targets. To debug this, you could refer to JSScheduleWrapper::dump function. It will prove that i'm right. :)
[3] In ScriptingCore::cleanupSchedulesAndActions function, we must invoke unschedule for all targets and remove the proxy both in _schedFunc_target_ht and _schedTarget_native_ht, otherwise the hash tables will grow bigger and bigger, so I added a new function JSScheduleWrapper::removeAllTargetsForNatiaveNode to make this things easier.
[4] To easily find out the bugs of binding codes, I add JS_SetGCZeal in ScriptingCore::createGlobalContext, it only works in DEBUG mode.
[5] In js_cocos2dx_CCNode_getChildren, we should add the generated array to root to avoid gc happen when invoking JS_SetElement.
[6] The JSCallFuncWrapper isn't needed since an action will be run by a cc.Node and it will be released at the CCNode::cleanup.
[7] Some improvements of JSScheduleWrapper class.
[8] Added a new function JSScheduleWrapper::setTarget, it's for js_CCNode_unschedule to find out which target need to be unscheduled.
[9] Commented JS_SetReservedSlot in js_CCNode_scheduleOnce and js_CCNode_schedule.
Reason:
For js_CCNode_scheduleOnce: Don't add the callback function to the reserved slot of this js object.Since the class of js object may be inherited from cocos class(e.g. cc.Sprite). The subclass will not contain reserved slots. It will crash if invoking this.
For js_CCNode_schedule: Don't add js callback function to the reserved slot of scheduler js object. Since the scheduler is an object always rooted.
So the callback function might not be released when gc comes.I looked inside the implementation of cc.Node.schedule, and it doesn't use JS_SetReservedSlot there.
2012-11-28 22:04:55 +08:00
a37e034e61
added support for Japanese language
2012-11-28 17:53:10 +09:00
95ccf17739
Bind some functions for js:
...
void runAnimationsForSequenceNamedTweenDuration(const char *pName, float fTweenDuration);
void runAnimationsForSequenceNamed(const char *pName);
void runAnimationsForSequenceIdTweenDuration(int nSeqId, float fTweenDuraiton);
2012-11-28 11:49:20 +08:00
f64774ec6c
when user specified 'group' parameter, it should be parsed as an 'int'
...
Otherwise, when we do slicing, it would report type error.
2012-11-27 15:11:43 +08:00
bd025c94c3
use macro CC_TARGET_OS_IPHONE instead of TARGET_OS_IPHONE and make xcode template work ok
2012-11-26 15:08:40 +08:00
a1ebfd9ed8
Don't add CCNode::removeChild to skip field.
2012-11-23 15:12:42 +08:00
36bbd80b68
Adding changes to CCBreader
2012-11-23 15:08:55 +08:00
91b370e0f0
Merge pull request #1639 from minggo/gles20
...
make lua work
2012-11-22 18:38:44 -08:00
James Chen