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 |