andyque
34619fc125
add git --version
2015-03-10 19:07:55 +08:00
andyque
ffa01950ac
use subprocess.call
2015-03-10 19:00:07 +08:00
andyque
9457ed5fbd
fix subprocess.check_output error
2015-03-10 18:47:35 +08:00
andyque
7f4bfc395f
change os.system to subprocess
2015-03-10 18:42:26 +08:00
andyque
5bd5c62a91
change git merge method
2015-03-10 18:24:38 +08:00
andyque
d7972e8b0a
Merge remote-tracking branch 'refs/remotes/upstream/v3' into v3
2015-03-10 18:08:50 +08:00
minggo
858178ad8e
Merge pull request #10772 from super626/v3
...
refactor init method
2015-03-10 17:50:06 +08:00
andyque
3cd4018cca
change scripts
2015-03-10 17:47:00 +08:00
andyque
d09f678579
modify remote build environment variable
2015-03-10 17:42:09 +08:00
子龙山人
d42ce3e764
Merge pull request #14 from andyque/clean-v3-jenkins
...
Clean v3 jenkins
2015-03-10 17:28:18 +08:00
andyque
7d7ee03c5b
fix jenkins scripts
2015-03-10 17:03:03 +08:00
andyque
28ed1d0cae
use exceptions to report unwanted behaviors
2015-03-10 16:08:57 +08:00
andyque
a48c8c840c
cleanup pull request scripts
2015-03-10 15:44:02 +08:00
andyque
fbc6804b3f
improving jenkins pull request scripts
2015-03-10 14:40:04 +08:00
andyque
48482907b8
refactoring jenkins scripts
2015-03-10 14:08:03 +08:00
minggo
afb06b5c42
Merge pull request #10770 from m2q1n9/patch-1
...
fix cocostudio anchor point bug
2015-03-10 13:40:44 +08:00
yangxiao
1e240e92f9
empty mesh check
2015-03-10 13:31:04 +08:00
minggo
8e6d9d5dd2
Merge pull request #10740 from newnon/v3_windows_network_path
...
Windows network path fix
2015-03-10 11:25:53 +08:00
minggo
f3567ba1af
Merge pull request #10780 from ryule/fix_CCDevice-ios_font_stroke_alpha
...
Fix CCDevice-ios.mm to have the right alpha color for a stroke effect.
2015-03-10 11:19:29 +08:00
minggo
90db974c67
Merge pull request #10784 from vovkasm/fix-templates
...
Fix templates after change default resource search path on win32
2015-03-10 10:47:41 +08:00
minggo
749cb426cb
[ci skip]update CHANGELOG
2015-03-10 09:56:06 +08:00
minggo
5ac2fb398c
Merge pull request #10774 from minggo/sync-from-v4
...
Label:Fixed transform not update correctly
2015-03-10 09:54:20 +08:00
minggo
a4698eaaaf
Merge pull request #10781 from mogemimi/add-const-to-member-function
...
Add const to Value::getDescription() function
2015-03-10 09:49:56 +08:00
minggo
b552bf3902
Merge pull request #10782 from MSOpenTech/v3-wp8-fix
...
V3 updated expiration date of WP8/Universal App project certificates
2015-03-10 09:31:22 +08:00
yangxiao
5131a23de4
solve conflict
2015-03-10 09:18:13 +08:00
Vladimir Timofeev
0dc7da3e6d
Fix lua-template-default win32 project
...
Modify project to copy resource files to folder where exe file located.
This commit should fix lua-template-default after https://github.com/cocos2d/cocos2d-x/pull/10431 was commited.
2015-03-10 00:19:23 +03:00
Vladimir Timofeev
8e9ce48bab
Fix cpp-template-default win32 project.
...
Modify project to copy resource files to folder where exe files located.
This should fix cpp template to follow https://github.com/cocos2d/cocos2d-x/pull/10431 change.
The change was "Fix win32 resource search path to be relative to the executable."
2015-03-09 23:44:14 +03:00
Dale Stammen
afd0fbab10
added missing /bigobj to c++ compiler command line options
2015-03-09 10:16:42 -07:00
Dale Stammen
24d706cb7a
added /bigobj to C++ compiler command line options
2015-03-09 09:39:36 -07:00
Dale Stammen
35222a8193
Merge branch 'v3' into v3-wp8-fix
2015-03-09 09:20:25 -07:00
Dale Stammen
a828f73ccb
updated expiration date of project certificates
2015-03-09 08:31:06 -07:00
mogemimi
de4105516a
Add const to Value::getDescription() function
2015-03-09 22:34:24 +09:00
Jongryul Kook
0d65dd13be
Fix CCDevice-ios.mm to have the right alpha color for a stroke effect.
2015-03-09 21:20:17 +09:00
minggo
485e4e4bf4
Merge pull request #10776 from CocosRobot/update_cocosfiles_1425894356
...
[AUTO][ci skip]: updating cocos2dx_files.json
2015-03-09 18:03:14 +08:00
yangxiao
0eee4e2ab6
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2015-03-09 17:46:43 +08:00
yangxiao
2c468cbdc6
modify changelog
2015-03-09 17:46:17 +08:00
CocosRobot
3f7e2eb1ff
[AUTO][ci skip]: updating cocos2dx_files.json
2015-03-09 09:45:58 +00:00
minggo
f4eba9c30e
Merge pull request #10775 from minggo/sync-from-v4-config
...
[ci skip]Add more include files in config.gitingore
2015-03-09 17:44:09 +08:00
XiaoYang
b0b8ae1112
Merge pull request #250 from songchengjiang/v3
...
fix the bug of material reading on linux
2015-03-09 17:40:33 +08:00
samuele3hu
d72a0c3985
Add more include files in config.gitingore for generating templates/cocos2dx_files.json
2015-03-09 17:39:57 +08:00
songchengjiang
e30c473f85
fix the bug of material reading on linux
2015-03-09 17:30:28 +08:00
WenhaiLin
cd95905a04
Label:Fixed transform not update correctly if this camera mask of Label isn't visible by the current visiting camera
2015-03-09 17:26:43 +08:00
minggo
25dba56d68
[ci skip]update CHANGELOG
2015-03-09 17:14:06 +08:00
yangxiao
45bd6180ad
fix create bundle using empty path
2015-03-09 17:09:18 +08:00
minggo
5999c487a1
[ci skip]update CHANGELOG
2015-03-09 16:43:54 +08:00
minggo
b8b1c9d018
Merge pull request #9708 from minggo/use-console
...
use cocos console in build_native.py and android-build.py
2015-03-09 16:41:56 +08:00
yangxiao
ff3eba6143
refact init
2015-03-09 16:29:57 +08:00
m2q1n9
c97742072f
fix cocostudio anchor point bug
...
fix a bug which will cause anchor point config not work
2015-03-09 14:30:41 +08:00
minggo
b9c5f775d6
Merge pull request #10766 from MSOpenTech/v3-wp8-fix
...
V3 WP8/Universal App fixes for Particle3D
2015-03-09 13:50:27 +08:00
Dale Stammen
a9479a1585
updated WP8 precompiled shaders
2015-03-08 21:42:27 -07:00