honghui
|
3c3b190be8
|
update runtime version
|
2014-12-12 15:47:12 +08:00 |
honghui
|
ab162a01f4
|
runtime's setSearchPaths failed
|
2014-12-11 22:16:39 +08:00 |
minggo
|
73ece5ad09
|
Merge pull request #9385 from samuele3hu/v3_cocostudio
Remove useless copy about luasocket on the android platform
|
2014-12-09 18:28:08 +08:00 |
honghui
|
61e13bf2a1
|
update runtime version to 1.6
|
2014-12-05 16:09:43 +08:00 |
samuele3hu
|
3e0852eb7a
|
Remove useless copy about luasocket on the android platform
|
2014-12-05 15:28:45 +08:00 |
CocosRobot
|
b7d553f5db
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-12-04 07:13:03 +00:00 |
minggo
|
3faeee66e3
|
Merge pull request #9358 from cocoscodeide/v3
merge runtime to v3
|
2014-12-04 14:00:17 +08:00 |
honghui
|
2aa05bff39
|
revert file commit by mistake
|
2014-12-04 13:53:55 +08:00 |
CocosRobot
|
918372556b
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-12-04 02:08:20 +00:00 |
honghui
|
118569c972
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-11-30 15:37:30 +08:00 |
honghui
|
047c36a270
|
update runtime template
|
2014-11-29 16:05:18 +08:00 |
Huabing.Xu
|
522a77e1a8
|
Merge pull request #9311 from andyque/fixLinuxTemplate
fix linux cpp and lua template
|
2014-11-29 09:20:22 +08:00 |
andyque
|
79918d789e
|
fix cocos2d root
|
2014-11-28 08:24:48 -08:00 |
andyque
|
bdd46f7e55
|
fix linux cpp and lua template
|
2014-11-28 08:20:02 -08:00 |
CocosRobot
|
ff8d2624eb
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-11-28 08:54:16 +00:00 |
honghui
|
9fefad5f35
|
debugging lua code in package support
|
2014-11-28 15:40:12 +08:00 |
minggo
|
f3e53d7700
|
Merge pull request #9299 from CocosRobot/update_cocosfiles_1417117059
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-11-28 09:36:53 +08:00 |
CocosRobot
|
38c3bc7b4f
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-11-27 19:37:40 +00:00 |
Dhilan007
|
3025e937f6
|
Fixed compiling and linking error of new lua projects when using NDK r10 above.
|
2014-11-27 21:56:06 +08:00 |
Filipe Lemos
|
b722df671b
|
Fix CPU check on android template
|
2014-11-26 11:02:22 +00:00 |
honghui
|
52780dff28
|
fix some memory leak
|
2014-11-26 14:58:23 +08:00 |
Dale Stammen
|
6ad3a23ed3
|
added support for lost directx device
|
2014-11-25 08:25:34 -08:00 |
Dale Stammen
|
8da06fb9cc
|
Merge branch 'v3' into v3-win8.1-appstate
|
2014-11-25 08:07:29 -08:00 |
CocosRobot
|
0b286aa412
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-11-25 14:48:14 +00:00 |
CocosRobot
|
8c20e7a5c6
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-11-25 01:35:25 +00:00 |
CocosRobot
|
451cbe52d2
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-11-24 09:54:39 +00:00 |
honghui
|
0e73301fc4
|
remove "using namespace" from header files
|
2014-11-24 17:13:24 +08:00 |
honghui
|
84a8c75ad5
|
Split Runtime.cpp to individual class files
|
2014-11-24 11:14:35 +08:00 |
honghui
|
3477e0fa19
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-11-24 10:43:34 +08:00 |
Dale Stammen
|
a607d41454
|
implemented lostDevice support when app loses the directx device
|
2014-11-21 16:24:51 -08:00 |
Dale Stammen
|
2a86c77066
|
added foreground, background, lostdevice support
|
2014-11-21 10:31:57 -08:00 |
CocosRobot
|
2398712b9d
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-11-21 01:57:39 +00:00 |
honghui
|
941c8281cd
|
revert commit a7f8199e65
|
2014-11-20 21:20:54 +08:00 |
honghui
|
a97386f8d7
|
can't build IPA using developer certificate in Mac OS X 10.10
|
2014-11-20 21:20:54 +08:00 |
Dale Stammen
|
5d2857b3c4
|
updated angle to commit 4a980d2612
|
2014-11-19 15:55:18 -08:00 |
zhangbin
|
365e09e5db
|
Merge branch 'v3' into support-wp8
|
2014-11-17 16:01:12 +08:00 |
CocosRobot
|
18b0a6cacc
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-11-16 17:32:13 +00:00 |
CocosRobot
|
c227ba9e40
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-11-14 21:10:45 +00: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 |
Ricardo Quesada
|
2e3b2d9f28
|
Merge pull request #9080 from vovkasm/cmake-refactoring
Cmake refactorings and fixes
|
2014-11-13 15:42:47 -08:00 |
minggo
|
5f1ca44f0c
|
Merge pull request #9071 from mikandi/feature/android-build-native-with-spaces
Android build_native.py with spaces in path
|
2014-11-13 18:37:37 +08:00 |
CocosRobot
|
4ae4932e8a
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-11-11 22:17:01 +00:00 |
Vladimir Timofeev
|
77ab866090
|
Move BuildHelpers.CMakeLists.txt to Modules/CocosBuildHelpers.cmake, this name is more standard for cmake include files, and in future this file can be installed to use by external applications.
|
2014-11-11 10:30:48 +03:00 |
Christopher O'Connell
|
5d26bc045c
|
Fixed failure in call to make when the android app folder contains spaces in the path.
|
2014-11-10 00:38:32 -07:00 |
CocosRobot
|
80ce1537e7
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-11-07 02:34:46 +00:00 |
honghui
|
8af00cdb06
|
runtime demo is ugly when screen orientation is portrait
|
2014-11-06 11:30:01 +08:00 |
minggo
|
5ee8f0a134
|
Merge pull request #8976 from hongliang-goudou/runtime_addSearchPath_argc
overrided addSearchPath() by Runtime.cpp should support second argument
|
2014-11-01 11:35:05 +08:00 |
hongliang
|
adb221babe
|
init arg1 as false for safety
|
2014-10-31 15:23:46 +08:00 |
minggo
|
e87e0290fd
|
Merge pull request #8958 from MSOpenTech/wp8-shader-fix
WP8 Shader fix for cocos2d-x issue 8933
|
2014-10-31 09:43:31 +08:00 |
hongliang
|
0d006ce6d1
|
overrided addSearchPath() by Runtime.cpp should support second argument as CCFileUtils.cpp does.
|
2014-10-30 17:07:37 +08:00 |