Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
28,720 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

284 Commits

Author SHA1 Message Date
James Chen 0f36374d86 Removed external folder 2014-05-05 13:04:53 +08:00
James Chen daf37b733a Re-adds missing luajit sources. 2014-05-05 01:31:52 +08:00
James Chen 3b3c1c4dbb issue #4674: Removed large files and updated .gitignore 2014-05-04 14:36:16 +08:00
Ricardo Quesada 81c2d92355 yeah... love in includes 
<3
 2014-04-26 10:35:57 -07:00
Ricardo Quesada 9b118e5e96 Squashed commit of the following: 
commit 519fcd7f68e3586c376fd5e8d4a0ee220a48d225
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 10:10:06 2014 -0700

    Updates templates files

commit 2b07843ebe592f56b2abc544ccf66d441bb19fc5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 10:08:19 2014 -0700

    compiles on Windows

commit b175522ef7205eaab3bd3f26c27c5d6514cbe2a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:55:30 2014 -0700

    adds cocos2d.h

commit 4c3d14f929bac017b93ca843b4f149d352264a30
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:54:24 2014 -0700

    re-adds missing files

commit f729181728959260d14c4152555534f5beec8e05
Merge: 148da79 2adac67
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:51:12 2014 -0700

    Merge branch 'includes_fixes' of github.com:ricardoquesada/cocos2d-x into includes_fixes

commit 148da79010c5dffeab885933624cffaf3d588852
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:49:12 2014 -0700

    Adds SimpleAudioEngine

commit 2adac67019180ec82b7bd03f0b67c12f62e29e77
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:47:45 2014 -0700

    Compiles for Android

commit 4a300d1b9225fa5708f25a69a50bb531f0ac1a32
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date:   Sat Apr 26 09:13:35 2014 -0700

    Fixes the includes
 2014-04-26 10:11:22 -07:00
minggo 1c44dbe385 Merge pull request #6327 from boyu0/bug4904_Image_safeToFile_crashes_ios 
closed #4904: fix ios Image::saveToFile crashes when save jpg file.
 2014-04-21 11:02:11 +08:00
boyu0 4acba7bdfa closed #4904: use new Xcode command line tools to compile i386 arch libjpeg.a file, and shrink the lib file. 2014-04-21 10:28:21 +08:00
boyu0 f595413983 closed #4903: Build libcurl.a with openssl 2014-04-18 09:36:34 +08:00
Anton Sokolchenko d778a947f5 Fix incompatible pointer conversion 2014-04-12 18:29:50 +03:00
Xiaosong Gao d82c4bed75 In Mac OS X 10.9 and Xcode 5.1, it is a warning "Declaration shadows a local variable" in a new ios/mac project. 2014-04-11 08:07:18 +08:00
koowolf aa51e5dd22 fix compiler error in wp8 2014-04-10 15:15:17 +08:00
James Chen 890dd64d38 issue #4729: some warning fixes and compilation error fixes on win32. 2014-04-10 01:29:13 +08:00
Anton Sokolchenko e063e97a5d Incompatible pointer type? 
Why sizeof(void**) and not sizeof(void*)?
 2014-04-09 11:44:01 +03:00
samuele3hu 130c2608da Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket 2014-04-01 11:40:21 +08:00
James Chen cb16bb1158 Merge pull request #6084 from dumganhar/update-websocket-v1.23 
Updates websocket to the latest release v1.23.
 2014-04-01 11:36:03 +08:00
samuele3hu abaaa3132c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket 2014-04-01 11:33:50 +08:00
samuele3hu 22720fa1b7 Update `build_ios.sh` for building luajit 2014-04-01 11:28:27 +08:00
minggo 7fb5e1f13a Merge pull request #6066 from minggo/quadcommand-optimize 
use xxhash to generate material id
 2014-04-01 11:27:51 +08:00
James Chen b73a7d2939 Updates websocket to the latest release v1.23. 2014-04-01 10:44:50 +08:00
samuele3hu de3e9aa916 Add ignored `Makefile` file for building luajit 2014-03-31 17:06:36 +08:00
minggo 66440ac335 add xxhash on linux 2014-03-31 15:43:35 +08:00
minggo 504eea0269 use xxhash to generate material id 2014-03-31 13:47:07 +08:00
Dale Stammen aa0ef00de3 added external libs for wp8 2014-03-28 12:02:27 -07:00
James Chen 8ca714fa67 Windows will not include <alloca.h>. 2014-03-26 19:43:34 +08:00
James Chen d9b4b70ed7 Removed unused include file. 2014-03-26 19:28:10 +08:00
zhangcheng 58a61d94fb add use CCComRender as parent for attaching component 2014-03-26 16:39:32 +08:00
Ricardo Quesada c82933e3c4 chipmunk fixes for Linux 2014-03-25 16:46:10 -07:00
Ricardo Quesada 473a6b19ee Upgrades to Chipmunk 6.2.1 2014-03-25 10:37:35 -07:00
James Chen 368d5216ad Merge pull request #5897 from Dhilan007/develop_edtaa_license 
update license.
 2014-03-21 11:09:36 +08:00
