andyque
|
3743f02c7e
|
finish ios/mac/android
|
2014-09-05 11:39:11 +08:00 |
andyque
|
4f217ed577
|
remove include
|
2014-09-05 10:43:33 +08:00 |
andyque
|
4276c59975
|
remove chipmunk source code
|
2014-09-05 10:42:59 +08:00 |
Ricardo Quesada
|
c149bfca00
|
Adds MARK: TODO: FIXME: in code
Replaces XXX with FIXME:
Xcode 6 beta 4 supports this new format
|
2014-08-29 12:54:24 -07:00 |
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 |
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 |