mustime
f070864429
issue #1425 : add NodeTest to TestLua
2012-08-31 18:26:27 +08:00
mustime
680e189365
issue #1425 : update lua script
2012-08-31 18:25:28 +08:00
mustime
1092d04b7c
issue #1425 : fix "Issue1305" test case in ActionsTest
2012-08-31 18:22:43 +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
YuLei
748d64ecc0
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-08-31 09:47:03 +08:00
James Chen
e2629ef175
Fixed some compile errors on win32.
2012-08-30 23:10:09 +08: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
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
009d15845a
issue #1425 : update lua script
2012-08-30 15:32:29 +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
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
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
mustime
289eb65dde
issue #1425 : fix a problem that missing "MainMenu"
2012-08-29 18:16:59 +08:00
mustime
c15c96ac28
Merge https://github.com/cocos2d/cocos2d-x into testlua
2012-08-29 17:29:33 +08:00
mustime
cc4573c3e4
issue #1425 : add ParticleTest to TestLua
2012-08-29 17:17:36 +08:00
mustime
df25d56cc3
issue #1425 : update pkg for tolua++ binding
2012-08-29 17:10:06 +08:00
folecr
143cd39269
-DCOCOS2D_JAVASCRIPT added to APP_FLAGS in Application.mk. Applied to all files.
2012-08-28 19:07:50 -07:00
folecr
51911d066d
Add flags : COCOS2D_JAVASCRIPT and COCOS2D_DEBUG=2
2012-08-28 17:44:01 -07:00
folecr
6f7cb44c62
Build script magic to deal with Image and Fonts on Android.
...
* Copy Images/* and Fonts/* into assets
* Ignore assets/Images and assets/Fonts directories when packaging
2012-08-28 17:44:01 -07:00
folecr
9fa24f07f5
Excluded *.pvr.gz from packaging
2012-08-28 17:44:00 -07:00
folecr
e00240c8aa
Rename Resources/JS to Resources/oldjs to avoid conflict with js
2012-08-28 17:44:00 -07:00
folecr
ab80fdd908
Add library reference to Cocos Android Java code
2012-08-28 17:44:00 -07:00
folecr
a03dc1f7e8
Generate an Android build.xml
2012-08-28 17:44:00 -07:00
folecr
148b67d374
Disable use of chipmunk
2012-08-28 17:44:00 -07:00
folecr
4256dc6830
Update makefiles
2012-08-28 17:43:58 -07:00
folecr
421d60e4f2
Package the js directory
2012-08-28 17:43:57 -07:00
folecr
f09bddd0f7
Add refernence to chipmunk static library
2012-08-28 17:43:56 -07:00
folecr
7017f772b2
Remove editor backup file
2012-08-28 17:43:56 -07:00
minggo
f0068209f3
Merge pull request #1252 from mustime/testlua
...
issue #1425 : add EffectTest to TestLua
2012-08-28 01:05:50 -07:00
mustime
22cf904038
issue #1425 : add EffectTest to TestLua
2012-08-28 15:44:09 +08:00
minggo
ff34cb7b39
issue #1425 : add icons for testlua
2012-08-28 14:34:22 +08:00
minggo
76410f4b5b
Merge pull request #1248 from mustime/testlua
...
Testlua
2012-08-27 23:18:22 -07:00
mustime
f63a719981
issue #1425 : fix the problem that missing Resources path
2012-08-28 14:14:09 +08:00
mustime
8ec843785c
issue #1425 : change the title from "HelloLua" to "TestLua"
2012-08-28 11:56:23 +08:00
mustime
4237ec42be
issue #1425 : add ios project for TestLua
2012-08-28 11:49:22 +08:00
mustime
9afede2474
issue #1425 : update lua files
2012-08-28 11:48:34 +08:00
mustime
567f4b15aa
issue #1425 : fix a problem when searching lua files on ios project
2012-08-28 11:47:06 +08:00
Rohan Kuruvilla
8d7516a0ef
Test project for cocos2d-x js.
2012-08-27 10:07:31 -07:00
minggo
d1f92b8da4
Merge pull request #1239 from mustime/testlua
...
Testlua
2012-08-27 02:45:29 -07:00
James Chen
ef906cd2ba
Merge pull request #1247 from dumganhar/gles20
...
Updated Makefiles for linux port.
2012-08-27 01:45:26 -07:00
James Chen
dd26a2fcd8
Updated Makefiles for linux port.
2012-08-27 16:43:02 +08:00
minggo
0e81fd0568
fixed #1442 : use CREATE_FUNC instead of SCENE_CREATE_FUNC and NODE_CREATE_FUNC
2012-08-27 16:11:07 +08:00
mustime
c0c3222238
issue #1425 : fix a typo error
2012-08-27 15:42:19 +08:00
mustime
fa3ec83eec
issue #1425 : fix a problem when copying files to assets
2012-08-27 15:35:25 +08:00
mustime
6ac99e687b
issue #1425 : fix a error when designating the Resources path
2012-08-27 15:09:27 +08:00
James Chen
28150573c6
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
2012-08-27 13:48:55 +08:00
James Chen
7ccb720104
Resource file searching implementation for blackberry.
...
Updated the package names of blackberry samples.
2012-08-27 13:48:17 +08:00
mustime
be116f5352
issue #1425 : update TestLua project
2012-08-27 11:43:47 +08:00
minggo
c7d365ca1c
Merge pull request #1231 from donaldalanmorrison/gles20
...
Gles20
2012-08-26 20:17:40 -07:00
minggo
6e2b718243
Merge pull request #1241 from minggo/gles20
...
add NULL as the last parameter to prevent crashing when creating CCSequence
2012-08-26 19:48:36 -07:00
minggo
a80c282844
add NULL as the last parameter to prevent crashing when creating CCSequence
2012-08-27 10:47:32 +08:00
mustime
f641602e6e
issue #1425 : update vs10 proj configuration for TestLua
2012-08-27 10:23:05 +08:00
James Chen
3d0b5bf455
fixed some warnings in java codes for android port.
2012-08-27 10:21:43 +08:00
mustime
7f55980259
issue #1425 : add copy commands to copy Resources to android/assets
2012-08-27 10:12:33 +08:00
mustime
6cc4eb8878
issue #1425 : remove copying Resources files commands in VS10
2012-08-27 10:04:30 +08:00
mustime
1b70d8193f
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into testlua
...
Conflicts:
samples/TestLua/proj.win32/TestLua.win32.vcxproj
2012-08-27 10:00:00 +08:00
Donald Alan Morrison
5075a83271
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
...
Conflicts:
cocos2dx/kazmath/src/ray2.c
2012-08-25 00:00:27 -07:00
Donald Alan Morrison
3eb3ebc67a
Fixed VS2010 Warning C4800: 'void *' : forcing value to bool 'true' or
...
'false' (performance warning).
2012-08-24 11:20:23 -07:00
James Chen
1a5dd4fbb0
Updated vs2010 project configuration for TestLua.
2012-08-24 18:42:03 +08:00
James Chen
86d1d457a1
Added vs2008 project for TestLua.
2012-08-24 18:27:47 +08:00
minggo
cb93713433
Merge pull request #1234 from minggo/gles20
...
use absolute path in CCFileUtils
2012-08-24 02:58:33 -07:00
minggo
bcd691ad9f
use absolute path in CCFileUtils
2012-08-24 17:55:29 +08:00
minggo
cf1d61f3de
Merge pull request #1232 from minggo/gles20
...
fix compiling error of linux
2012-08-24 01:09:37 -07:00
mingo
ba4d75a60e
issue #1445 : fix compiling error of linux
2012-08-24 15:53:26 +08:00
James Chen
8e67592df2
Updated project configures of blackberry port.
2012-08-24 14:57:44 +08:00
Donald Alan Morrison
3c7846e32f
Fixed VS2010 Warning: C4018: '<' : signed/unsigned mismatch
2012-08-23 23:35:25 -07:00
James Chen
85304b9441
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into dale_lua
2012-08-24 10:27:20 +08:00
mustime
4c7ad0d0d1
issue #1425 : testlua project
2012-08-24 10:23:23 +08:00
mustime
f55aedb5e9
issue #1425 : add android proj on TestLua
2012-08-24 10:18:59 +08:00
mustime
f67b513d08
issue #1425 : add android proj on TestLua
2012-08-24 10:07:15 +08:00
James Chen
26a31b21b3
issue #1429 : Removed mGLView variable in HelloCpp/HelloLua/TestJavascript class.
2012-08-24 00:24:04 +08:00
James Chen
ee3e68014b
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into android_editbox
2012-08-24 00:16:11 +08:00
James Chen
1685e5c497
issue #1429 : Used java code to implement keyboard layout.
2012-08-24 00:15:15 +08:00
minggo
83606d7691
Merge pull request #1212 from mustime/testlua
...
Testlua
2012-08-23 03:08:25 -07:00
minggo
37cb691600
fix some bugs while testing
2012-08-23 18:01:28 +08:00
mustime
36a99a099e
issue #1425 : add TestLua project
2012-08-23 16:10:50 +08:00
James Chen
06038163ca
iss1429: Finished using Dialog to implement CCEditBox for android port.
...
Next step:
Using Java codes to implement Cocos2dxEditBox. Don't use style.xml, color.xml and keyboard.xml.
2012-08-23 15:34:57 +08:00
minggo
d83cdbda09
fixed #1441 : put hd and ipad resources into separate directory
2012-08-23 14:20:32 +08:00
James Chen
a437099779
issue #1429 : Use activity to implement CCEditBox for android. Next step: use dialog to implement CCEditBox.
2012-08-23 09:42:28 +08:00
James Chen
9553031196
fixed #1112 : Lua support for blackberry port.
2012-08-22 18:48:57 +08:00
James Chen
dbd02b2726
Merge branch 'gles20' of https://github.com/dducharme/cocos2d-x into dale_lua
2012-08-22 18:28:11 +08:00
James Chen
bcbd161398
issue #1429 : First commit CCEditBox for android port.
2012-08-22 09:47:04 +08:00
Dale Ducharme
d76d9a6451
Adding lua scripting to BlackBerry port.
2012-08-21 13:32:28 -04:00
James Chen
fac3e9c8de
issue #1437 : fixed some compile errors.
2012-08-21 17:25:03 +08:00
James Chen
3eecc283d0
Merge branch 'iss1437_return_pointer' of https://github.com/minggo/cocos2d-x into iss1437_return_pointer
2012-08-21 16:57:41 +08:00
minggo
ba2049d086
iss1438_android_template
2012-08-21 16:45:23 +08:00
minggo
07ddd43695
issue #1437:make CCApplication::sharedApplication() return pointer
2012-08-21 15:28:43 +08:00
minggo
cfdc50fb60
issue #1437:make CCEGLView::sharedOpenGLView() return pointer
2012-08-21 14:58:31 +08:00
minggo
e2140aea0b
Merge pull request #1205 from minggo/gles20
...
use CCSprite::createWithSpriteFrame() to create a sprite
2012-08-20 02:29:34 -07:00
minggo
c854562b03
use CCSprite::createWithSpriteFrame() to create a sprite
2012-08-20 17:28:17 +08:00
James Chen
0861877594
kCCResolutionXXX -> kResolutionXXX and estimate whether touch point is contained in GL viewport rectangle.
2012-08-20 16:32:22 +08:00
James Chen
7eb5d85298
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into dale_bb
2012-08-20 15:49:24 +08:00
James Chen
6c9b4d3357
fixed #1420 : Merged gles20 branch of blackberry port from Dale's repo and fixed some bugs.
2012-08-20 15:49:02 +08:00
minggo
a8f2c74b9e
change TARGET_OS_IPHONE to TARGET_OS_MAC in TestCpp mac project
2012-08-20 15:42:56 +08:00
Dale Ducharme
4004a8ac61
Cocos2dx for gles2.
2012-08-17 17:45:21 -04:00
James Chen
f7fd4fc2bf
issue #1429 : Fixed a bug in EAGLView.mm.
2012-08-17 15:24:33 +08:00
James Chen
d3338a70e5
issue #1429 : Updated EditBoxTest and fix a bug about callback function.
2012-08-17 14:29:07 +08:00
James Chen
ce9c744f21
fixed #1419 : cocos2dx-test ~> TestCpp
2012-08-16 18:20:00 +08:00
James Chen
48fa8a4e88
fixed #1419 : Update eclipse project configurations for linux port.
2012-08-16 18:09:01 +08:00
James Chen
de2c00b7ae
issue #1405 : fixed some compile error on win32 and linux.
2012-08-16 11:30:25 +08:00
minggo
bcf61cdf26
issue #1405:use enum to distinguish target
2012-08-16 10:21:15 +08:00
James Chen
0fce637ec7
issue #1429 : First commit CCEditBox support, only valid on IOS. PLZ refer to ExtensionsTest/EditBoxTest.
2012-08-15 14:33:56 +08:00
mustime
42208f93aa
issue #1425 : change the interfaces in .pkg files to satisfy the current
...
version
2012-08-10 18:14:04 +08:00
James Chen
03c2366821
Merge branch 'minggo_res' of https://github.com/dumganhar/cocos2d-x into gles20
2012-08-09 17:50:39 +08:00
James Chen
6e2cace72d
Merge branch 'iss1405_multi_resolution' of https://github.com/minggo/cocos2d-x into minggo_res
2012-08-09 17:19:20 +08:00
James Chen
a7ce8f2e21
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into minggo_res
2012-08-09 17:16:10 +08:00
James Chen
3ff21fe275
fixed #1424 : http wrapper compiled ok on win32.
2012-08-09 17:04:55 +08:00
minggo
c31415b7bd
issue #1405:resolution supports on mac
2012-08-09 14:34:20 +08:00
James Chen
826dfe4102
issue #1405 : multi resolution works ok on win32. Add CCFileUtils::getResourceDirectory() method.
2012-08-09 12:49:33 +08:00
Walzer
08198c082e
issue #1424 , http wrapper has been tested on iOS, mac, android port.
2012-08-09 10:45:11 +08:00
minggo
c34812567f
issue #1405 : modify macro names and comment and add getVisibleSize and getVisibleOrigin in CCDirector
2012-08-09 10:23:39 +08:00
minggo
cc39dc55f4
issue #1405:remove unneeded functions of CCFileUtils
2012-08-08 18:39:33 +08:00
minggo
3395bba327
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1405_multi_resolution
2012-08-08 17:42:45 +08:00
minggo
3853611e62
issue #1405:support loading resources from directory defined by developer
2012-08-08 17:42:04 +08:00
Walzer
9ee50bb59a
issue #1424 , add doxygen comments, use httpbin.org interfaces in GET/POST before setting up our website.
2012-08-08 12:05:02 +08:00
Walzer
b094f70ab3
issue #1424 , http-get works ok. Tomorrow I will focus on post.
2012-08-07 18:28:07 +08:00
minggo
f6115d5667
issue #1405:zoom out work ok
2012-08-07 18:24:45 +08:00
minggo
5d8f909af4
issue #1405:multi resolution works ok
2012-08-07 14:29:46 +08:00
Walzer
39e45da8d9
Merge branch 'gles20' of https://github.com/greathqy/cocos2d-x into network
2012-08-06 15:36:13 +08:00
qingyun
054fe4993c
fix CCLog stack overflow
2012-08-06 14:47:23 +08:00
minggo
9ccf3cefdf
fixed #1417:add header search path and add CCTouch.cpp into mac project
2012-08-06 11:08:06 +08:00
qingyun
24136dc575
add CCHttpRequest and related tests to repository
2012-08-04 18:27:27 +08:00
qingyun
dc35596ce9
add greathqy to AUTHORS
2012-08-04 18:12:39 +08:00
James Chen
e9aa3743fa
issue #1405 : muti-resolution works ok on linux.
2012-08-03 13:56:18 +08:00
James Chen
9c26e38563
Merge branch 'gles20' of https://github.com/tongpengfei/cocos2d-x into linux_gles20
2012-08-03 10:10:33 +08:00
pengfei tong
a37fd743e0
[FIX] testjs
2012-08-02 16:23:31 +08:00
pengfei tong
c82c8412a8
[LOG] fix makefile
2012-08-02 13:19:40 +08:00
pengfei tong
b93d0b5ebf
[LOG] add linux port
2012-08-02 13:02:59 +08:00
minggo
5399aac590
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1405_multi_resolution
2012-08-02 10:50:15 +08:00
minggo
60983e8a02
Merge pull request #1147 from folecr/morefixandroidbuildscript
...
Further clean up of android build scripts and template
2012-08-01 19:45:18 -07:00
minggo
0b2396c54b
issue #1405:support three type of resolution
2012-08-01 16:56:12 +08:00
Walzer
cc3d850892
fixed #1416 , add object orientated APIs for CCGeometry, replace "CCFloat" with "float"
2012-08-01 15:30:12 +08:00
folecr
4d3df6145b
Cleaner build scripts
2012-07-31 22:56:18 -07:00
folecr
e69cda8fe2
Quoted use of bash variables
2012-07-31 22:56:17 -07:00
Walzer
dc37896ed9
change the param sequence of CCLabelTTF::create and initWithString, according to JS APIs
2012-08-01 13:24:23 +08:00
Walzer
0431cb455b
fixed #1413 , add CCTouch::getLocation(), getDelta() method
...
return OpenGL coordinates directly, to make the usage more convenient.
2012-07-31 17:41:53 +08:00
Walzer
b8fa32dbc0
use extensions/GUI instead of extensions/UI
2012-07-30 22:57:59 +08:00
folecr
200992b272
Cleaner build script
...
* Quoted parameters for bash directives
* Forgo the extra _LOCAL variables by testing environment variables
* Better path assumptions
* References
* http://stackoverflow.com/questions/59895/can-a-bash-script-tell-what-directory-its-stored-in
* http://stackoverflow.com/questions/228544/how-to-tell-if-a-string-is-not-defined-in-a-bash-shell-script
2012-07-27 17:45:21 -07:00
Nat Weiss
9f0be2de05
Added Mac cpp HelloWorld and Tests.
2012-07-24 19:07:31 -07:00
James Chen
fda669510a
fixed #1385 : Logic error in BitmapFontMultiLineAlignment.
2012-07-24 11:32:02 +08:00
James Chen
e7d7ff99c7
fixed #1386 : PauseResumeActionsTest crashes.
2012-07-24 11:21:08 +08:00
Walzer
685b70e6fb
fixed #1402 , résolve conflicting "create" functions
...
1. Following https://docs.google.com/document/d/1eqvYjVah0R9nkjzJ_ga1-_cyjHnizVQ5dyESYNpYM0s/edit?pli=1
2. use CCSequence/CCSpawn::initWithTwoActions, createWithTwoActions instead of initOneTwo, create(one, two).
3. haven't re-generate lua-binding to resolve the conflicts yet.
2012-07-23 22:49:11 +08:00
minggo
e249d6b0ce
Merge branch 'gles20' of https://github.com/walzer/cocos2d-x into modify_xcode_project
2012-07-23 15:38:24 +08:00
Walzer
cc23d0667d
unify Bundle ID for all xcodeprojects to "org.cocos2d-x.*", add icons for iphone/ipad * retina.
2012-07-23 15:23:26 +08:00
James Chen
d5f783b681
issue #1399 : Updated android template.
2012-07-23 14:56:40 +08:00
James Chen
2ab5e4ab9c
issue #1399 : Added vs2010 support.
2012-07-23 11:57:34 +08:00