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

227 Commits

Author SHA1 Message Date
samuele3hu 3d5f8de346 Adjust android.mk for cocos2d and related module 2014-08-27 20:58:32 +08:00
samuele3hu 106cb2e110 Update external config.json 2014-08-27 11:07:41 +08:00
samuele3hu 3759648d3a Remove the useless aneroid.mk files 2014-08-27 10:21:47 +08:00
samuele3hu 74624f5ba1 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module 2014-08-25 11:52:52 +08:00
samuele3hu 893e0b0a08 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3_new_module 
Conflicts:
	build/cocos2d_libs.xcodeproj/project.pbxproj
 2014-08-25 11:45:29 +08:00
minggo e7050486d3 fix conflict 2014-08-24 18:56:51 +08:00
minggo 030f80a257 one static library for c++ and another one for lua-binding 2014-08-24 03:52:51 -07:00
minggo e8a7ffcde1 update external version 2014-08-22 23:52:26 +08:00
samuele3hu 2f60e610a2 Integrate libcocosdenshion,libcocos3d,libnetwork,libcocostudio and libextension into cocos2d on the iOS/Mac platform 2014-08-22 13:49:21 +08:00
minggo 7b3e1b7a73 rename file name 2014-08-06 15:01:18 +08:00
Wu-Hao 87aded5d15 missing file guide 2014-08-05 18:06:39 +08:00
Huabing.Xu 030d48ea32 change Project name to libbox2d 2014-07-28 12:13:52 +08:00
Huabing.Xu 2795c10627 rename box2d->libbox2d 2014-07-28 12:05:58 +08:00
minggo 8f50135229 Update config.json 2014-07-22 22:04:17 +08:00
Dhilan007 112f973e12 update config.json 2014-07-21 11:58:38 +08:00
Dhilan007 612a3e9691 Add fbx-conv in 3rd-party-libs-bin's management. 
Add fbx-conv for creates archive.
 2014-07-18 18:38:57 +08:00
minggo 19da7e8075 [ci skip] 2014-07-15 16:24:06 +08:00
Dhilan007 bde1887b28 issue #4892:Implement logical codes of game controller 2014-06-30 00:30:46 +08:00
zhangbin 0019d9a061 Optimize the win32 projects configuration. 2014-06-20 10:50:43 +08:00
minggo d6dae3281e [ci skip] 2014-06-17 10:33:00 +08:00
minggo 6c6d07cb67 [ci skip] 2014-06-15 17:31:51 +08:00
minggo 366beedbb2 Merge pull request #6955 from samuele3hu/v3_fix 
Add xxtea encrypt support for lua and update the console submodule
 2014-06-05 11:49:40 +08:00
minggo ed40dc9268 update libcurl.a 2014-06-05 10:54:59 +08:00
samuele3hu a4cb0c183a Update Linux CMakeLists for xxtea 2014-06-05 10:54:05 +08:00
samuele3hu c785d64ba1 Adjust the xxtea directory structure and modify configs files for platforms 2014-06-04 11:50:04 +08:00
James Chen eb9fbea7be Merge pull request #6686 from dumganhar/download-runtime 
Updates download-deps.py to support  to download several zip files. (external and lua-runtime-bin)
 2014-05-12 19:00:15 +08:00
James Chen 5dc69026ac Updates download-deps.py to support download several files. 2014-05-12 17:53:51 +08:00
James Chen 3d22c30933 issue #4660: Warning fix in CCLabel.cpp and ConvertUTF.c 2014-05-11 11:24:01 +08:00
James Chen 07204a0602 issue #4660: Updates win32 project 2014-05-10 19:33:05 +08:00
James Chen e693a51c6e issue #4660: Linux build ok 2014-05-10 19:24:04 +08:00
James Chen a61b1097db issue #4660: Adds ConvertUTFWrapper.cpp, using llvm::ConvertUTF8toWide and llvm:: convertUTF16ToUTF8String 2014-05-10 19:24:03 +08:00
James Chen 42ffd25fca issue #4660: Adds ConvertUTF lib and adds license (LLVM and unicode license). 2014-05-10 19:24:02 +08:00
Mircea Rila ebfbf0eba3 fix box2d win32 project 2014-05-09 11:10:08 +03:00
Mircea Rila 70d7d5b493 add VS2013 support for box2d, chipmunk 2014-05-09 10:53:44 +03:00
James Chen e44fb8141e Updates zip_file_size in external/config.json 2014-05-07 17:30:38 +08:00
James Chen 7d2aed773d Adds 'zip_file_size' section in 'external/config.json' 2014-05-07 17:25:42 +08:00
James Chen 385c62d5c4 updates repo_name to `cocos2d-x-3rd-party-libs-bin` 2014-05-07 16:49:55 +08:00
James Chen dc015df920 Delete external/version.txt, use external/version.json instead 2014-05-07 15:56:25 +08:00
James Chen 55555f64d1 Adds external/config.json for download-deps.py 2014-05-07 15:51:53 +08:00
James Chen 7fbcf5cc67 Adds external/version.txt 2014-05-07 13:46:18 +08:00
James Chen 32b2b20a32 Re-adds box2d and chipmuck sources, we need to use prebuilt libraries for them too. 2014-05-07 13:40:39 +08:00
James Chen 014e515b8b Delete external submodule, please use 'download-deps.py' instead. 2014-05-07 13:38:17 +08:00
James Chen 12d77b2f7f Adds external submodule 2014-05-05 13:14:05 +08:00
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