Rohan Kuruvilla
|
38f86acd23
|
Updating CocosPlayer AppDelegate files
|
2013-03-19 23:42:59 -07:00 |
walzer
|
582e35014f
|
issue #1841, improve tools/closure-compiler/obfuscate.py to general usage, with input params
|
2013-03-19 23:53:01 +08:00 |
walzer
|
0d73934f5c
|
issue #1841, TestJavascript-ios is obfuscated successfully
|
2013-03-19 17:21:01 +08:00 |
minggo
|
6577279ff7
|
Merge pull request #2200 from minggo/test-before-release
delete parameter(-o igncr) when running build_native.sh in eclipse project
|
2013-03-18 23:26:45 -07:00 |
minggo
|
0a8b4f923f
|
delete parameter(-o igncr) when running build_native.sh in eclipse project
|
2013-03-19 13:48:32 +08:00 |
James Chen
|
b4c52f9c5a
|
Regenerating all resources with the latest CocosBuilder.
|
2013-03-19 13:05:17 +08:00 |
James Chen
|
3380c7cdca
|
fixed #1838: Updating iOS project setting for CocosDragonJS.
|
2013-03-19 13:05:06 +08:00 |
James Chen
|
6a98553633
|
Synchronizing the submodule reference of cocos2d-js-test to the latest one.
|
2013-03-18 18:24:37 +08:00 |
minggo
|
58618172e6
|
merge pull request and fix some conflicts
|
2013-03-18 16:15:48 +08:00 |
minggo
|
19cf6665c4
|
Merge pull request #2176 from folecr/easierandroidbuild
Improvements to android build setup and samples' build scripts
|
2013-03-17 18:58:11 -07:00 |
James Chen
|
d9c19ab26b
|
[WIN32]Fixing compilation errors for TestJavascript and WatermelonWithMe.
|
2013-03-17 10:43:56 +08:00 |
folecr
|
6dba49f25b
|
Android build_native.sh now reads local.properties for environment variables
|
2013-03-15 16:44:16 -07:00 |
fape
|
75c68f178a
|
Rename cocos2dx.hpp to jsb_cocos2dx_auto.hpp in AppDelegate.cpp
|
2013-03-12 22:18:45 +01:00 |
James Chen
|
ae1c64573e
|
Merge pull request #2046 from rohankuruvilla/eclipse
fixed #1827: Eclipse Project import - Documentation Added and Tested.
|
2013-03-12 01:36:17 -07:00 |
James Chen
|
32f0cf5993
|
Updating the submodule reference of JS tests.
|
2013-03-11 17:21:01 +08:00 |
James Chen
|
a250d83513
|
Updating the submodule of cocos2d-js-tests.
|
2013-03-11 17:13:35 +08:00 |
James Chen
|
69b2b13325
|
fixed #1748: Generating jsb_cocos2dx_extension_auto.hpp/.cpp. It was separated from original `cocos2dx.hpp/cpp`.
Developer could remove redundant jsbinding codes now.
|
2013-03-11 16:39:28 +08:00 |
Rohan Kuruvilla
|
7149f0598d
|
Adding missing eclipse project files
|
2013-03-07 12:13:50 -08:00 |
Rohan Kuruvilla
|
360519dad5
|
Removing /bin/bash for executing build command, and keep only bash
|
2013-03-07 12:09:17 -08:00 |
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
|
4eed15c977
|
Adding eclipse project files for Javascript projects
|
2013-03-04 11:50:39 -08:00 |
James Chen
|
3a465739c3
|
Updated cocos2d-js-tests.
|
2013-02-27 17:06:48 +08:00 |
James Chen
|
a09220dfc8
|
New jsb tests (TableViewTest).
|
2013-02-23 22:09:20 +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 |
minggo
|
0c5bcb3f7b
|
issue #1702:fix a typo error
|
2013-02-06 18:04:40 +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
|
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
|
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
|
ba9308089c
|
fix some errors in xcode template
|
2013-01-28 21:53:55 +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
|
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 |
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
|
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
|
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 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 |
moadib
|
e39829269d
|
Added <uses-feature android:glEsVersion="0x00020000" /> to AndroidManifest.xml
|
2013-01-21 13:03:55 +04: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
|
31e91e554e
|
issue #1661: Added CrystalCraze for win32 and fix some compilation errors.
|
2013-01-17 17:07:18 +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 |
johnangel
|
16269d952d
|
Detect VS2012 Update 1
|
2013-01-10 11:55:30 +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
|
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
|
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
|
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
|
b4211c864e
|
fixed #1625: Updated the submodule reference of cocos2d-js-tests.
|
2012-12-27 11:05:09 +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 |
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 |
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 |
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 |
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
|
eb0e189842
|
Moved the submodule of cocos2d-js-tests and renamed it to Shared.
|
2012-12-20 11:30:18 +08:00 |