Dhilan007 cca1591e8a update license. 2014-03-21 10:23:11 +08:00
samuele3hu d3487d2d3c close #4400: Use the newest version of LuaSocket for lua 2014-03-20 17:04:54 +08:00
boyu0 f23db68151 build lua.a for arm64bit and iOS simulator 64 bit architectures, change .ma3 files to .caf files. 2014-03-15 01:19:06 +08:00
boyu0 c2e81817c0 add i386 architecture to each mac .a file 2014-03-14 14:48:37 +08:00
boyu0 38a1b13415 extract arm64 architectures form .a file, add condition link arguments. 2014-03-14 14:18:13 +08:00
boyu0 44a69db0cb update external library, add iOS x86_64 and arm64 architectures, support Xcode5.1 iPhone simulator(64 bit) 2014-03-13 18:32:03 +08:00
James Chen 650a88a8b1 Re-add lua bindings codes. 2014-03-10 14:04:58 +08:00
James Chen c2acfea633 issue #4116: Delete non-scripting files. 2014-02-26 21:17:17 +08:00
andyque bf81591b48 fixed #3829. change namespace gui to ui 2014-02-25 10:18:44 +08:00
Éloi Rivard fa2481bb24 Linux Spidermonkey 27 support. 2014-02-13 01:25:18 +01:00
Éloi Rivard 4272d4fa61 Linux websockets support. 2014-02-13 00:53:51 +01:00
James Chen 05c79b54ac issue #3900: Typedef jschar to wchar_t to fix linking errors on windows. 2014-02-07 17:30:02 +08:00
James Chen 558fb7e420 issue #3900: Adds spidermonkey v27 library for windows. 2014-02-07 15:13:14 +08:00
James Chen 20ab9daa3a issue #3900: Adds spidermonkey v27 library for Android. 2014-02-07 14:21:41 +08:00
James Chen 90c4a63677 issue #3900: Adds spidermonkey v27 library for iOS and Mac. 2014-02-07 14:05:03 +08:00
James Chen 2ff4a44324 closed #3857: Mac and iOS Simulator should also use SpiderMonkey which was built in RELEASE mode. 
For more details why I did this, please refer to http://www.cocos2d-x.org/issues/3857.
 2014-01-26 14:19:42 +08:00
James Chen 3250604478 issue #3823: Removes curl libraries for linux. It was installed by 'apt-get'. 2014-01-23 01:04:21 -08:00
James Chen 767fed989c issue #3823: Removes glfw3 header file since it was installed to system by tools/travis-script/install-glfw.sh. 2014-01-23 16:11:06 +08:00
James Chen a0f801159d issue #3823: Updates glfw to v3.0.4 for windows. 2014-01-23 16:09:58 +08:00
James Chen 46b1ccf4c0 issue #3823: Updates glfw to the latest release v3.0.4. 2014-01-23 15:53:47 +08:00
James Chen 2a3481f20c Moves temp files to CURRENT_BINARY_DIR. 2014-01-06 23:44:36 -08:00
zhangcheng 5214965e4f fixed #3456 2013-12-24 18:33:19 +08:00
samuele3hu 783be69322 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into toluaerror 
Conflicts:
	tools/tolua/cocos2dx.ini
 2013-12-23 17:20:17 +08:00
minggo 16ed9155c0 Merge pull request #4460 from Dhilan007/label_distanceField 
new label:add support for distanceField
 2013-12-16 23:18:41 -08:00
Dhilan007 39280d55f3 new label:add support for distanceField 
PerformanceTest:add performance test for label.
 2013-12-13 12:42:15 +08:00
minggo 1e9c763b40 use ssize_t for index and capacity 2013-12-12 14:48:26 +08:00
samuele3 ad8638d976 issue #3353:Lua gc mechanism will make the extended attributes of lua userdata disapper 2013-12-06 14:16:33 +08:00
boyu0 0ff2e65467 reset cmakelists.txt 2013-11-28 15:41:23 +08:00
boyu0 cfe522283c Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into upgrade_box2d_to_2.3.0 2013-11-28 12:19:07 +08:00
boyu0 1c55c207bf update project setting 2013-11-28 11:55:18 +08:00
minggo 3469f2adf5 closed #2539:use unstripped libcurl lib for armeabi-v7 architecture to fix link warnings 2013-11-27 10:34:05 +08:00
boyu0 805312b3d3 fix box2d compile error in ndk 2013-11-25 15:55:01 +08:00
boyu0 e55c81c9b6 upgrade box2d from 2.2.1 to 2.3.0 2013-11-25 14:50:11 +08:00
minggo db804891ed fix some warnings 2013-11-16 20:02:49 +08:00
minggo 1e15071dc7 remove makefiles 2013-11-11 17:29:48 +08:00
James Chen d6d041f561 issue #3113: [Linux] Adding options for modules. 2013-11-06 19:17:34 +08:00
Ricardo Quesada 8fb5fad20d Merge branch 'develop' into arm64 2013-11-04 15:02:35 -08:00
Ricardo Quesada 0350ac7021 arm64 support 2013-11-04 11:53:40 -08:00
James Chen 9be8ca3714 [cmake] output lib to root/lib 2013-11-04 21:03:08 +08:00
James Chen f17aa8b450 Move the library of fmod to external folder. 2013-11-04 21:03:08 +08:00
James Chen c085412636 [CMake] TestLua and HelloLua is ok. 2013-11-04 21:03:07 +08:00
James Chen 922924e1ab TestCpp is ok. 2013-11-04 21:03:07 +08:00
James Chen 8676523433 Adding CMakeLists.txt 2013-11-04 21:03:07 +08:00
samuelhu b0fdb66d2d Modify the all luajit build scripts and let libluajit.a of mac only support 64bit 2013-11-01 14:38:14 +08:00
James Chen 0c6748b577 issue #2826: Bug fix of 'js::IsInRequest' 2013-11-01 10:44:15 +08:00
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
Sergey Shambir 984ed75b9a Linux: added project part for QtCreator. 
Allows easily setup cocos2d on Linux in QtCreator IDE.
 2013-06-02 10:15:14 +04:00
