James Chen
|
7b19ab2689
|
Updated vs project configuration after adjusting directory.
|
2012-12-20 15:07:19 +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 |
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 |