Commit Graph

110 Commits

Author SHA1 Message Date
James Chen f478e2d2a5 issue #2826: Bug fixes for win32. 2013-10-31 15:15:52 +08:00
James Chen 379bcb194c [sp v25] Updating SpiderMonkey library to FFv25. 2013-10-31 11:15:16 +08:00
minggo 6a664d480a issue #2905:samples build ok on linux 2013-10-22 18:01:56 +08:00
minggo 5f65cdc3c0 fix xcode compiling error and simplify android.mk 2013-10-18 15:39:09 +08:00
minggo 63c13d8eaa issue #2905:simplify Android.mk dependence 2013-10-18 14:18:36 +08:00
minggo e50f9fc43b issue #2905: jsbinding samples and lua binding samples build ok on android 2013-10-17 15:04:30 +08:00
minggo 8f9756f030 issue #2905:TestJavascript build ok on Android 2013-10-17 11:28:57 +08:00
James Chen 352d1f6768 issue #2905: Renaming lua/cocos2dx_support to lua/bindings. 2013-10-16 16:40:07 +08:00
minggo 6fc2be62f5 issue #2905: testcpp bild ok on Android 2013-10-15 18:00:03 +08:00
minggo 95acb1b9e3 issue #2905: helloworld build ok on android 2013-10-14 14:01:00 +08:00
minggo bb6208eec1 issue #2905: remove redundant codes 2013-10-12 15:31:05 +08:00
minggo 8eeb911e8f issue #2905: adjust folder structure 2013-10-12 15:25:45 +08:00
minggo a96fc9dc16 issue #2905:add Box2D 2013-10-12 14:15:32 +08:00
minggo dfe85aa125 issue #2905:remove box2d 2013-10-12 14:14:57 +08:00
minggo 19ee87e29a issue #2905: step2 Box2D -> box2d 2013-10-12 14:03:04 +08:00
minggo 1f38636e84 issue #2905: step1 Box2D -> box2d 2013-10-12 14:02:13 +08:00
minggo 4313c46e93 issue #2905:adjust folder structure 2013-10-12 11:22:05 +08:00
minggo bcb171e3c9 fix line end in windows 2013-09-20 22:23:13 +08:00
boyu0 02649a1329 closed #2434: Use android_mk_generator.py to generate Box2D and chipmunk's Android.mk file 2013-08-22 17:47:49 +08:00
James Chen a5067f63dd Merge pull request #3372 from pyrasis/tizen_2.2
[Tizen] Fix Debug Settings
2013-08-05 22:51:06 -07:00
Lee, Jae-Hong 3db495ab0e [Tizen] Fix Debug Settings.
- fix debugging failure problem
2013-08-06 01:26:56 +09:00
minggo 9cba2c42c1 closed #2434: simply Android.mk 2013-08-02 17:33:27 +08:00
Éloi Rivard 15081f5616 Removed all warnings from Box2D since it is an external project. 2013-07-30 14:48:44 +02:00
James Chen 343c98af13 Fixing warnings of the order of member variables and fixing errors for tizen projects. 2013-07-29 14:07:57 +08:00
Thomas Perl 0557eb9674 Import local copy of libwebp to external/ 2013-07-24 19:39:26 +00:00
Thomas Perl 309269e8e2 Fix building of chipmunk on Linux 2013-07-24 20:18:42 +02:00
Thomas Perl 62958c8321 Qt5 build support (initial work) 2013-07-24 20:18:42 +02:00
minggo f6cfe3007f issue #2412:fix merging conflict 2013-07-23 10:41:11 +08:00
minggo 687c088b51 issue #2412:remove blackberry and marmalade port because they don't support c++11 2013-07-19 13:55:03 +08:00
James Chen c1dd874b9f issue #2404: Fixing wrong replace in Box2d. 2013-07-18 13:39:55 +08:00
James Chen 759831c1d8 issue #2397: Application::sharedApplication --> Application::getInstance. 2013-07-15 16:24:42 +08:00
James Chen 2c1b26acf8 issue #2397: EGLView::sharedOpenGLView() --> EGLView::getInstance() 2013-07-12 13:11:21 +08:00
Lee, Jae-Hong 9322e5594b Support Tizen 2.2 SDK.
- Update project files.
- based on develop branch.
- HelloCpp, SimpleGame, HelloLua, TestLua available to build.
2013-07-10 13:04:08 +09:00
Éloi Rivard d0c34cd2ae Removed warnings from external projects (libbox2D & liblua) 2013-07-09 15:23:19 +02:00
minggo 04465622b7 issue #2129:remove prefix of types in ccTypes.h 2013-07-05 16:49:22 +08:00
Ricardo Quesada ccd9cb486c JS Tests compiles and links in Mac
...but it doesn't work yet due to a bug with the touch events :-(
2013-06-27 00:58:46 -07:00
Ricardo Quesada 398c6593f0 JS Tests: Almost working on Mac 2013-06-26 23:45:08 -07:00
James Chen ad7d606b48 Merge pull request #2703 from sergey-shambir/linux_qmake
close #2332: [Linux] Adding project part for QtCreator.
2013-06-25 21:57:20 -07:00
Ricardo Quesada ef6f67902f Adds mac workspace
for the moment it includes TestCpp.
But Chipmunk, Box2d, cocos2dx, extensions and CocosDenshion are libraries
Like in the iOS project
2013-06-24 18:04:05 -07:00
James Chen 8dc8fec180 issue #2325: Updating project configuration, tested on iPad 3. 2013-06-24 18:32:06 +08:00
James Chen b870488aad issue #2325: [iOS] Using Workspace to manage all projects. TBD, also apply to Mac port. 2013-06-24 15:31:18 +08:00
James Chen 53a372669a closed #2322: Updating all win32 project configurations, improvement by using Multi-processor Compilation. 2013-06-23 17:25:34 +08:00
Lee, Jae-Hong 2f8b24d05c Fix compile error. 2013-06-20 19:20:27 +09:00
James Chen b60e891b09 issue #2129: Don't use CGPoint in chipmunk since we are using cocos2d-x rather than cocos2d-iphone. 2013-06-20 13:02:20 +08:00
James Chen 8b298fab0e issue #2284: fixing windows build. 2013-06-16 11:19:47 +08:00
James Chen 08b3107467 Updating emscripten submodule to lastest version. 2013-06-15 11:44:11 +08:00
James Chen 0de1a4ebd8 Merge pull request #2877 from pyrasis/tizen_2.1
Support Tizen device
2013-06-12 22:56:23 -07:00
Lee, Jae-Hong 1bd3f10601 Support Tizen device. 2013-06-12 10:20:18 +09:00
Ricardo Quesada e770121711 updates chipmunk2d to v6.1.5 2013-06-11 17:03:20 -07:00
Lee, Jae-Hong b9f5691706 [Tizen] Add libwebsockets.h, .a and support C++11 2013-06-07 20:14:43 +09:00