James Chen 05a88c89dc fixed #1647: Adding WebSocket support for Cpp and JSB. 2013-05-31 23:13:03 +08:00
James Chen c1d85aaab2 Merge pull request #2611 from pyrasis/tizen_2.1 
Update projects to Tizen 2.1 SDK.
 2013-05-22 02:07:06 -07:00
Lee, Jae-Hong 220ac4982a Update projects to Tizen 2.1 SDK. 2013-05-22 16:55:18 +09:00
minggo d1a8f54113 Merge pull request #2609 from j4m3z0r/emscriptenate 
Add Audio Support for Emscripten
 2013-05-21 18:32:12 -07:00
James Gregory 060f60b91f Bump Emscripten version 2013-05-21 16:39:25 -07:00
minggo cc2b00e9fe Merge pull request #2573 from j4m3z0r/emscriptenate 
Use browser font rendering instead of FreeType
 2013-05-20 22:50:28 -07:00
James Gregory 5e3ce3e7a1 Update to latest Emscripten incoming, including an SDL fix this branch depends on. 2013-05-16 17:53:34 -07:00
Lee, Jae-Hong 81a59e96d9 Update chipmunk project for Tizen. 2013-05-16 20:13:44 +09:00
Lee, Jae-Hong 67c898d308 Set output filename. 2013-05-16 20:12:53 +09:00
Lee, Jae-Hong 9bbfdf2adb Adding placeholder.txt files. 2013-05-16 20:12:31 +09:00
Lee, Jae-Hong 840cf6a104 Adding chipmunk project for tizen. 2013-05-16 20:06:09 +09:00
Lee, Jae-Hong d5e0bf1971 Adding Box2D project for tizen. 2013-05-16 20:06:00 +09:00
James Gregory 0daa3adfd6 Emscripten changed ABI for .a files. Rebuild all deps, updating to current version. Switch Emscripten to incoming branch as it's not working on master right now. Added simple script for rebuilding deps in case it becomes necessary again. Switch builds to always use -g flag, per Emscripten's warnings. Undefine native client defines so that it builds (Emscripten switched to NaCl alignment, macro got defined as a side-effect). 2013-05-14 15:26:48 -07:00
James Gregory b4e193fbbb Revert "Add freetype 2.4.11 to repo" 
This reverts commit 418906d2612b59ead6826d8395b69168bdff0ca4.
 2013-05-06 21:29:43 -07:00
James Gregory 4255066ad2 Add freetype 2.4.11 to repo 2013-05-06 21:29:42 -07:00
James Gregory 9370c11444 Revert "Add freetype 2.4.11 to repo" 
This reverts commit 418906d2612b59ead6826d8395b69168bdff0ca4.
 2013-05-06 21:19:36 -07:00
James Gregory 91ba2fe325 Add freetype 2.4.11 to repo 2013-05-06 21:19:35 -07:00
James Gregory 9b68a65fee Compile Chipmunk as C++ rather than C so that calling from C++ code works under Emscripten. 2013-05-06 21:17:22 -07:00
James Gregory d47a1befd5 Revert "Add freetype 2.4.11 to repo" 
This reverts commit 418906d2612b59ead6826d8395b69168bdff0ca4.
 2013-05-06 21:05:39 -07:00
James Gregory 75b21eea92 Add freetype 2.4.11 to repo 2013-05-06 21:05:38 -07:00
James Gregory cc0724aed0 Add Makefiles for Emscripten + Emscripten external 2013-05-06 21:05:01 -07:00
James Gregory 0a96f77a4c Bump Emscripten version 2013-05-06 20:59:50 -07:00
James Gregory a79326c0ac Remove -DLINUX from Emscripten chipmunk makefile 2013-05-06 20:59:49 -07:00
James Gregory ea6a5fde17 Revert "Add freetype 2.4.11 to repo" 
This reverts commit 418906d2612b59ead6826d8395b69168bdff0ca4.
 2013-05-06 20:58:45 -07:00
James Gregory d5ec8f240e Add freetype 2.4.11 to repo 2013-05-06 20:58:44 -07:00