andyque
|
c668001e73
|
fix assert failure of NinePatchImageParser and rapidjson
|
2015-05-26 17:20:10 +08:00 |
Vincent Yang
|
246913c092
|
Fix bug: skybox can't move to other position except origin point in world space.
|
2015-05-26 17:14:26 +08:00 |
jianglong0156
|
fb4d638231
|
copy resources in linux
|
2015-05-26 16:34:04 +08:00 |
jianglong0156
|
60e3b5390d
|
copy resources in android
|
2015-05-26 16:33:47 +08:00 |
jianglong0156
|
6f67ec1e6c
|
Merge branch '2d-xv3' into modifyTestResource
|
2015-05-26 16:23:25 +08:00 |
Namezero
|
8bc7d08d3f
|
added alignment getters
|
2015-05-26 09:34:13 +02:00 |
Namezero
|
2be136dc8e
|
alignment getters added
|
2015-05-26 09:33:11 +02:00 |
jianglong0156
|
e117d62b13
|
add js-test resource copy command
|
2015-05-26 14:47:49 +08:00 |
jianglong0156
|
fe677f32dd
|
delete js resource
|
2015-05-26 14:28:53 +08:00 |
子龙山人
|
8c259fddf0
|
Merge pull request #12004 from andyque/add-jsb-to-jenkins-v3
Add JSB to CI
|
2015-05-26 14:27:53 +08:00 |
jianglong0156
|
ae4c8d9798
|
fix opengl resource error
|
2015-05-26 14:26:45 +08:00 |
jianglong0156
|
95e8212727
|
add js cocosbuilder resource
|
2015-05-26 14:08:51 +08:00 |
andyque
|
2b1dd89147
|
add js-tests scheme
|
2015-05-26 13:48:56 +08:00 |
minggo
|
3c7dfe8215
|
Merge pull request #12018 from CocosRobot/update_cocosfiles_1432604241
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-05-26 09:39:03 +08:00 |
CocosRobot
|
e6a7d6f150
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-05-26 01:37:23 +00:00 |
minggo
|
3add3477dd
|
Merge pull request #12013 from natural-law/v3
Support build & run Android Studio project in console.
|
2015-05-26 09:34:42 +08:00 |
minggo
|
d650140ca3
|
Merge pull request #12014 from hugohuang1111/add-js-runtime-template-file
add js runtime ignore template
|
2015-05-26 09:34:22 +08:00 |
minggo
|
104f11fe4c
|
Merge pull request #12010 from CocosRobot/update_lua_bindings_1432542799
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-26 09:33:37 +08:00 |
Namezero
|
4c380bfaf0
|
Update UITextField.cpp
|
2015-05-25 21:06:27 +02:00 |
Namezero
|
dfb479d480
|
Update UITextField.h
|
2015-05-25 21:05:49 +02:00 |
hugo
|
f2a5418d41
|
add js runtime ignore template
|
2015-05-25 22:52:36 +08:00 |
hugo
|
a65d7ea49a
|
update 3rd part config
|
2015-05-25 22:48:19 +08:00 |
andyque
|
a651deb93c
|
remove dos2unix tools in js genbindings
|
2015-05-25 18:11:19 +08:00 |
jianglong0156
|
fd05998b5f
|
fix the bug: shader in jsb can not run correctly.
|
2015-05-25 17:48:34 +08:00 |
jianglong0156
|
f1145139ac
|
fix js resource path in code
|
2015-05-25 17:02:26 +08:00 |
Bin Zhang
|
c491b6a5c1
|
Merge branch 'v3' of github.com:cocos2d/cocos2d-x into v3
|
2015-05-25 17:01:29 +08:00 |
Bin Zhang
|
3298145eb5
|
Support build & run Android Studio project in console.
|
2015-05-25 16:53:36 +08:00 |
jianglong0156
|
6e27825dec
|
add web shader resource
|
2015-05-25 16:51:58 +08:00 |
minggo
|
35533abec0
|
[ci skip]update CHANGELOG
|
2015-05-25 16:51:46 +08:00 |
jianglong0156
|
82c5fbbc76
|
add js resource for web tests
|
2015-05-25 16:50:27 +08:00 |
minggo
|
41f84c9f11
|
[ci skip]update CHANGELOG
|
2015-05-25 16:50:25 +08:00 |
minggo
|
bcc1bf8d32
|
Merge pull request #11983 from dabingnn/v3_SpriteWithTrianglesCommand
use trianglescommand for sprite
|
2015-05-25 16:48:22 +08:00 |
CocosRobot
|
7fa68d9b3a
|
[AUTO]: updating luabinding & jsbinding automatically
|
2015-05-25 08:37:59 +00:00 |
andyque
|
c7d698362f
|
add JSB to jenkins
|
2015-05-25 16:37:08 +08:00 |
minggo
|
6f9ab33995
|
Merge pull request #12009 from CocosRobot/update_cocosfiles_1432542713
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-05-25 16:34:00 +08:00 |
minggo
|
999de9072a
|
Merge pull request #12003 from minggo/remove-unneeded-function
remove uneeded function
|
2015-05-25 16:33:38 +08:00 |
minggo
|
42fba34d62
|
[ci skip]update CHANGELOG
|
2015-05-25 16:32:52 +08:00 |
CocosRobot
|
eea661a5c2
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-05-25 08:31:54 +00:00 |
minggo
|
273ac5d00a
|
Merge pull request #12002 from WenhaiLin/v3-texturecache-unbindfix
Fixed TextureCache::unbindImageAsync fails to unbind all asynchronous callback for a specified bound image.
|
2015-05-25 16:29:43 +08:00 |
andyque
|
a6a5318e13
|
add js win32 test
|
2015-05-25 16:22:43 +08:00 |
Felix J
|
d5a7163b29
|
don't update content size if not necessary
refactor a little so we don't need to update the content size if bmfont is used, but still updating the _fontSize.
|
2015-05-25 14:45:26 +07:00 |
minggo
|
dae2ca14d3
|
Merge pull request #12005 from CocosRobot/update_cocosfiles_1432538172
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-05-25 15:20:46 +08:00 |
minggo
|
ca3c42362b
|
[ci skip]update CHANGELOG
|
2015-05-25 15:20:13 +08:00 |
minggo
|
203203a92d
|
Merge pull request #12001 from andyque/upgrade-rapidjson-to-1.0.2
upgrade rapidjson to 1.0.2
|
2015-05-25 15:18:15 +08:00 |
CocosRobot
|
88c4ed664b
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2015-05-25 07:16:13 +00:00 |
minggo
|
4000797ee7
|
Merge pull request #11854 from samuele3hu/v3_physics3d
Add Lua bindings for Physics3D and related test case,then update template project
|
2015-05-25 15:14:35 +08:00 |
Felix J
|
219d8193c4
|
remove else clause
Removing the else clause cause BMFont cannot set its font size
|
2015-05-25 12:48:56 +07:00 |
andyque
|
81070a5299
|
fix lua project compile error
|
2015-05-25 13:42:54 +08:00 |
WenhaiLin
|
234ad668ec
|
Fixed TextureCache::unbindImageAsync fails to unbind all asynchronous callback for a specified bound image.
|
2015-05-25 11:47:37 +08:00 |
andyque
|
81d562803b
|
upgrade rapidjson to 1.0.2
|
2015-05-25 11:43:03 +08:00 |