mustime
1092d04b7c
issue #1425 : fix "Issue1305" test case in ActionsTest
2012-08-31 18:22:43 +08:00
James Chen
629a033f71
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-08-31 18:18:49 +08:00
James Chen
7923848f5a
Merge pull request #1270 from dumganhar/gles20
...
issue #1404 : Updated authority for .sh files. Made them can be executable
2012-08-31 03:18:25 -07:00
James Chen
509abfc34c
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-08-31 18:16:55 +08:00
minggo
860d3eff4b
issue #1454 : make js binding work together with lua binding and native codes
2012-08-31 17:55:45 +08:00
James Chen
4c3c032ec5
issue #1404 : Updated authority for .sh files. Made them can be executable.
2012-08-31 14:54:10 +08:00
James Chen
0c1ab9597c
Merge pull request #1267 from John-cdy/gles20
...
issue #1404 : Add ios and mac os test scripts,update python and shell scr...
2012-08-30 22:54:35 -07:00
Caidongyang
59934dbb6a
issue #1404 : Add ios and mac os test scripts,update python and shell scripts.
2012-08-31 13:37:54 +08:00
YuLei
748d64ecc0
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-08-31 09:47:03 +08:00
Martin Sherburn
afd8391ca8
Fixed bug where texParams would get lost after reloading textures on android
2012-08-30 20:36:24 +01:00
James Chen
8e0bfe2186
Merge pull request #1264 from edbartley/gles20
...
fixed #1452 : CCRGBAProtocol must be public in order for actions like CCTintTo to have an affect on the CCScale9Sprite.
2012-08-30 08:31:01 -07:00
James Chen
a76b4280bc
Merge pull request #1265 from dumganhar/js
...
fixed #1451 : Merged new js-binding codes.
2012-08-30 08:26:31 -07:00
James Chen
e2629ef175
Fixed some compile errors on win32.
2012-08-30 23:10:09 +08:00
fish
847ccaff7d
CCRGBAProtocol must be public in order for actions like CCTintTo to have an affect on the CCScale9Sprite.
2012-08-30 10:39:36 -04:00
James Chen
e584b94728
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into js
...
Conflicts:
scripting/javascript/bindings/cocos2d_generated.cpp
2012-08-30 20:16:54 +08:00
James Chen
413066dfa6
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-08-30 18:34:59 +08:00
James Chen
bddd7df779
Merge pull request #1263 from dumganhar/gles20
...
Updated android template.
2012-08-30 03:31:18 -07:00
James Chen
9857337102
Updated android template.
...
In eclipse, please using import the created project.
2012-08-30 18:27:35 +08:00
minggo
85ff7386a6
Merge pull request #1262 from mustime/testlua
...
Testlua
2012-08-30 02:06:55 -07:00
mustime
55a9444186
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into testlua
2012-08-30 16:45:40 +08:00
mustime
e1db27fb0d
issue #1425 : add ActionsEaseTest & MotionStreakTest
2012-08-30 16:39:58 +08:00
mustime
2bfa5dfc1e
issue #1425 : fix a problem when handling touch event
2012-08-30 16:38:16 +08:00
mustime
2961666fbc
issue #1425 : add MotionStreakTest for TestLua
2012-08-30 15:55:13 +08:00
mustime
fc8cba66e0
issue #1425 : add ActionsEaseTest to TestLua
2012-08-30 15:35:04 +08:00
mustime
5ed3ec14e9
issue #1425 : update pkg and recreate LuaCococs2d.cpp
2012-08-30 15:33:54 +08:00
mustime
009d15845a
issue #1425 : update lua script
2012-08-30 15:32:29 +08:00
James Chen
f82f6605cc
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-08-30 10:52:17 +08:00
James Chen
323f837e86
Merge pull request #1261 from dumganhar/gles20
...
fixed #1448 : 'CCEGLView::sharedEGLView()->isRetinaEnabled()' always returns false when retina mode is enabled on win32.
2012-08-29 19:51:09 -07:00
James Chen
2ac2658612
Fixed a bug that 'CCEGLView::sharedEGLView()->isRetinaEnabled()' always returns false when retina mode is enabled on win32.
2012-08-30 10:43:54 +08:00
Rohan Kuruvilla
743478570c
Chipmunk support
...
* Changing CGPoint to cpVect
* Fix build and test code
2012-08-29 16:35:30 -07:00
folecr
4ebafb0ae3
Remove reference to Resources/JS. This code is not used in the test suite.
2012-08-29 15:59:48 -07:00
folecr
ab9528d94e
Merge @dumganahar's changes : Made new js-binding works ok on Win32.
2012-08-29 14:50:07 -07:00
James Chen
21547fb96f
Don't make CCScriptEngineProtocol inherits from CCObject since setScriptEngine is invoked only once in AppDelegate.cpp,
...
It will affect the lifecycle of ScriptCore instance, the autorelease pool will be destroyed before destructing ScriptCore.
So a crash will appear on Win32 if you close the game window.
2012-08-29 14:49:04 -07:00
James Chen
68e9210434
Modified the implementation of ScriptingCore::getInstance by using new operator.
...
Some implemented method should return default value.
2012-08-29 14:49:03 -07:00
James Chen
2dd0b9e0d3
Using '#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS)' instead of '#ifdef ANDROID' to make it compiled successfully on win32.
2012-08-29 14:49:03 -07:00
James Chen
708be4e474
Remove 'readFileInMemory' to make it compile ok on win32, initialized the member variables for ScriptingCore class.
2012-08-29 14:49:03 -07:00
James Chen
7c5b3c472e
Added CCParticleSystem::createWithTotalParticles.
2012-08-29 14:49:03 -07:00
James Chen
a2b5916301
Using 'getHashCodeByString(typeid(*native_obj).name())' instead of 'reinterpret_cast<long>(typeid(*native_obj).name());'.
...
Since on win32 platform, 'reinterpret_cast<long>(typeid(*native_obj).name());' invoking in cocos2d.dll and outside cocos2d.dll(in TestJavascript.exe) will return different address.
But the return string from typeid(*native_obj).name() is the same string, so we must convert the string to hash id to make sure we can get unique id.
2012-08-29 14:49:03 -07:00
James Chen
55423ed5b9
Moved '#include <stdint.h>' to 'platform/ios(android,linux,blackberry)/CCStdC.h' since win32 don't have a stdint.h.
2012-08-29 14:49:02 -07:00
James Chen
06f240fa5e
Moved '#include <stdint.h>' to 'platform/ios(android,linux,blackberry)/CCStdC.h' since win32 don't have a stdint.h.
2012-08-29 14:49:02 -07:00
James Chen
bbf3c4843a
Updated spidermonkey-win32 to FF14.0.1.
2012-08-29 14:48:41 -07:00
folecr
5b89e8d410
Update cxx-generator to latest version
2012-08-29 14:44:07 -07:00
minggo
af79357549
Merge pull request #1258 from John-cdy/gles20
...
issue #1404:Update android script files,and make more notes
2012-08-29 07:49:22 -07:00
James Chen
0eac64c259
Merge pull request #1260 from dumganhar/gles20
...
Commented some codes.
2012-08-29 06:56:11 -07:00
James Chen
d6e1d6b4fa
Commented some codes.
2012-08-29 21:50:09 +08:00
James Chen
9b9770ea80
Merge pull request #1259 from dumganhar/gles20
...
Updated templates for android,blackberry,win32 and ios.
[1] LAYER_CREATE_FUNC ~> CREATE_FUNC
[2] Updated hello.lua in Template folder.
2012-08-29 06:09:53 -07:00
James Chen
6a99431338
Updated hello.lua in Template folder.
2012-08-29 21:04:21 +08:00
James Chen
95419d2dea
Updated templates for android,blackberry,win32 and ios.
...
LAYER_CREATE_FUNC ~> CREATE_FUNC
2012-08-29 21:03:47 +08:00
YuLei
f14eccb6e5
[Mac] add miss CCLuaLog
2012-08-29 18:40:42 +08:00
Caidongyang
56e784701c
issue #1404:Update android script files,and make more notes
2012-08-29 18:23:46 +08:00