Dale Stammen
|
b700798287
|
removed WP8 project files
|
2015-04-15 07:13:54 -07:00 |
zhangbin
|
7aaf122a41
|
Support compile & run test projects with cocos2d-console on wp8.
|
2015-03-25 11:42:55 +08:00 |
Martin Konopka
|
cd12d08a52
|
Get rid of compiler warnings: 'func' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
|
2015-03-14 19:33:15 +01:00 |
Dale Stammen
|
a828f73ccb
|
updated expiration date of project certificates
|
2015-03-09 08:31:06 -07:00 |
Dale Stammen
|
fb25ce9d1b
|
disabled LTCG to speed up release builds
|
2015-02-27 11:10:33 -08:00 |
Dale Stammen
|
f68a966485
|
disabled Check SDL to allow CC_DEPRECATED to work as warning and not error
|
2015-02-27 11:07:51 -08:00 |
Dale Stammen
|
b5e936c657
|
disabled LTCG to speed up release builds
|
2015-02-27 10:43:13 -08:00 |
Dale Stammen
|
2eb919bb7a
|
disabled Check SDL to allow CC_DEPRECATED to work as warning and not error
|
2015-02-27 10:36:48 -08:00 |
Vladimir Timofeev
|
5688202844
|
Modify MSVC project files to build executables in subfolders and properly copy resources to that subfolders.
|
2015-02-10 16:23:34 +03:00 |
andyque
|
9c974eebd0
|
fix libpng warning
|
2014-12-27 20:47:59 +08:00 |
Dhilan007
|
4cda033a04
|
Fixed compiling and linking error of lua tests when using NDK r10 above.
|
2014-11-27 13:56:15 +08:00 |
Vladimir Timofeev
|
a689fc4c7e
|
sync with upstream
Conflicts:
CMakeLists.txt
|
2014-11-20 12:19:00 +03:00 |
zhangbin
|
3715aeb0f6
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
|
2014-11-19 10:00:51 +08:00 |
Dale Stammen
|
b75af6bedc
|
updated template file copy build script to use App.Shared dir
|
2014-11-18 13:45:37 -08:00 |
zhangbin
|
5aff5640b5
|
Solve the error when building android for sample projects of engine.
1. Update the project config.
2. Update the submodule cocos2d-console.
|
2014-11-18 18:39:53 +08:00 |
zhangbin
|
365e09e5db
|
Merge branch 'v3' into support-wp8
|
2014-11-17 16:01:12 +08:00 |
Vladimir Timofeev
|
b5266e95bf
|
mingw fixes, now project builds with mingw64 and -DUSE_PREBUILT_LIBS=NO (some additional libs hardcoded still)
|
2014-11-17 01:42:04 +03:00 |
zhangbin
|
4ef7c9f948
|
Modify the cpp template & tests to support compiling wp8-xaml & win8.1-universal project by console.
|
2014-11-14 16:48:14 +08:00 |
Vladimir Timofeev
|
72e59a53a8
|
cmake: Build application bundles on Mac for test applications (this allow run they from Xcode)
|
2014-11-11 10:30:48 +03:00 |
Dale Stammen
|
d4b4452bae
|
copy pch files to template folder
|
2014-10-24 06:08:20 -07:00 |
Dale Stammen
|
f42afaa6bb
|
updated project files with new pch files
|
2014-10-23 19:40:57 -07:00 |
Dale Stammen
|
3290d75ab7
|
removed unused pch files
|
2014-10-23 19:34:55 -07:00 |
Dale Stammen
|
f8a00c8605
|
added project files for windows 8.1 universal apps
|
2014-10-23 07:41:29 -07:00 |
Dale Stammen
|
f359c7285e
|
remove PhoneDirect3DXamlAppComponent namespace refactor
|
2014-10-23 07:21:48 -07:00 |
huangshiwu
|
0a04da0a10
|
Add Default-667h@2x and Default-737h@3x launch images to support iPhone6 and iPhone6+'s native resolution mode
|
2014-10-16 15:53:12 +08:00 |
minggo
|
8eed0811fa
|
Merge pull request #8717 from MSOpenTech/wp8-dll
New version of WP8 for cocos2d-x v3.3
|
2014-10-16 09:33:43 +08:00 |
Dale Stammen
|
2ca1479840
|
updated WP8 test project files
|
2014-10-14 16:53:31 -07:00 |
Anton Sokolchenko
|
fc35cc2efe
|
CMake fix for Mac Os X.
You can open project with CLion and see that everything works.
|
2014-10-15 00:19:29 +03:00 |
pipu
|
7d21dcb095
|
1. fix git error
|
2014-10-12 17:51:34 +08:00 |
pipu
|
ffd83bbdd0
|
Modifying win32 and wp8 protocol buffers lib
|
2014-10-10 22:38:34 +08:00 |
martell
|
73980195c0
|
wp8: use CC_STATIC because libs are static
|
2014-10-09 06:33:46 +01:00 |
Ricardo Quesada
|
27cb6afb5e
|
fixes warnings on Android
|
2014-10-08 18:55:33 -07:00 |
ledenis
|
3d69e5e1d4
|
Fix copy files in cpp-empty-test in MSVC build
|
2014-09-29 22:08:41 +02:00 |
andyque
|
acae8a2535
|
Merge branch 'v3' into addChipmunkStaticLib
Conflicts:
CMakeLists.txt
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/2d/cocos2d_wp8.vcxproj.filters
cocos/CMakeLists.txt
|
2014-09-10 10:00:15 +08:00 |
Ricardo Quesada
|
f5cd48f154
|
Android properties back to 10
|
2014-09-09 18:46:47 -07:00 |
Ricardo Quesada
|
9082ca18c3
|
Platform fixed
|
2014-09-09 16:50:02 -07:00 |
Ricardo Quesada
|
0ead7b6307
|
Squashed commit of the following:
commit b9181ae92541d11119bedd766773ddb01f0bb486
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 09:34:40 2014 -0700
Compiles luasocket on Mac
commit 91fc79aa2101867fedfbcd7d846e9508009894e6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 09:12:30 2014 -0700
disables luasockets
commit 31f2ee462708ab7b604b9399eaabd275e2da9e02
Merge: 19099fd 0abe4cb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 08:10:48 2014 -0700
Merge remote-tracking branch 'cocos2d/v3' into cmakefile_mac_osx
Conflicts:
cocos/3d/cocos3d.h
commit 19099fd021b4ecf1f2eebd73ea14e84572d1ee33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 23:21:03 2014 -0700
compiles on Linux
commit eec7b92817ac9208123468bb882612aad89f94bf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 23:16:46 2014 -0700
all projecs compiles with CMake
commit 40fcc8325b409a580fdbf26d2ee27aa2d1db0109
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 21:47:27 2014 -0700
CCUserDefualt.mm better includes
commit 30709ec8243562858498cb118240bb45bf9b33b0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 21:26:36 2014 -0700
cpp-tests compiles and works on Mac using CMake
commit 67f0fc8df887d08d3d7a27c5fdadd335d6841676
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 20:12:09 2014 -0700
Adds missing files to CMakeLists.txt
commit 36f939ea7f157ca851aee138300c13d9888c0078
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 19:52:34 2014 -0700
Adds more box2d missing files
commit 00f81e3b5ec97150974cc6022e86c394ff488ccb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 19:39:54 2014 -0700
Adds missing box2d files
commit 9673227b4d7d0e6d9eced49bdd69b98cb519968a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 18:44:15 2014 -0700
Initial CMake support for Mac
|
2014-09-09 12:18:31 -07:00 |
andyque
|
6a4397a3eb
|
change toolset from 12.0 to 4.0
|
2014-09-09 15:57:21 +08:00 |
andyque
|
59dc56bfcb
|
remove chipmunk dependency
|
2014-09-05 21:59:30 +08:00 |
minggo
|
6539ff293d
|
Merge pull request #7940 from andyque/fixVs2013CompileError
Fix vs2013 compile error
|
2014-09-04 13:41:15 +08:00 |
andyque
|
2e27a6865f
|
update project to vs2013
|
2014-09-03 14:10:38 +08:00 |
minggo
|
b37ef4e1c3
|
remove unneeded files
|
2014-09-03 11:52:19 +08:00 |
andyque
|
dafbf28283
|
fix release mode compile error
|
2014-09-02 16:42:23 +08:00 |
andyque
|
fadfa87afd
|
fix vs2013 compile error
|
2014-09-02 16:42:04 +08:00 |
zhangbin
|
e24a903c88
|
Solve the problem: gdbserver is not copied to directory proj.android/libs when ndk-build with NDK_DEBUG=1.
|
2014-08-28 16:13:11 +08:00 |
minggo
|
9fb977ff99
|
not create Vec as possible for setting position
|
2014-08-28 11:41:18 +08:00 |
samuele3hu
|
33fd605a16
|
Adjust libcocos2d and libluacocos2d on the win32 platform and adjust related test cases.
|
2014-08-27 10:18:44 +08:00 |
samuele3hu
|
07cf4d3526
|
Fix the win32 and android compile error
|
2014-08-25 14:10:13 +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 |