Rohan Kuruvilla
|
7d90fc2254
|
Adding README files to each sample project
|
2013-03-04 11:50:39 -08:00 |
Rohan Kuruvilla
|
bb31ea232b
|
Updating project files for Javascript based sample projects
|
2013-03-04 11:50:39 -08:00 |
Rohan Kuruvilla
|
4d14afa686
|
Modifying C++ project files to remove dependency on scripting
|
2013-03-04 11:50:39 -08:00 |
Rohan Kuruvilla
|
4eed15c977
|
Adding eclipse project files for Javascript projects
|
2013-03-04 11:50:39 -08:00 |
Rohan Kuruvilla
|
1ba2b5d169
|
Adding eclipse project files for TestCpp and HelloCpp
|
2013-03-04 11:50:39 -08:00 |
minggo
|
a330309628
|
issue #1686:add background color layer in CCTexture2DTest
|
2013-03-04 11:53:06 +08:00 |
Sam Clegg
|
33c422d1d5
|
Add new port: Native Client
|
2013-03-02 12:15:24 -08:00 |
minggo
|
473538f6a8
|
Merge pull request #2074 from minggo/iss1686-synchronize
issue #1686:add () in defining a macro in RenderTextureTest.cpp
|
2013-03-01 02:38:27 -08:00 |
minggo
|
163ab2c0be
|
issue #1686:add () in defining a macro in RenderTextureTest.cpp
|
2013-03-01 18:37:37 +08:00 |
minggo
|
de808f6b58
|
Merge pull request #2073 from minggo/iss1686-synchronize
Fix some errors in TestCpp
|
2013-03-01 02:17:17 -08:00 |
minggo
|
f7802a0794
|
Merge pull request #2072 from yuezang/iss1425-luatest
issue #1425: exist lua test case is ok.
|
2013-03-01 01:17:15 -08:00 |
minggo
|
8c80210007
|
issue #1686:not invoke CCLayer::init() in LayerTest to enable receiving touch messages
|
2013-03-01 17:11:02 +08:00 |
wangshuai
|
8867766241
|
issue #1425: exist lua test case is ok.
1.fixed some bugs in some lua test case;
2.modify touch event and node event type;
3.fixed some bugs in CCParticleSystem.pkg
|
2013-03-01 17:09:42 +08:00 |
minggo
|
fb7642a332
|
issue #1686:change font size and fix a small bug in ActionTest
|
2013-03-01 11:25:40 +08:00 |
minggo
|
27b62952a4
|
issue #1686:draw polygon in CCFollowAction test case
|
2013-03-01 11:12:23 +08:00 |
minggo
|
70a70d38fc
|
Merge pull request #9 from dumganhar/iss1686-synchronize
issue #1686: Synchronizing LayerTest, LabelTest.
|
2013-02-28 00:48:32 -08:00 |
James Chen
|
3b3adc3eea
|
issue #1686: Synchronizing LayerTest.
|
2013-02-28 16:45:59 +08:00 |
minggo
|
b952634d8e
|
issue #1686:synchronized NodeTest
|
2013-02-28 16:41:39 +08:00 |
minggo
|
dbd5a4069e
|
issue #1686:synchronized ParticleTest
|
2013-02-28 16:40:32 +08:00 |
minggo
|
738b96e478
|
Merge branch 'iss1686-synchronize' of https://github.com/minggo/cocos2d-x into iss1686-synchronize
|
2013-02-28 16:37:00 +08:00 |
minggo
|
c75e440e22
|
issue #1686:synchronized RenderTexture
|
2013-02-28 16:35:42 +08:00 |
James Chen
|
9d4c128391
|
tab ~> 4 spaces
|
2013-02-28 16:06:07 +08:00 |
James Chen
|
16422d7194
|
issue #1686: Updated LayerTest.
|
2013-02-28 16:03:55 +08:00 |
James Chen
|
69a746fc8b
|
issue #1686: Synchronizing LabelTest
|
2013-02-28 15:57:15 +08:00 |
James Chen
|
dbe1e2e427
|
Merge branch 'iss1686-synchronize' of https://github.com/minggo/cocos2d-x into iss1686-synchronize
|
2013-02-28 15:37:15 +08:00 |
James Chen
|
88fe33e927
|
Sync ActionsTest.
|
2013-02-28 15:32:27 +08:00 |
minggo
|
545882cb81
|
issue #1686:synchronized ShaderTest
|
2013-02-28 15:01:41 +08:00 |
minggo
|
f5e334d9e3
|
issue #1686:synchronized Texture2DTest
|
2013-02-28 14:54:09 +08:00 |
James Chen
|
5abec07fb5
|
Updated ActionsTest.
|
2013-02-28 14:42:45 +08:00 |
James Chen
|
e4b6495aac
|
Updated ActionEaseTest.
|
2013-02-28 14:42:32 +08:00 |
wangshuai
|
b4e13af460
|
issue #1425:
1.fixed some bugs in .lua file. like this:local b = a:copy():autorelease()
2.fixed bug of CCShakyTiles3D's create() in CCActionTilesGrid.pkg
3.delete method copyWithZone in .pkg files
|
2013-02-28 10:23:30 +08:00 |
James Chen
|
3a465739c3
|
Updated cocos2d-js-tests.
|
2013-02-27 17:06:48 +08:00 |
James Chen
|
d572a53a1d
|
Merge pull request #2050 from dumganhar/tableview-touch-fix
fixed #1751: Clicking outside of CCTableViewCell will also get response when container size is smaller than view size.
|
2013-02-26 06:56:08 -08:00 |
James Chen
|
87935ac436
|
tableview touch area fix.
|
2013-02-26 19:59:14 +08:00 |
minggo
|
5a1e16f105
|
Merge pull request #2048 from minggo/iss1489-AssetsManager
add namespace to AssetsManager
|
2013-02-26 00:45:06 -08:00 |
minggo
|
e0991fbd67
|
fixed #1489:add namespace to AssetsManager
|
2013-02-26 16:43:46 +08:00 |
minggo
|
a07f2b1e03
|
Merge pull request #2047 from minggo/iss1489-AssetsManager
assets manager works ok
|
2013-02-26 00:32:01 -08:00 |
minggo
|
d35af7b6fe
|
fixed #1489:sample works ok
|
2013-02-26 16:29:52 +08:00 |
James Chen
|
efdb9180e4
|
fixed #1750: [iOS] CCEditBox's position is incorrect when it's added to a non-fullscreen CCNode.
|
2013-02-26 11:16:26 +08:00 |
James Chen
|
0ece3056ee
|
fixed #1749: Fixed compilation errors for win32.
|
2013-02-25 22:50:15 +08:00 |
James Chen
|
5fafaa8b67
|
Merge branch 'master' of https://github.com/neokim/cocos2d-x
Conflicts:
scripting/javascript/bindings/generated
|
2013-02-25 22:18:57 +08:00 |
James Chen
|
2eab8f75d4
|
Merge branch 'iss1489-AssetsManager' of https://github.com/dumganhar/cocos2d-x into minggo-iss1489-AssetsManager
|
2013-02-25 18:09:05 +08:00 |
James Chen
|
17d9837b45
|
Adds AssetsManager support for win32.
|
2013-02-25 18:03:38 +08:00 |
minggo
|
442e8ea0cc
|
issue #1489:android works ok
|
2013-02-25 16:58:10 +08:00 |
Neo Kim
|
93195ebe17
|
Modified a preprocessor line which distinguishes device platform in CCEditBox test code.
|
2013-02-25 15:44:38 +09:00 |
minggo
|
c8baa94753
|
issue #1489: update ios libcurl and add android project
|
2013-02-25 14:33:04 +08:00 |
minggo
|
27f093ea12
|
Merge branch 'iss1489-AssetsManager' of https://github.com/minggo/cocos2d-x into iss1489-AssetsManager
|
2013-02-25 10:26:26 +08:00 |
minggo
|
1ae332ac0b
|
Merge https://github.com/cocos2d/cocos2d-x into iss1489-AssetsManager
|
2013-02-25 10:25:24 +08:00 |
James Chen
|
a09220dfc8
|
New jsb tests (TableViewTest).
|
2013-02-23 22:09:20 +08:00 |
minggo
|
2d225437e5
|
Update samples/Cpp/AssetsManagerTest/README.md
|
2013-02-22 17:26:21 +08:00 |
minggo
|
32fbced31f
|
issue #1489:modify sample code and add readme
|
2013-02-22 16:02:53 +08:00 |
minggo
|
ed1cbb94c2
|
Merge https://github.com/cocos2d/cocos2d-x into iss1489-AssetsManager
|
2013-02-22 11:04:40 +08:00 |
minggo
|
91f5972b42
|
issue 1489:add AssetsManager
|
2013-02-22 11:04:09 +08:00 |
James Chen
|
b50515c5bc
|
Merge pull request #1873 from ThePickleMan/master
fixed #1742: Added 'rotationIsDir' property to ParticleSystem.
|
2013-02-21 19:02:39 -08:00 |
Neo Kim
|
a7c87f3b38
|
Add 'setFont' and 'setAnchorPoint' to CCEditBox
|
2013-02-20 22:41:08 +09:00 |
James Chen
|
9cc4b7ab29
|
fixed a bug of respond touch events in hello.lua. The event type is string now.
|
2013-02-20 12:03:21 +08:00 |
James Chen
|
a9fede525a
|
issue #1733: Marmalade ok.
|
2013-02-19 18:26:00 +08:00 |
James Chen
|
60ab4c4886
|
issue #1733: Updated linux makefile.
|
2013-02-19 18:06:30 +08:00 |
James Chen
|
fc1848eb02
|
issue #1733: Updated linux makefile.
|
2013-02-19 17:39:27 +08:00 |
James Chen
|
a94aa15031
|
issue #1733: Adding extension project for linux.
|
2013-02-19 17:28:49 +08:00 |
James Chen
|
339a60a649
|
Adding execute permissions for list.sh.
|
2013-02-19 14:21:56 +08:00 |
mutoo
|
4bc06c7fcb
|
changed fileformat of list.sh to unix
list.sh doesn't work in linux/mac due to its fileformat
|
2013-02-19 12:20:02 +08:00 |
James Chen
|
1d9e9e48bc
|
fixed #1724: Moved HelloJavascript to template folder and renamed it with "multi-platform-is".
|
2013-02-18 16:25:21 +08:00 |
James Chen
|
9add1d1b18
|
fixed #1724: Register CCBReader for HelloJavascript.
|
2013-02-18 15:10:32 +08:00 |
James Chen
|
c93758a785
|
issue #1724: Adding HelloJavascript project.
|
2013-02-18 14:38:00 +08:00 |
James Chen
|
2626005d20
|
issue #1712: Updating project setting for blackberry.
|
2013-02-17 16:26:08 +08:00 |
minggo
|
ba8f26fed9
|
Merge pull request #1969 from minggo/iss1702-writablePath
modify writable path for iOS and Android
|
2013-02-06 22:16:46 -08:00 |
fape
|
96b92e2bd7
|
Group tests under test "folder"
|
2013-02-06 14:52:18 +01:00 |
minggo
|
0c5bcb3f7b
|
issue #1702:fix a typo error
|
2013-02-06 18:04:40 +08:00 |
James Chen
|
fb9ac31d08
|
fixed bugs in CCUserDefault.cpp after using tinyXML2, fixed warnings in SpriteTest.cpp.
|
2013-02-06 17:20:54 +08:00 |
James Chen
|
8c261c1789
|
issue #1770: Updating linux makefile.
|
2013-02-06 15:59:29 +08:00 |
James Chen
|
cc690c5a86
|
issue #1770: Adding webp support for mac port.
|
2013-02-06 13:06:48 +08:00 |
James Chen
|
1e5431bcc5
|
issue #1770: Adding webp support for blackberry and marmalade.
|
2013-02-06 10:52:13 +08:00 |
James Chen
|
64248386a2
|
issue #1770: Updating iOS project configuration and adding WEBP test demo.
|
2013-02-05 11:37:13 +08:00 |
minggo
|
07cd6d2bb2
|
issue #1689:modify lua samples to make them work correctly
|
2013-02-04 14:50:45 +08:00 |
minggo
|
a771bc8183
|
issue #1689:modify lua Android.mk
|
2013-02-04 12:02:21 +08:00 |
James Chen
|
a22986bc82
|
Using new api of CCFileUtils for SimpleGame.
|
2013-02-03 15:38:44 +08:00 |
James Chen
|
c362f7e439
|
issue #1687: Adding new test - Checking whether file exists.
|
2013-02-01 22:18:43 +08:00 |
James Chen
|
157e229f8c
|
fixed #1634: Added the very first implementation of CCEditBox for Win32.
|
2013-01-31 14:04:49 +08:00 |
James Chen
|
3bdfb82e9c
|
Merge branch 'gles20' of https://github.com/jpridavok/cocos2d-x into win32-editbox
Conflicts:
samples/Cpp/TestCpp/proj.win32/TestCpp.vcxproj.filters
|
2013-01-30 22:31:19 +08:00 |
James Chen
|
8192735577
|
Updating JS Tests.
|
2013-01-29 22:30:01 +08:00 |
James Chen
|
5e7ca24335
|
Updating win32 project configurations.
|
2013-01-29 19:04:57 +08:00 |
minggo
|
4d9877617b
|
Merge pull request #1863 from rohankuruvilla/gles20
Adding Readme for CocosPlayer
|
2013-01-29 02:51:18 -08:00 |
minggo
|
fb1a32e696
|
Merge pull request #1923 from dumganhar/master
Updating doxygen comments for CCFileUtils.h.
|
2013-01-29 02:50:16 -08:00 |
James Chen
|
e1f6c37c2f
|
Updating file search logic for CocosDragonJS.
|
2013-01-29 18:48:19 +08:00 |
minggo
|
aa306d637e
|
Merge pull request #1926 from minggo/master
Synchronize from upstream
|
2013-01-29 02:16:29 -08:00 |
minggo
|
f8d6ee0b83
|
update codes from upstream
|
2013-01-29 18:15:49 +08:00 |
minggo
|
eb72ac3b50
|
update js-tests codes from upstream
|
2013-01-29 18:05:30 +08:00 |
Rohan Kuruvilla
|
af86f534dc
|
Adding readme file for CocosPlayer for Android
|
2013-01-29 01:45:16 -08:00 |
James Chen
|
c1d0f29f6c
|
Updating JS Test, Removing wav files in Published-Android.
|
2013-01-29 13:33:49 +08:00 |
James Chen
|
001d3382a9
|
[TestCpp/EffectsAdvancedTest] Adding getPosition method for Len3DTarget.
|
2013-01-29 12:59:43 +08:00 |
James Chen
|
bf571ace53
|
Updating JS Tests.
|
2013-01-29 09:59:16 +08:00 |
James Chen
|
2694cb150b
|
CCFileUtils::s|gSearchPath -> CCFileUtils::s\gSearchPaths.
|
2013-01-29 09:56:38 +08:00 |
minggo
|
3ea562b4ad
|
fix some logical errors and compiling errors
|
2013-01-28 23:19:57 +08:00 |
minggo
|
ba9308089c
|
fix some errors in xcode template
|
2013-01-28 21:53:55 +08:00 |
James Chen
|
2e421304ca
|
Merge pull request #1911 from dumganhar/iss1683-ccfileutils
issue #1683: Updating CCFileUtils for Blackberry and Marmalade.
|
2013-01-28 05:43:41 -08:00 |
minggo
|
fae7d5beeb
|
Merge pull request #1910 from minggo/master
fix some warnings
|
2013-01-28 05:42:46 -08:00 |
minggo
|
52a4b15659
|
remove unneeded codes
|
2013-01-28 20:57:49 +08:00 |
minggo
|
5eb8ca30fb
|
fix some warings
|
2013-01-28 20:52:56 +08:00 |
minggo
|
8d889cd0be
|
Merge pull request #1909 from minggo/master
add correct resource into CocosDragon iOS project
|
2013-01-28 04:47:31 -08:00 |
minggo
|
aaf4b14ddf
|
add fileLookup.plist for CocosDragon iOS project
|
2013-01-28 20:46:15 +08:00 |
minggo
|
9e5d0100fe
|
remove unneeded resource for CocosDragon iOS project
|
2013-01-28 20:41:43 +08:00 |
minggo
|
05363ee8dd
|
Merge pull request #1908 from minggo/master
fix some warnings
|
2013-01-28 04:36:01 -08:00 |
minggo
|
249b935be8
|
fix some warnins
|
2013-01-28 20:34:52 +08:00 |
James Chen
|
59f2ae13f8
|
issue #1683: Updating CCFileUtils for Blackberry and Marmalade.
|
2013-01-28 20:12:48 +08:00 |
James Chen
|
031380d4e9
|
issue #1683: Updating CCFileUtils.cpp for Win32.
|
2013-01-28 19:49:34 +08:00 |
James Chen
|
733a334ec2
|
issue #1683: Fixed compilation errors for linux.
|
2013-01-28 18:32:34 +08:00 |
James Chen
|
632f99b611
|
issue #1683: Updating CCFileUtils for MAC.
|
2013-01-28 17:54:49 +08:00 |
James Chen
|
e736ed487f
|
issue #1683: Adding default search path if developer didn't pass it.
|
2013-01-28 17:44:53 +08:00 |
James Chen
|
16ef70c069
|
issue #1683: Updating FileUtilsTest.cpp.
|
2013-01-28 17:43:53 +08:00 |
James Chen
|
f69ef6182c
|
issue #1683: Adding FileUtilsTest.
|
2013-01-28 15:17:20 +08:00 |
James Chen
|
c19b9885fe
|
Adding COCOS2D_DEBUG=1 for sample projects.
|
2013-01-28 10:22:32 +08:00 |
James Chen
|
d532670640
|
Removing some CCLOG.
|
2013-01-27 20:16:46 +08:00 |
James Chen
|
eec0ba3c19
|
Getting full path in before playing sound.
|
2013-01-27 19:20:49 +08:00 |
James Chen
|
af1eb5fa87
|
issue #1683: Updated Appdelegate.cpp for CocosPlayer.
|
2013-01-26 22:57:12 +08:00 |
James Chen
|
e73e2f4387
|
issue #1683: Updated the name of CocosPlayer project.
|
2013-01-26 22:35:30 +08:00 |
James Chen
|
119115502d
|
issue #1683: Making some api of CCFileUtils more c++ friendly by using std::vector rather than CCArray.
|
2013-01-26 22:31:57 +08:00 |
James Chen
|
eeb5e7a115
|
Updated JS Tests.
|
2013-01-26 14:45:26 +08:00 |
James Chen
|
688f9b2546
|
Updated JS Tests.
|
2013-01-26 14:29:06 +08:00 |
James Chen
|
a28a5907c3
|
Updated JS Tests.
|
2013-01-26 12:11:16 +08:00 |
James Chen
|
fde39c6dcb
|
Adding cache support for CCFileUtils.
|
2013-01-25 21:52:35 +08:00 |
James Chen
|
6f3b22031f
|
Using new API of getting full path for file name.
|
2013-01-25 20:51:52 +08:00 |
James Chen
|
cf93281419
|
Updating JS Tests.
|
2013-01-25 17:29:35 +08:00 |
Rohan Kuruvilla
|
f050fc9f08
|
Allowing resolution being sent to CocosBuilder to be set by AppDelegate
|
2013-01-25 00:30:12 -08:00 |
Rohan Kuruvilla
|
6fdbff537a
|
Fixing run and reset buttons being enabled by default
|
2013-01-24 23:32:00 -08:00 |
Rohan Kuruvilla
|
6d0d9e7375
|
Refactoring a bit to allow JNI cleanCache call
|
2013-01-24 23:27:19 -08:00 |
Rohan Kuruvilla
|
9532e5e6c7
|
Chaning name sent to CCB
|
2013-01-24 22:19:49 -08:00 |
Rohan Kuruvilla
|
dcde99d568
|
Adding Binary Plist parsing library
|
2013-01-24 22:19:45 -08:00 |
Rohan Kuruvilla
|
43229cb440
|
Adding CocosPlayerJS for Android
|
2013-01-24 18:37:24 -08:00 |
James Chen
|
5e65745795
|
Updated iOS project configuration.
|
2013-01-24 14:44:44 +08:00 |
James Chen
|
7589be6fb7
|
Refactoring CCFileUtils for win32. CrystalCraze works ok on WIN32 now.
|
2013-01-24 13:56:50 +08:00 |
James Chen
|
9b3f9503ea
|
Updated JS Tests.
|
2013-01-24 11:39:11 +08:00 |
James Chen
|
1180a98eb9
|
Updated submodule reference for cocos2d-js-tests.
|
2013-01-24 00:37:39 +08:00 |
James Chen
|
46f38c57fb
|
issue #1661: CrystalCraze works ok on android.
|
2013-01-24 00:32:22 +08:00 |
James Chen
|
8cfd912a06
|
CrystalCraze works ok on iOS.
|
2013-01-23 23:17:44 +08:00 |
James Chen
|
294509c4c0
|
Merge branch 'master' of https://github.com/dumganhar/cocos2d-x into myccfileutils
|
2013-01-23 19:52:17 +08:00 |
James Chen
|
2b9f79efc0
|
Merge pull request #1882 from dumganhar/memoryleak-action
Fixed memory leaks in CCActionCatmullRom class.
|
2013-01-22 22:41:44 -08:00 |
James Chen
|
b5efd699bf
|
Fixed a memory leak in ActionsTest.
|
2013-01-23 14:40:11 +08:00 |
James Chen
|
de8a237d73
|
Merge pull request #1881 from dumganhar/linux-fix
fixed #1676: Refactoring Makefile and eclipse project configuration for LINUX port.
|
2013-01-22 03:22:41 -08:00 |
James Chen
|
3f57b01f94
|
Fix for 32bit.
|
2013-01-22 18:30:16 +08:00 |
James
|
1d7650767b
|
Updated Makefile and project configurations for linux port.
|
2013-01-22 16:45:35 +08:00 |
James Chen
|
219657ee1a
|
Merge pull request #1872 from moadib/android_manifest_gles20
fixed #1673: Added <uses-feature android:glEsVersion="0x00020000"/> to AndroidManifest.
|
2013-01-21 23:52:32 -08:00 |
James
|
680fbe3517
|
Fixed compilation errors for linux port.
|
2013-01-22 15:21:37 +08:00 |
James Chen
|
0187bb6504
|
Merge pull request #1876 from dumganhar/iss1639-custom-property
fixed #1639: Added custom property support for CCBReader.
|
2013-01-21 23:03:53 -08:00 |
James Chen
|
a3dbfaafd3
|
Merge pull request #1856 from funkaster/master
fixed #1660: Some fixes to the js debugger.
|
2013-01-21 17:54:39 -08:00 |
PickleMan
|
c4d5bf8c85
|
Added test for rotation is dir in particle system
|
2013-01-21 12:35:59 -05:00 |
ivzave
|
737fc4ce9e
|
do not overwrite existing resources in TestLua
|
2013-01-21 18:01:57 +04:00 |
James Chen
|
c0d568da9b
|
fixed #1639: Added custom property support for CCBReader.
|
2013-01-21 18:37:17 +08:00 |
moadib
|
e39829269d
|
Added <uses-feature android:glEsVersion="0x00020000" /> to AndroidManifest.xml
|
2013-01-21 13:03:55 +04:00 |
James Chen
|
4a68e4ab89
|
fixed #1670: Fixed memory leak in CCBReader.
|
2013-01-21 14:40:29 +08:00 |
James Chen
|
c60fe0cce5
|
Updated cocos2d-js-tests.
|
2013-01-18 21:59:46 +08:00 |
James Chen
|
bc76cf09c4
|
Added filename lookup support for win32.
|
2013-01-18 21:54:48 +08:00 |
James Chen
|
0a42829428
|
issue #1667: Adding file name lookup support for iOS and Android, TBD: Other platform supports.
|
2013-01-18 18:05:32 +08:00 |
James Chen
|
ce4f508025
|
Added Scale9Sprite js tests.
|
2013-01-18 12:00:43 +08:00 |
James Chen
|
47823b2497
|
Updated the submodule reference of cocos2d-js-tests.
|
2013-01-18 11:58:38 +08:00 |
James Chen
|
c8dfa45993
|
Merge pull request #1859 from dumganhar/crystal-game
issue #1661: Adding jsb sample game CrystallCraze.
|
2013-01-17 01:09:18 -08:00 |
James Chen
|
31e91e554e
|
issue #1661: Added CrystalCraze for win32 and fix some compilation errors.
|
2013-01-17 17:07:18 +08:00 |
minggo
|
a7dca5c05a
|
fixed #1547:set selected menu item to null when it is removed from a menu
|
2013-01-17 15:04:48 +08:00 |
James Chen
|
9bbc130ea5
|
issue #1661: Adding CrystallCraze for iOS and Android.
|
2013-01-17 12:54:10 +08:00 |
Rolando Abarca
|
49432ef742
|
removes old header file reference
|
2013-01-16 13:42:41 -08:00 |
Rolando Abarca
|
e94d8d1693
|
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
Conflicts:
scripting/javascript/bindings/ScriptingCore.h
scripting/javascript/bindings/js_bindings_config.h
|
2013-01-15 16:52:47 -08:00 |
James Chen
|
26a91c8f75
|
Updated the submodule reference of cocos2d-js-tests.
|
2013-01-15 10:17:29 +08:00 |
James Chen
|
121519b7cd
|
Merge pull request #1831 from dumganhar/iss1653-jsb-int
fixed #1653: Handling correctly when parsing int value in JSB.
|
2013-01-14 17:49:57 -08:00 |
Rolando Abarca
|
320068930e
|
more debug stuff
|
2013-01-11 14:29:40 -08:00 |
Rolando Abarca
|
47c003ae54
|
Merge branch 'gles20' of git://github.com/cocos2d/cocos2d-x into gles20
|
2013-01-11 14:01:42 -08:00 |
Rolando Abarca
|
5df4b4d997
|
adding debug support for js
|
2013-01-11 14:01:36 -08:00 |
johnangel
|
a1155f52e6
|
Merge remote branch 'upstream/gles20' into gles20
|
2013-01-11 21:48:47 +01:00 |
James Chen
|
777a327945
|
Updated cocos2d-js-tests.
|
2013-01-11 21:27:04 +08:00 |
James Chen
|
df05a1d7e9
|
Updated the submodule of cocos2d-js-tests.
|
2013-01-11 17:18:48 +08:00 |
Jozef Prídavok
|
9889b4f9fd
|
Added the very first implementation of CCEditBox for Win32.
|
2013-01-10 23:59:21 +01:00 |
johnangel
|
16269d952d
|
Detect VS2012 Update 1
|
2013-01-10 11:55:30 +01:00 |
Jozef Prídavok
|
229ad55dfa
|
Fixed and refactored Mac Implementation.
|
2013-01-09 15:34:53 +01:00 |
James Chen
|
b3be1e9e90
|
fixed #1646: GCC_OPTIMIZATION=1 for every jsb project setting of debug mode. This can avoid 'vm_protect' error when debugging jsb project on device.
|
2013-01-09 18:23:33 +08:00 |
James Chen
|
6d7f380f23
|
issue #1646: GCC_OPTIMIZATION_LEVEL=1.
|
2013-01-09 17:49:08 +08:00 |
James Chen
|
8a4f87277e
|
issue #1646: Updated WatermelonWithme project setting for win32.
|
2013-01-09 15:35:19 +08:00 |
johnangel
|
674bb8e728
|
Setting PlatformToolSet to v110_xp instead of default v110 in Visual Studio 2012 for Windows XP support, leaving default v100 in Visual Studio 2010.
|
2013-01-07 11:51:05 +01:00 |
James Chen
|
3fa771f0c4
|
fixed #1620: Using sqlite3 to implement sys.LocalStorage for iOS and android.
|
2013-01-07 17:22:06 +08:00 |
James Chen
|
1882ca30f5
|
issue #1620: Binding sqlite3 to sys.localStorage. And updated win32 project configuration.
|
2013-01-06 14:42:24 +08:00 |
James Chen
|
8fa2eb080b
|
issue #1640: Updated Box2dTest and ChipmunkTest.
|
2013-01-06 10:22:07 +08:00 |
James Chen
|
0c28510513
|
issue #1640: Updated ChipmunkTest.cpp.
|
2013-01-06 10:13:59 +08:00 |
James Chen
|
4d919465a5
|
issue #1640: Updated the submodule reference of cocos2d-js-tests.
|
2013-01-05 18:54:49 +08:00 |
James Chen
|
8a21f4fa3c
|
issue #1640: Added some files to iOS Project.
|
2013-01-05 17:41:19 +08:00 |
James Chen
|
421cf31b34
|
issue #1640: Updated jsbinding for CCPhysicsSprite .
|
2013-01-05 15:09:19 +08:00 |
James Chen
|
4d9d6c6c4c
|
Updated the submodule reference of cocos2d-js-tests.
|
2013-01-05 14:05:13 +08:00 |
James Chen
|
9ef74bef80
|
fixed #1636: Deleted CC_ENABLE_CHIPMUNK_INTEGRATION and CC_ENABLE_BOX2D_INTEGRATION in ccConfig.h since they are moved to extension, it doesn't depend on engine any more.
Added platform macro for CCEditBoxImpl* files.
|
2013-01-05 11:10:24 +08:00 |
James Chen
|
7bcbcfa187
|
fixed #1636: Refactored CCEditBox for iOS, moved the implementation of EditBoxImplIOS.h/.cpp to CCEditBoxImplIOS.h/.cpp.
|
2013-01-05 10:56:57 +08:00 |
James Chen
|
3263d06830
|
Merge pull request #1814 from fape/marmalade_simplegame
fixed #1631: Making SimpleGame force landscape for Marmalade.
|
2013-01-03 19:07:41 -08:00 |
James Chen
|
ec72701414
|
Merge pull request #1815 from fape/marmalade_testlua
Marmalade TestLua postbuild script
|
2013-01-03 18:53:47 -08:00 |
James Chen
|
f6b57a9b92
|
Removing grskia dependancy and adding in freetype support to the builds.
|
2013-01-04 10:16:18 +08:00 |
fape
|
94471a06b6
|
rename and add commandline argument to cccopy.py
|
2013-01-03 20:52:22 +01:00 |
fape
|
e34f190f36
|
add SimpleGame Marmalade config files
|
2013-01-03 15:20:58 +01:00 |
fape
|
f3f67f62e1
|
.gitignores moved
|
2013-01-03 15:16:11 +01:00 |
fape
|
3c89bf1d83
|
marmalade TestLua: add postbuild script to copy resources
|
2013-01-03 14:47:57 +01:00 |
Dale Ducharme
|
611db78b39
|
Removing grskia dependancy and adding in freetype support to the builds.
|
2013-01-02 18:53:31 -05:00 |
James Chen
|
d2ad820a48
|
fixed #1627: Adding view name for sample applications.
|
2012-12-29 14:50:00 +08:00 |
James Chen
|
9bd302e35b
|
fixed #1627: VS version check in project file.
|
2012-12-29 13:54:46 +08:00 |
James Chen
|
b120874a87
|
fix compilation errors.
|
2012-12-29 11:23:31 +08:00 |
James Chen
|
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 |
James Chen
|
c68884a121
|
issue #1625: Updated EffectsTest.cpp and EffectsTest.lua.
|
2012-12-27 11:48:46 +08:00 |
James Chen
|
0e7934a8ce
|
Revert TestCpp/proj.win32/main.cpp.
|
2012-12-27 11:40:32 +08:00 |
James Chen
|
b4211c864e
|
fixed #1625: Updated the submodule reference of cocos2d-js-tests.
|
2012-12-27 11:05:09 +08:00 |
James Chen
|
7d9f06b48c
|
fixed #1625: Updated TestCpp. 'ccg' --> 'CCSizeMake' . And exchanged the parameter order for 3D action tests.
|
2012-12-27 10:55:25 +08:00 |
James Chen
|
bdb4df293b
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1602-jsb-sys
|
2012-12-25 10:01:48 +08:00 |
johnangel
|
08cd9e37fc
|
Setting PlatformToolSet to v110_xp for Visual Studio 2012 only.
|
2012-12-24 10:27:56 +01:00 |
James Chen
|
eb417274fb
|
fixed #1621: fix compilation error of eclipe project.
|
2012-12-24 11:15:56 +08:00 |
ivzave
|
fcce930188
|
repair linux eclipse build & add 64-bit project configurations
|
2012-12-22 07:14:59 +04:00 |
ivzave
|
0538b22300
|
repair linux cli build
|
2012-12-22 04:14:15 +04:00 |
James Chen
|
f26ce4fb84
|
Made sys.localStorage support for jsb, works ok on win32.
|
2012-12-21 18:07:45 +08:00 |
minggo
|
89fb58e791
|
issue #1603:change pathes of android codes
|
2012-12-21 17:28:14 +08:00 |
minggo
|
f71f13fc53
|
issue #1536:add permissions and modify module path error
|
2012-12-21 14:40:34 +08:00 |
James Chen
|
e670d702a8
|
issue #1603: Updated TestLua project setting for iOS port.
|
2012-12-20 21:58:26 +08:00 |
James Chen
|
a36446cba2
|
Merge branch 'iss1603-adjust-directory' of https://github.com/minggo/cocos2d-x into iss1603-adjust-directory
|
2012-12-20 18:39:52 +08:00 |
James Chen
|
f47c5e1714
|
Added app.icf, development.icf.
|
2012-12-20 18:29:25 +08:00 |
minggo
|
65e01b9ade
|
issue #1603:build ok on mac
|
2012-12-20 18:02:24 +08:00 |
James Chen
|
f65717cd86
|
issue #1603: updated linux project configuration.
|
2012-12-20 17:49:34 +08:00 |
James Chen
|
08aa5066a5
|
issue #1603: updated blackberry, linux, marmalade project configurations.
|
2012-12-20 17:47:30 +08:00 |
minggo
|
977046cc32
|
issue #1603:make some samples build ok on iOS
|
2012-12-20 17:20:10 +08:00 |
James Chen
|
1562658bd8
|
issue #1603: Added libJSBinding project for win32 platform.
|
2012-12-20 17:18:02 +08:00 |
James Chen
|
7b19ab2689
|
Updated vs project configuration after adjusting directory.
|
2012-12-20 15:07:19 +08:00 |
minggo
|
959b7a3f0d
|
issue #1603:build MoonWarriors ok on iOS and android
|
2012-12-20 15:06:02 +08:00 |
minggo
|
7433da8bec
|
issue #1603:build CocosDragon ok on iOS and android
|
2012-12-20 14:54:20 +08:00 |
James Chen
|
af03a969c1
|
Merge branch 'iss1603-adjust-directory' of https://github.com/minggo/cocos2d-x into iss1603-refactor-folder
|
2012-12-20 14:36:08 +08:00 |
minggo
|
f9a9d45f88
|
issue #1603:adjust samples directory
Signed-off-by: minggo <ming@cocos2d-x.org>
|
2012-12-20 14:14:53 +08:00 |
James Chen
|
dcfd38756d
|
Updated android build files.
|
2012-12-20 14:04:49 +08:00 |
James Chen
|
4660e72eda
|
issue #1603: Moved the position of some projects.
|
2012-12-20 12:58:21 +08:00 |
James Chen
|
eb0e189842
|
Moved the submodule of cocos2d-js-tests and renamed it to Shared.
|
2012-12-20 11:30:18 +08:00 |
James Chen
|
43c8aa6878
|
Updated the submodule of cocos2d-js-tests.
|
2012-12-20 10:41:36 +08:00 |
unknown
|
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 |
James Chen
|
254e3838d5
|
Updated the submodule reference of cocos2d-js-tests to the latest version.
|
2012-12-14 10:32:06 +08:00 |
James Chen
|
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 |
James Chen
|
21f88534cf
|
fixed #1606: Updated some invocations of CCSequence for TestCpp project.
|
2012-12-10 14:12:56 +08:00 |
fape
|
12c9ebb221
|
include all resources from Resource dir to SampleGame marmalade project file
|
2012-12-06 10:41:02 +01:00 |
James Chen
|
6a7a365365
|
Updated eclipse project configurations for linux
|
2012-12-06 14:57:03 +08:00 |
James Chen
|
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 |
fape
|
320d532e15
|
add Hungarian language support
|
2012-12-05 11:31:05 +01:00 |
minggo
|
a256d35a5b
|
fix some confilcs
|
2012-12-05 14:01:05 +08:00 |
James Chen
|
bd471b7ee9
|
[Marmalade fix] Added development.icf for HelloCpp. Added Marker Felt.ttf for SampleGame.
|
2012-12-04 21:54:19 +08:00 |
James Chen
|
d02cb3f320
|
Updated samples/MoonWarriors/proj.android/build_native.sh. Because the boot file has been changed from MoonWarriors-native.js to MoonWarriors-jsb.js.
|
2012-12-04 20:07:23 +08:00 |
minggo
|
58a187f774
|
do some bug fixes
|
2012-12-04 18:44:32 +08:00 |
James Chen
|
eed78507bf
|
fixed missing level.js for WatermelonWithMe.
|
2012-12-04 17:46:51 +08:00 |
James Chen
|
060698e195
|
fixed missing main.js for CocosDragonJS.
|
2012-12-04 17:38:15 +08:00 |
minggo
|
cb2427e780
|
do some modification
|
2012-12-04 17:25:40 +08:00 |
James Chen
|
5408f3d947
|
Merge pull request #1715 from dumganhar/gles20
Fixed some issues for linux port.
|
2012-12-04 00:51:03 -08:00 |
James Chen
|
3e88f8d2e4
|
fix compilation errors in eclipse project for linux.
|
2012-12-04 16:48:23 +08:00 |
James Chen
|
6aa15e0636
|
Added -DCOCOS2D_DEBUG=1 for linux if building in debug mode.
|
2012-12-04 16:48:23 +08:00 |
minggo
|
9691886582
|
make TestLua work ok on iOS
|
2012-12-04 16:03:27 +08:00 |
minggo
|
98e0123731
|
add icons for WatermelonWithMe and CocosDragon
|
2012-12-04 15:54:03 +08:00 |
minggo
|
f4656ad00f
|
update cocos2d-js-tests to up-stream
|
2012-12-04 14:00:29 +08:00 |
minggo
|
9c04db0e41
|
modify js-binding related samples according the modification of cocos2d-js-tests
|
2012-12-04 12:08:37 +08:00 |
James Chen
|
b5ae1f6d2a
|
Updated MoonWarriors/Classes/AppDelegate.cpp.
Updated the submodule reference of cocos2d-js-tests to the latest one.
Fixed duplicate define in js_bindings_ccbreader.cpp.
|
2012-12-04 11:36:45 +08:00 |
James Chen
|
ed86e2967f
|
Merge pull request #1706 from dumganhar/iss1590-jpeg-fix-mm
fixed #1590: JPEG and File fixes and CocosDenshion fix for marmalade.
|
2012-12-03 19:10:14 -08:00 |
Mat Hopwood
|
3b2eea2541
|
JPEG and File fixes
* Fixes to JPEG loader
* Fixes to image loader to load tiff and unknown formats properly
|
2012-12-04 11:03:34 +08:00 |
minggo
|
bbcbfa71ef
|
Merge pull request #1704 from minggo/cclayer_script_support
Cclayer script support
|
2012-12-03 18:55:11 -08:00 |
minggo
|
4e7fca3185
|
merge dualface's pull request for fixing CCLayer script support and fix error for js-binding
|
2012-12-04 10:52:49 +08:00 |
James Chen
|
9f168faeb0
|
Merge pull request #1696 from fape/lua_marmalade
fixed #1591: Update for Lua marmalade.
* Add ignore marmalade generated Visual Studio directory
* Update Lua and HelloLua marmalade project file
* Add TestLua marmalade project
|
2012-12-03 18:51:39 -08:00 |
folecr
|
58e6c80078
|
Remove hardcoded android:debuggable property
|
2012-12-03 13:34:55 -08:00 |
fape
|
2eaa5188bf
|
add missing Box2d to TestLua marmalade project
|
2012-12-03 13:13:16 +01:00 |
James Chen
|
27bc5094c2
|
Updated the submodule reference of cocos2d-js-tests.
|
2012-12-03 19:16:33 +08:00 |
James Chen
|
9224b12a9c
|
Updated the submodule reference of cocos2d-js-tests.
|
2012-12-03 18:30:43 +08:00 |
James Chen
|
478791a472
|
Added CCBReader::setCCBRootPath.
|
2012-12-03 18:27:50 +08:00 |
James Chen
|
1d07752fd3
|
Updated SchedulerTest for TestCpp project.
|
2012-12-03 15:33:37 +08:00 |
minggo
|
180bd8b3a7
|
issue #1583:TestJavascript work ok on iOS
|
2012-12-03 11:07:22 +08:00 |
minggo
|
2cf49da2bc
|
Merge branch 'gles20' of https://github.com/dumganhar/cocos2d-x into iss1583-update-js
|
2012-12-03 10:31:22 +08:00 |
minggo
|
b805c31dc2
|
add execute permission of build_native.sh
|
2012-12-03 10:30:48 +08:00 |
James Chen
|
987e898807
|
issue #1583: Updated the project configurations of TestJavascript for android and win32. Updated the submodule reference of cocos2d-js-tests.
|
2012-12-03 10:28:44 +08:00 |
fape
|
bbccab8f6b
|
TestLua marmalade project
|
2012-12-02 15:30:22 +01:00 |
fape
|
aac98975da
|
update lua marmalade project
|
2012-12-02 15:29:10 +01:00 |
James Chen
|
005bc31499
|
Made WatermelonWithMe works on iOS.
|
2012-12-02 16:13:22 +08:00 |
James Chen
|
071f8cdbb4
|
issue #1583: Updated the submodule reference of cocos2d-js-tests.
|
2012-12-02 15:18:50 +08:00 |
James Chen
|
a96b946f67
|
Updated the submodule reference of cocos2d-js-tests.
Made WatermelonWithMe works on win32 and android.
|
2012-12-02 15:13:40 +08:00 |
Rohan Kuruvilla
|
4b1d5edbc6
|
Updating CocosDragonJS Android view settings to look like iPhone
|
2012-11-30 16:08:19 -08:00 |
James Chen
|
eaacc74ce5
|
issue #1583: Updated the submodule cocos2d-js-tests.
|
2012-11-30 21:39:58 +08:00 |
James Chen
|
95875112fa
|
Merge branch 'iss1583-js-tests' of https://github.com/dumganhar/cocos2d-x into iss1583-js-tests
|
2012-11-30 21:19:19 +08:00 |
James Chen
|
daf61bc3eb
|
issue #1583: Deleted samples/WatermelonWithMe/watermelon_with_me.js.
|
2012-11-30 21:17:06 +08:00 |
minggo
|
9ac3a356d5
|
issue #1583:CocosDragonJS MoonWarriors and TestJavascript work ok on android
|
2012-11-30 18:27:08 +08:00 |
minggo
|
81077aba58
|
issue #1583:MoonWarriors and CocosDragon work ok on iOS
|
2012-11-30 15:07:11 +08:00 |
James Chen
|
7417f53ed0
|
Updated cocos2d-js-tests reference.
|
2012-11-30 14:43:56 +08:00 |
James Chen
|
0f1232ab9f
|
issue #1583: TestJavascript works ok on win32.
|
2012-11-30 14:01:35 +08:00 |
James Chen
|
da8cf18d24
|
Merge branch 'gles20' into iss1583-js-tests
|
2012-11-30 13:40:52 +08:00 |
James Chen
|
6e33d31a63
|
Updated the submodule cocos2d-js-tests.
|
2012-11-30 13:07:32 +08:00 |
James Chen
|
23629b8187
|
Made all projects compiled ok on Blackberry port.
|
2012-11-30 12:40:47 +08:00 |
James Chen
|
c53cfe88a7
|
Merge pull request #1674 from fape/helloCPP_marmalade
Add missing AppMacros.h to HelloCpp marmalade project file
|
2012-11-29 02:21:34 -08:00 |
James Chen
|
bd95b198fe
|
Merge pull request #1675 from dumganhar/gles20
Fixed some warning and make TestCpp (win32 release version) compiled ok.
|
2012-11-29 02:20:52 -08:00 |
fape
|
834934fd15
|
add missing AppMacros.h to HelloCpp marmalade projekt file
|
2012-11-29 11:06:03 +01:00 |
James Chen
|
d27ab38be9
|
fixed some warning and make win32 release version compiled ok.
|
2012-11-29 18:04:33 +08:00 |
minggo
|
b6dab85611
|
add Texture2DTest cases
|
2012-11-29 17:57:33 +08:00 |
James Chen
|
788b478b3c
|
Make sure HelloCpp can be full screen.
|
2012-11-29 16:31:29 +08:00 |
James Chen
|
494806167b
|
Temporary commit.
|
2012-11-29 15:26:24 +08:00 |
James Chen
|
208132895e
|
issue #1583: Moved the common js codes to scripting/javascript/bindings/js folder. Deleted the old js sample resources.
|
2012-11-29 11:27:39 +08:00 |
James Chen
|
358e47e981
|
issue #1583: Updated the submodule reference of cocos2d-js-tests.
|
2012-11-29 11:27:16 +08:00 |
Taro Kobayashi
|
a37e034e61
|
added support for Japanese language
|
2012-11-28 17:53:10 +09:00 |
minggo
|
33647ccebb
|
Merge pull request #1660 from minggo/gles20
make CocosGragon work on iOS devices with debug mode
|
2012-11-26 19:57:37 -08:00 |
minggo
|
09344d55be
|
make CocosGragon work on iOS devices with debug mode
|
2012-11-27 11:55:59 +08:00 |
James Chen
|
342c7bc724
|
Merge pull request #1657 from fape/cocos_extensions_marmalade
fixed #1578: Create cocos2dx-ext marmalade project.
|
2012-11-26 19:15:06 -08:00 |
James Chen
|
9bd3014137
|
Fixed CocosBuilderTest/AnimationTest crash, fixed some memory leaks in CCBReader.cpp.
|
2012-11-27 10:26:40 +08:00 |
fape
|
1843d576d8
|
create cocos2dx-ext marmalade project
|
2012-11-26 20:14:10 +01:00 |
James Chen
|
e248d9d472
|
fixed #1576: Updated CocosBuilderTest.
|
2012-11-26 22:00:25 +08:00 |
James Chen
|
e0948a4817
|
fixed #1576: Sync CCBReader to latest version, CCString* --> std::string, CocosBuilderTest crash fixes.
|
2012-11-26 21:51:05 +08:00 |
minggo
|
8063b9b9fb
|
give a guide information to run Box2dTest
|
2012-11-26 17:23:36 +08:00 |
minggo
|
6bb11d8d71
|
Merge branch 'gles20' of https://github.com/minggo/cocos2d-x into gles20
|
2012-11-26 15:09:34 +08:00 |
minggo
|
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 |
minggo
|
1b9a38e195
|
issue #1564:work ok on linux
|
2012-11-26 11:46:37 +08:00 |
fape
|
3cc5920aac
|
Update samples/TestCpp to compatible with marmalade
|
2012-11-24 20:14:01 +01:00 |
minggo
|
1cf237d296
|
Merge pull request #1643 from minggo/gles20
issue #1564:make iOS test work ok
|
2012-11-23 00:31:06 -08:00 |
minggo
|
a423317abc
|
issue #1564:make iOS test work ok
|
2012-11-23 16:30:09 +08:00 |
James Chen
|
48d77fedc1
|
issue #1573: Reverted GameScene.js and MainMenuScene.js.
|
2012-11-23 15:09:04 +08:00 |
James Chen
|
7c1e860d78
|
issue #1573: Added CocosDragonJS. Made it compiled ok on iOS,android and win32.
|
2012-11-23 15:09:03 +08:00 |
James Chen
|
6af0188295
|
First commit CocosDragonJS.
|
2012-11-23 15:09:02 +08:00 |
Rohan Kuruvilla
|
cfb59529a8
|
Adding CocosDragonJS project
|
2012-11-23 15:08:58 +08:00 |
minggo
|
3980a710a3
|
Merge pull request #1641 from minggo/gles20
issue #1564: make tests run on mac osx
|
2012-11-22 22:24:25 -08:00 |
minggo
|
96ecb05ca9
|
issue #1564: make tests run on mac osx
|
2012-11-23 14:22:50 +08:00 |
minggo
|
f82e800695
|
Merge pull request #1640 from minggo/gles20
modify lua project setting
|
2012-11-22 18:42:45 -08:00 |
minggo
|
226b10a9e2
|
modify lua project setting
|
2012-11-23 10:41:41 +08:00 |
James Chen
|
971d948132
|
issue #1572: WatermelonWithMe works on iOS now.
|
2012-11-22 19:05:38 +08:00 |
James Chen
|
c32ea4486b
|
issue #1572: WatermelonWithMe works on Android now.
|
2012-11-22 18:46:30 +08:00 |
James Chen
|
7c1a3a7305
|
issue #1572: Modify vs2010 solution.
|
2012-11-22 17:54:55 +08:00 |
James Chen
|
e0fd8f6284
|
issue #1572: Adding WatermelonWithMe project.
|
2012-11-22 17:54:54 +08:00 |
James Chen
|
b79b3335bd
|
Merge pull request #1630 from dumganhar/iss1564-update-tests
issue #1564: Made ChipmunkTest of TestJavascript works
|
2012-11-21 23:30:14 -08:00 |
James Chen
|
b66bc98a46
|
issue #1564: Made ChipmunkTest of TestJavascript works
|
2012-11-22 15:19:16 +08:00 |
James Chen
|
aa8e582b7e
|
Merge pull request #1629 from dumganhar/iss1564-update-tests
issue #1564: fix the wrong order of parameters in CCScheduler::scheduleSelector.
|
2012-11-21 20:07:45 -08:00 |
James Chen
|
51d61ba214
|
issue #1564: fix the wrong order of parameters in CCScheduler::scheduleSelector.
Made MoonWarriors works.
|
2012-11-22 12:05:38 +08:00 |
James Chen
|
7d4ca88deb
|
Merge pull request #1627 from dumganhar/iss1564-update-tests
issue #1564: Closed verbose log of TestJavascript for android. And Made it compiled ok.
|
2012-11-21 18:49:03 -08:00 |
James Chen
|
1ce1b4b471
|
issue #1564: Closed verbose log of TestJavascript for android. And Made it compiled ok.
|
2012-11-22 10:47:57 +08:00 |
minggo
|
b5bf49e9c6
|
issue #1564: make TestJavasripteTest work on iOS
|
2012-11-22 10:44:21 +08:00 |
James Chen
|
89a51433b8
|
issue #1564: Make TestJavascript works on windows.
|
2012-11-22 10:24:26 +08:00 |
James Chen
|
b4c1d60e5c
|
Updated the submodule reference of cocos2d-js-tests and cxx-generator.
|
2012-11-21 21:26:18 +08:00 |
James Chen
|
24c83cb461
|
Merge pull request #1617 from dumganhar/iss1564-update-tests
issue #1564: Fix crash of ParticlesTest.
|
2012-11-21 01:24:59 -08:00 |
James Chen
|
d0ccff9081
|
issue #1564: Updated ClippingNodeTest.
|
2012-11-21 16:28:31 +08:00 |
minggo
|
ab14c0ddc2
|
Merge pull request #1615 from minggo/gles20
create stencil buffer for TestCpp
|
2012-11-21 00:03:41 -08:00 |
minggo
|
ed6d14580a
|
issue #1564:create stencil buffer for TestCpp
|
2012-11-21 16:00:40 +08:00 |
James Chen
|
9cf9c9943d
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1564-update-tests
Conflicts:
samples/TestCpp/Classes/ClippingNodeTest/ClippingNodeTest.h
|
2012-11-21 15:42:26 +08:00 |
James Chen
|
f17f5bbe7b
|
issue #1564: Updated ClippingNodeTest.
|
2012-11-21 15:41:47 +08:00 |
minggo
|
2e152ada45
|
issue #1564:add CClippingNodeTest
|
2012-11-21 15:36:48 +08:00 |
James Chen
|
dd2b15cba0
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1564-update-tests
Conflicts:
samples/TestCpp/Classes/tests.h
|
2012-11-21 15:27:47 +08:00 |
James Chen
|
170978d6a5
|
issue #1564: Added ClippingNodeTest.
|
2012-11-21 15:22:54 +08:00 |
minggo
|
3a789c075f
|
issue #1564:add ChipmunkTest
|
2012-11-21 12:02:29 +08:00 |
minggo
|
5a4da366ed
|
issue #1564:update DrawPrimitivesTest
|
2012-11-21 11:43:08 +08:00 |
minggo
|
b8af64e798
|
issue #1564:update LabelTest
|
2012-11-20 18:17:47 +08:00 |
minggo
|
a80ae8b27b
|
issue #1564:update LayerTest
|
2012-11-20 18:00:27 +08:00 |
minggo
|
d27ff67098
|
issue #1564:update ParallaxTest
|
2012-11-20 17:43:26 +08:00 |
minggo
|
faaa8e1e1b
|
issue #1564:update ParticleTest
|
2012-11-20 17:39:11 +08:00 |
minggo
|
a246d11110
|
issue #1564: update some test cases
|
2012-11-20 17:30:05 +08:00 |
minggo
|
fc40008711
|
Merge branch 'iss1564-update-tests' of https://github.com/dumganhar/cocos2d-x into iss1564-update-tests
|
2012-11-20 16:51:41 +08:00 |
minggo
|
9c1e90e981
|
issue #1564:update RenderTextureTest
|
2012-11-20 16:45:59 +08:00 |
James Chen
|
8f6c8e202e
|
Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1564-update-tests
Conflicts:
samples/TestCpp/Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp
|
2012-11-20 16:35:42 +08:00 |
James Chen
|
ebd522e3fa
|
issue #1564: Return a new object instead of 'const reference' for some get methods.
|
2012-11-20 16:34:55 +08:00 |
minggo
|
f15135f26a
|
issue #1564:update SchedulerTest
|
2012-11-20 16:24:27 +08:00 |
James Chen
|
62a502e365
|
issue #1564: Renamed ChipmunkAccelTouchTest to ChipmunkTest.
|
2012-11-20 16:19:05 +08:00 |
minggo
|
c026a1f488
|
issue #1564:update ShaderTest
|
2012-11-20 16:16:16 +08:00 |
minggo
|
fce5b79a09
|
issue #1564:update SpriteTest
|
2012-11-20 15:19:57 +08:00 |