James Chen
54bd3c1925
Updating JSTest.
2013-03-22 15:11:56 +08:00
James Chen
0faeb5da5e
Merge branch 'jsb_obfuscate' of https://github.com/walzer/cocos2d-x into walzer-jsb_obfuscate
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2013-03-22 14:12:38 +08:00
walzer
9371bbf799
roll back samples/Javascript/Shared to the ref before.
2013-03-22 12:10:21 +08:00
walzer
42c73fb820
Fixed #1841 , obfuscated js source can run on iOS correctly now.
2013-03-22 12:06:04 +08:00
fape
e9343c2d8a
- update README files
...
- format javascript sample README files like cpp samples
2013-03-21 16:04:53 +01:00
fape
77207ea494
Remove "-o igncr" from CocosPlayer Android Eclipse project
2013-03-21 15:05:02 +01:00
walzer
c52bbec5bc
add icons into TestJavascript.xcodeproj
2013-03-21 20:50:21 +08:00
walzer
6f41b7c4ea
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into jsb_obfuscate
2013-03-21 17:37:28 +08:00
walzer
d1e2cf8b4c
remove jsb_*_.js from compile list
2013-03-21 17:35:36 +08:00
walzer
a590a27606
update submodule samples/Javascript/Shared to the same ref ptr as master branch
2013-03-21 17:10:14 +08:00
walzer
67cda2bfd4
issue #1841 , TestJavascript is obfuscated successfully
2013-03-21 16:55:55 +08:00
James Chen
668d3ce638
Updating TestJavascript.vcxproj and WatermelonWithMe.vcxproj.
2013-03-20 22:07:30 +08:00
minggo
f33a8fe6f1
remove unsupported parameter in android
2013-03-20 15:37:16 +08:00
James Chen
d68db7e873
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
2013-03-20 15:19:30 +08:00
James Chen
cf9c01cecf
Updating JSTest, adding new resources.
2013-03-20 15:19:16 +08:00
James Chen
89c4f3a5ba
Updating JSTest.
2013-03-20 14:58:36 +08:00
James Chen
46335a06b8
Updating JSTest
2013-03-20 14:50:20 +08:00
James Chen
e728d5d6d0
Updating JS Test.
2013-03-20 14:45:39 +08:00
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