minggo
08dedfe9af
Merge pull request #3 from dumganhar/iss1555-update
...
issue #1555 : Made win32 works ok.
2012-11-16 01:19:13 -08:00
James Chen
c5b5b978fa
issue #1555 : Made win32 works ok.
2012-11-16 17:08:34 +08:00
James Chen
7601cc7e27
Merge branch 'iss1555-update' of https://github.com/minggo/cocos2d-x into iss1555-update
...
Conflicts:
cocos2dx/layers_scenes_transitions_nodes/CCLayer.cpp
2012-11-16 16:21:16 +08:00
minggo
9f8769a0e2
Merge pull request #1583 from dumganhar/iss1530-js-improvements
...
Merged PR #1579
2012-11-16 00:17:59 -08:00
James Chen
b95ff53747
Updated cocos2dx.ini.
2012-11-16 16:00:25 +08:00
James Chen
892cb6b352
issue #1530 : Using GCC4.2 compiler to build debug version of JSBinding projects since there is an unknown 'vm_protect' crash by using llvm.
2012-11-16 15:58:22 +08:00
James Chen
682faa5870
issue #1530 : Don't export CCUserDefault to js since it has a private constructor. Do it in the future.
2012-11-16 15:58:21 +08:00
James Chen
ee1a5a461d
issue #1530 : Updated cocos2d-js-test to the latest version.
2012-11-16 15:58:21 +08:00
James Chen
34f359384c
issue #1530 : Minor fixes in ScriptingCore.cpp, js_bindings_chipmunk_auto_classes.cpp and js_bindings_chipmunk_funcitons.cpp.
2012-11-16 15:58:20 +08:00
James Chen
def0cc8c39
issue #1530 : Updated TestJavascript.
2012-11-16 15:58:20 +08:00
James Chen
c2d8d118bf
issue #1530 : Updated MoonWarriors.
2012-11-16 15:58:19 +08:00
James Chen
7557a78e05
issue #1530 : Defined a macro 'snprintf' since it's named '_snprintf' on win32.
2012-11-16 15:58:19 +08:00
James Chen
bb6df91749
issue #1530 : Exported CCUserDefault to js.
2012-11-16 15:58:18 +08:00
James Chen
da7f3f2969
issue #1530 : Added empty implementation of 'CCAccelerometer::setAccelerometerInterval' for win32,blackberry,linux,mac and marmalade ports.
2012-11-16 15:56:51 +08:00
Rohan Kuruvilla
7381abffb3
Updating template for cocos2d-x JS
2012-11-16 15:56:31 +08:00
Rohan Kuruvilla
7305442803
Updating MoonWarriors project with new chipmunk bindings
2012-11-16 15:56:30 +08:00
Rohan Kuruvilla
28f2f94f13
Updating TestJavascript project to include object oriented chipmunk
2012-11-16 15:56:30 +08:00
Rohan Kuruvilla
f7848eb171
Adding Object Oriented Chipmunk JS bindings
2012-11-16 15:56:29 +08:00
Rohan Kuruvilla
6d59009953
Adding executeAccelerometerEvent for to CCScriptSupport and ScriptingCore
2012-11-16 15:56:29 +08:00
Rohan Kuruvilla
50fbf86180
Uncommenting accelerometer callback in CCLayer
2012-11-16 15:56:28 +08:00
Rohan Kuruvilla
5fb2c0892e
Updating jsb JS bootstrap files
2012-11-16 15:56:28 +08:00
Rohan Kuruvilla
39a4e6a19e
Fixing bindings bug for CCScheduler. Also adding custom bindings for TMXLayer. Also updating ini
2012-11-16 15:56:27 +08:00
Rohan Kuruvilla
66f85468e5
Adding JS conversion of CCDictionary objects, also modified CCArray conversion
2012-11-16 15:56:27 +08:00
Rohan Kuruvilla
672bed3ed0
Updating bindings for ONE_BY_ONE touch handling
2012-11-16 15:56:27 +08:00
Rohan Kuruvilla
f9aea7befe
Changing parameter ordering for callbacks (making thisObj optional). Also adding custom bindigns for CCScheduler
2012-11-16 15:56:26 +08:00
Rohan Kuruvilla
af3bc76062
Fixing script callbacks for schedule updates with negative and positive priorities
2012-11-16 15:55:34 +08:00
minggo
605771697a
Merge pull request #1566 from mingulov/unzip_crc
...
Zip support: broken CRC check / unzCloseCurrentFile
2012-11-15 23:31:14 -08:00
Lu Guanqun
17e23f61a7
remove unused private field in KeypadTest
2012-11-16 15:19:43 +08:00
minggo
6a1feb70bc
issue #1555:linux work ok
2012-11-16 15:16:55 +08:00
Lu Guanqun
8270ee3e48
fix -Wreorder warning
...
In the class definition, the field m_nScriptHandler is declared before
m_pCallFunc, so we should follow the order in initialization as well.
2012-11-16 15:10:25 +08:00
minggo
b497143f93
issue #1555:menu can receive touch event now
2012-11-16 14:51:48 +08:00
minggo
a4a53df159
issue #1555:build ok on android
2012-11-16 14:23:14 +08:00
Rolando Abarca
6e9d2e808c
improved debugger
2012-11-15 11:14:57 -08:00
Rolando Abarca
c9df076378
new JSStringWrapper
2012-11-15 11:14:37 -08:00
Rolando Abarca
2ea2cb616c
adds compartment code to chipmunk
2012-11-15 11:13:32 -08:00
Rolando Abarca
b894524ed0
removing some warnings
2012-11-15 11:13:21 -08:00
thbourlove
5f1476df36
Update tools/tolua++/build.php
...
If you run this:
tolua++ -o LuaCocos2d.cpp /path_to_cocos2d/cocos2d-2.0.3/tools/tolua++/Cocos2d.pkg
tolua++ will regard the 'cocos2d-2' as package name, but which you want is 'Cocos2d'(input file root name).
2012-11-15 19:25:08 +08:00
minggo
cb2bc37513
issue #1555 : make tests work
2012-11-15 18:34:23 +08:00
minggo
e19b418c62
issue #1555 : update to v2.1 beta3
2012-11-15 17:16:51 +08:00
James Chen
6d847989d6
Merge pull request #1576 from dumganhar/iss1557-marmalade
...
Merged PR #1570
2012-11-14 18:45:57 -08:00
James Chen
a3437d09df
issue #1557 : Fixed particle crash.We should check the file format by the file header when the format isn't defined.
2012-11-15 10:43:29 +08:00
James Chen
c79cac3af6
Merge branch 'gles20' of https://github.com/mrmop/cocos2d-x into iss1557-marmalade
2012-11-15 10:10:53 +08:00
Mat Hopwood
148a558405
Tiff support and resource location
...
* Tiff support added to CCImage
* CCFileUtils updated to support resource folders
* Examples updated to support multiple resolution assets
2012-11-14 17:46:09 +00:00
Ed Bartley
63b20ae7ea
Merge branch 'gles20' of github.com:cocos2d/cocos2d-x into gles20
2012-11-14 11:06:18 -05:00
minggo
a701eaecce
issue #1555:update to v2.1 beta3
2012-11-14 18:05:15 +08:00
minggo
5fd56370d8
issue #1555:fix a bug about CCGLProgram
2012-11-13 11:06:32 +08:00
minggo
6661f2c88d
issue 1555:add CCPhysicsSprite
2012-11-12 15:22:26 +08:00
James Chen
5d5eda1b3d
Update AUTHORS
2012-11-12 11:08:19 +08:00
minggo
bfa78a8d73
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1555-update
2012-11-12 11:02:30 +08:00
minggo
3eb2e7cd85
Update AUTHORS
2012-11-12 10:57:53 +08:00