minggo
88952396e4
Merge branch 'ptr_int_casting_issue' of https://github.com/ByungChoi/cocos2d-x into ptr_int
2012-09-24 15:16:30 +08:00
minggo
48f9df7680
fix conflict
2012-09-24 15:01:24 +08:00
walzer
78ef574962
add touch callback to HelloCpp. Users can learn setDesignResolution easily.
2012-09-24 14:14:53 +08:00
walzer
7088b19a1a
add sample code in HelloCpp & SimpleGame to teach how to adapt design resolution to different iPhone screens (HVGA, 3.5 inch retina, and 4.0 inch retina)
2012-09-24 13:59:16 +08:00
minggo
e20b933f1a
make TestJavaScript work and fix some warnings
2012-09-24 13:57:45 +08:00
walzer
ed936dcd48
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into adapt-4inch-iphone5
2012-09-24 12:03:36 +08:00
Walzer
5c5544f823
Merge pull request #1363 from walzer/gles20
...
fix ios6 orientation error, which is caused by ios6 api change.
2012-09-23 21:00:30 -07:00
James Chen
e4cee68688
Added libExtensions.lib for TestJavascript vs2010 project.
...
Removed some calling of 'USING_NS_CC;' in extensions.
2012-09-24 11:47:33 +08:00
James Chen
426915dd4a
fixed some compilation error for win32 platform.
2012-09-24 11:05:15 +08:00
walzer
5b3bb2a087
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20
...
Conflicts fixed:
cocos2dx/platform/ios/FontLabel/FontLabel.m
cocos2dx/platform/ios/FontLabel/FontLabelStringDrawing.m
template/xcode4/lib_js.xctemplate/TemplateInfo.plist
2012-09-24 11:03:26 +08:00
walzer
c50a62be7a
issue #1482 , fix typos, mehod -> method.
2012-09-24 10:54:03 +08:00
walzer
59a4b0460b
HelloCpp and SimpleGame teaches how to adapt on all iPhone/iPad multi-resolutions, especially for 4-inch retina screen.
2012-09-24 10:46:15 +08:00
Walzer
88b98faa88
fixed #1482 , fix orientation problem caused by ios6 api change.
...
AppDelegate.mm & RootViewController.mm are updated.
2012-09-23 20:24:51 +08:00
Byung Choi
dad0573b29
fixed build breakage for linux from change of test src name.
2012-09-22 03:18:26 +09:00
minggo
dca626eab0
Merge pull request #1357 from ByungChoi/linux_makefile
...
Linux makefile
2012-09-21 02:12:45 -07:00
minggo
0a1f0369e6
fixed #1481 : merge Nicolas's pull request and do some bug fixes
2012-09-21 17:01:19 +08:00
Byung Choi
a83b6a6261
updated sample/helloCpp debug & release makefile for linux
2012-09-21 15:35:41 +09:00
Byung Choi
4d04a1863b
make-all-linux now builds debug & release, testCpp also gets both
2012-09-21 14:34:05 +09:00
Walzer
c7ffe79baf
remove useless LOCAL_STATIC_LIBRARIES := curl_static_prebuilt in TestCpp/proj.android/jni/android.mk
...
The linking relationship is TestCpp -> cocos_extension_static -> cocos_curl_static now. Applications can link the extension library to use libcurl.
And this line still links curl_static_prebuilt which is not exist now, which made developers confused.
2012-09-21 10:10:17 +08:00
James Chen
9fabf3a45b
fixed #1470 : Made CCBReader support cocosbuilder v2.1-beta0.
2012-09-19 18:41:50 +08:00
minggo
8cdf73640b
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1470_cocosbuilder
2012-09-19 18:08:17 +08:00
minggo
2f3cdc6538
issue #1470:modify linux makefile and re-create xcode template
2012-09-19 18:05:10 +08:00
minggo
5e169eb0af
issue #1470 : put hd/ipad resources into corresponding directory
2012-09-19 17:54:45 +08:00
minggo
ebe092661b
issue #1470 : modify mac project and delete unneeded files
2012-09-19 17:50:30 +08:00
minggo
4bff6927b8
issue #1470:re-publish ccb
2012-09-19 17:43:11 +08:00
minggo
9db2df3f7b
issue #1470:modify resources path
2012-09-19 09:40:02 +08:00
folecr
5d816bfaf6
Verbose logging of build process
2012-09-18 17:08:37 -07:00
folecr
f54566ac03
More robust script exits on errors and ...
...
* Remove source build command (source repos for dependencies are not submodules)
2012-09-18 17:02:01 -07:00
minggo
4b969e35c8
issue #1470:implement animation
2012-09-17 18:49:05 +08:00
minggo
0c4b5dd3e9
issue #1470:fix some crashes
2012-09-17 15:31:07 +08:00
Donald Alan Morrison
4cbd993091
Minor English Spelling Corrections. A few grammar corrections.
2012-09-17 00:02:24 -07:00
minggo
0845e08fd3
issue #1470:update CCBReader to support Cocosbuilder v2.1 beta0
2012-09-17 14:27:17 +08:00
johnangel
fdec1ba4b9
Fixing include paths to be able to compile cocos2d-x using
...
external Visual Studio solution, without copying all files
2012-09-15 16:34:31 +02:00
James Chen
f4ddabb942
Updated "ant.properties" for TestJavascript project since it will ignore 'assets/Images, assets/Fonts' folder.
2012-09-15 15:36:31 +08:00
YuLei
209e44ff09
[Lua] update HelloLua
2012-09-11 17:31:21 +08:00
YuLei
ab6a476deb
update TestLua
2012-09-11 17:13:20 +08:00
James Chen
b6e4c98334
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into dualface-lua
2012-09-11 14:03:33 +08:00
James Chen
7d8b261ced
fixed #1477 : Abstracts Lua and JS binding protocol, some bugs fixes in lua-binding, adding custom menu on win32 and mac for switching resolutions.
2012-09-11 14:02:33 +08:00
James Chen
2572823b1a
Merge pull request #1301 from folecr/fix_android_module_location
...
fixed #1476 : Update location of spidermonkey-android makefile.
2012-09-10 18:53:02 -07:00
folecr
991d63eaad
Update location of spidermonkey-android makefile
2012-09-10 16:12:48 -07:00
James Chen
6a1aae95aa
Merge branch 'gles20' of https://github.com/dualface/cocos2d-x into dualface-lua
...
Conflicts:
cocos2dx/proj.mac/cocos2dx.xcodeproj/project.pbxproj
2012-09-10 17:00:22 +08:00
James Chen
c9ca584726
Merge pull request #1297 from dumganhar/tableview-win32
...
fixed #1458 : Adding CCTableView support.
2012-09-09 23:52:18 -07:00
James Chen
c9e1aa7adc
fixed #1458 : Updated TestCpp Makefile for linux port.
2012-09-10 14:50:19 +08:00
James Chen
6f3ee0299a
issue #1458 : Updated vs2010 project configuration.
2012-09-10 14:05:44 +08:00
James Chen
1460f4e42f
issue #1458 : Updated project configuration for all platforms.
...
CCTableView::viewWithSource --> CCTableView::create, adding TableViewTest.
2012-09-10 13:39:12 +08:00
YuLei
1254d08d5c
[Lua] fix: HelloLua
2012-09-10 12:23:45 +08:00
YuLei
d4128975f6
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-09-10 11:42:56 +08:00
James Chen
d9cc8fa346
issue #1458 : Adding CCTableView support. Updated win32 project configuration.
2012-09-09 22:34:32 +08:00
Walzer
11b5ae5cef
add proj.android to samples/SimpleGame, use getVisibleSize & getVisibleOrigin instead of getWinSize
2012-09-09 21:41:48 +08:00
Walzer
7e4615cd7b
upgrade Cocos2dSimpleGame to v2.0.2 framework, add it into samples folder
2012-09-09 20:20:29 +08:00
YuLei
58ea948cc8
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-09-07 19:21:15 +08:00
ThePickleMan
469584e8b8
Update samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.cpp
2012-09-04 23:53:17 -05:00
ThePickleMan
ea87d6304d
Update samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.cpp
...
Made the lower slider's value display too.
2012-09-04 23:52:18 -05:00
ThePickleMan
5cf699f668
Update samples/TestCpp/Classes/ExtensionsTest/ControlExtensionTest/CCControlSliderTest/CCControlSliderTest.cpp
...
Added a test for the restricted slider
2012-09-04 22:32:29 -05:00
YuLei
57566d0364
revert main.js
2012-09-04 09:53:58 +08:00
YuLei
e490035e2e
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-09-03 15:24:40 +08:00
James Chen
f11c849cfe
Merge pull request #1278 from edbartley/gles20
...
fixed #1456 : Remove code signing from MAC TestCpp project.
2012-09-02 07:49:12 -07:00
fish
8c29e9b1e2
Remove code signing from MAC TestCpp project.
2012-09-01 18:06:30 -04:00
YuLei
135f2fdabd
remove unused files
2012-09-02 01:13:52 +08:00
YuLei
6f3833af73
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-09-02 00:56:27 +08:00
YuLei
da79992275
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
2012-09-02 00:38:57 +08:00
James Chen
35f6f937c9
Merge pull request #1271 from mustime/testlua
...
issue #1425 : add NodeTest to TestLua.
2012-09-01 01:52:42 -07:00
James Chen
8e290cad6e
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1454_javascript
2012-08-31 23:29:02 +08:00
James Chen
94a1aa6123
issue #1454 : fixed bugs in test-particles.js.
2012-08-31 23:28:43 +08:00
minggo
dacf1704fc
issue #1454:use pvr instead of pvr.gz and fix a bug of build_native.sh
2012-08-31 23:16:36 +08:00
James Chen
f5a46d1d23
Merge pull request #1 from minggo/iss1454_javascript
...
issue #1454:modify ios project resources
2012-08-31 07:29:11 -07:00
minggo
1ea039d21d
issue #1454:modify ios project resources
2012-08-31 22:23:30 +08:00
James Chen
0d2c2b3bf8
issue #1454 : Updated win32 project configuration and some .plist files.
...
Removed old binding files.
2012-08-31 22:01:57 +08:00
James Chen
e7e954045a
issue #1454 : Updated TestJavascript/proj.android/build_native.sh.
2012-08-31 21:30:58 +08:00
James Chen
9ba5a1bfef
issue #1454 : Removed COCOS2D_JAVASCRIPT macro.
2012-08-31 21:23:23 +08:00
James Chen
dd8c993581
issue #1454 : Removed some duplicated resources files.
2012-08-31 19:50:20 +08:00
mustime
31655bb6ca
issue #1425 : add NodeTest to TestLua
2012-08-31 18:40:21 +08:00
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