yusheng.lu
|
7c34b06969
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader
|
2014-12-24 16:02:37 +08:00 |
youyou
|
db6ffd7962
|
Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x; branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-12-24 15:59:50 +08:00 |
minggo
|
6949f468f2
|
[ci skip] Update CHANGELOG
|
2014-12-24 15:36:23 +08:00 |
minggo
|
0b7572f3ee
|
[ci skip]
|
2014-12-24 15:35:58 +08:00 |
minggo
|
3254339007
|
[ci skip] Update CHANGELOG
|
2014-12-24 15:34:57 +08:00 |
minggo
|
9af7efa922
|
[ci skip] Update CHANGELOG
|
2014-12-24 15:32:37 +08:00 |
yusheng.lu
|
c64792959c
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader
|
2014-12-24 15:32:02 +08:00 |
lvlong
|
da2683aad9
|
Merge branch 'frustum' of github.com:lvlonggame/cocos2d-x into frustum
|
2014-12-24 15:10:48 +08:00 |
lvlong
|
4d1ca0966c
|
lua binding
|
2014-12-24 15:09:26 +08:00 |
lvlonggame
|
805b248af3
|
modify win-project
|
2014-12-24 15:06:58 +08:00 |
minggo
|
42f1d5fdf3
|
Merge pull request #9601 from minggo/set-glcolor
Director supports setting clear color
|
2014-12-24 14:45:43 +08:00 |
CocosRobot
|
a5d3e8361b
|
[AUTO]: updating luabinding automatically
|
2014-12-24 06:42:09 +00:00 |
minggo
|
445ace489f
|
Merge pull request #9603 from minggo/update-release-note
[ci skip]Update release note
|
2014-12-24 14:37:35 +08:00 |
minggo
|
600acd3739
|
Update RELEASE_NOTES.md
|
2014-12-24 14:36:50 +08:00 |
minggo
|
3de172c4e6
|
update release note
|
2014-12-24 14:33:41 +08:00 |
minggo
|
bb9fb9f0d6
|
Merge pull request #9591 from liamcindy/Layout
update for lay out
|
2014-12-24 14:27:08 +08:00 |
yusheng.lu
|
fa5b4f8df7
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader
Conflicts:
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
cocos/2d/libcocos2d_wp8.vcxproj.filters
resolve the conflicts
|
2014-12-24 13:06:38 +08:00 |
minggo
|
b925689435
|
Director supports setting clear color
|
2014-12-24 11:53:38 +08:00 |
Liam
|
dcd544cc66
|
update ui widget function format
|
2014-12-24 11:12:14 +08:00 |
Liam
|
83fcf74882
|
update for code format
|
2014-12-24 10:56:01 +08:00 |
minggo
|
5d8e004b9b
|
Merge pull request #9600 from huangshiwu/v3_allocator_wp
fix allocator related compile error on wp8/8.1 and winrt
|
2014-12-24 10:54:16 +08:00 |
kaile.yin
|
942abfc654
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
|
2014-12-24 10:53:09 +08:00 |
huangshiwu
|
01eeb15a8d
|
fix allocator related compile error on wp8/8.1 and winrt
|
2014-12-24 10:45:29 +08:00 |
minggo
|
ef9c44566b
|
Merge pull request #9593 from CocosRobot/update_lua_bindings_1419317247
[AUTO]: updating luabinding automatically
|
2014-12-24 10:31:58 +08:00 |
minggo
|
4cac8e2cb4
|
Merge pull request #9595 from super626/v3
Do not try to load empty texture
|
2014-12-24 10:31:44 +08:00 |
minggo
|
22f0615366
|
Merge pull request #9596 from minggo/use-auto-reference
performance improve
|
2014-12-24 10:31:28 +08:00 |
yinjimmy
|
24648db2b5
|
execute script with full file path
|
2014-12-24 02:18:29 +08:00 |
yinjimmy
|
b46ee82e90
|
support bind address for console
|
2014-12-24 02:04:42 +08:00 |
yinjimmy
|
a26f62186b
|
track log for windows
|
2014-12-24 01:26:13 +08:00 |
Liam
|
33bd5e3f4c
|
remove unused code
|
2014-12-23 20:36:18 +08:00 |
Liam
|
815ea2a1a5
|
update for code format
|
2014-12-23 20:29:53 +08:00 |
minggo
|
dea483b6ef
|
performance improve
|
2014-12-23 18:07:22 +08:00 |
yusheng.lu
|
d543f8f6a2
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_armature_reader
|
2014-12-23 16:12:50 +08:00 |
yangxiao
|
1dd9a852cf
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
|
2014-12-23 15:54:04 +08:00 |
yangxiao
|
908b9e470d
|
do not try to load empty texture
|
2014-12-23 15:52:45 +08:00 |
yusheng.lu
|
a781c974de
|
submodule ccs-res go forward to newest
|
2014-12-23 15:35:20 +08:00 |
yusheng.lu
|
58ba057228
|
revert submodule ccs-res
|
2014-12-23 15:27:21 +08:00 |
yusheng.lu
|
2b7c0edfed
|
license in ArmatureNodeReader.h added.
|
2014-12-23 15:13:27 +08:00 |
andyque
|
d8f726bc4f
|
modify widget default behavior
|
2014-12-23 15:03:31 +08:00 |
CocosRobot
|
864b924dfb
|
[AUTO]: updating luabinding automatically
|
2014-12-23 06:49:30 +00:00 |
minggo
|
ca932a38e4
|
Merge pull request #9538 from andyque/fixCapInsetSize
restrict capInsets of ui::ImageView, ui::Slider and ui::LoadinbBar
|
2014-12-23 14:44:32 +08:00 |
minggo
|
90a7f99873
|
Merge pull request #9570 from liamcindy/UIListView
override function for listview
|
2014-12-23 14:25:46 +08:00 |
Liam
|
e4360b7616
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Layout
|
2014-12-23 14:15:55 +08:00 |
minggo
|
712b0294b1
|
Merge pull request #9590 from CocosRobot/update_lua_bindings_1419307389
[AUTO]: updating luabinding automatically
|
2014-12-23 14:09:14 +08:00 |
minggo
|
205d65fc7b
|
Merge pull request #9589 from CocosRobot/update_cocosfiles_1419307314
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-12-23 14:08:52 +08:00 |
XiaoYang
|
e80420d2c8
|
Merge pull request #188 from lvlonggame/frustum
modify code format.
|
2014-12-23 12:48:02 +07:00 |
CocosRobot
|
facf9a1a66
|
[AUTO]: updating luabinding automatically
|
2014-12-23 04:05:21 +00:00 |
CocosRobot
|
94d96b5ad1
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-12-23 04:01:55 +00:00 |
minggo
|
40d00e3d97
|
Merge pull request #9554 from super626/sync_load
create 3d sprite asynchronously
|
2014-12-23 12:00:13 +08:00 |
minggo
|
a2327f9488
|
Merge pull request #9568 from vovkasm/pull/fix-cmake-link
cmake: fix tests linking
|
2014-12-23 11:49:40 +08:00 |