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 |