Commit Graph

26437 Commits

Author SHA1 Message Date
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
songchengjiang ceb834b8d4 read AABB from file(v0.6+) 2014-12-24 10:12:31 +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
minggo cf25160b98 Merge pull request #9588 from mannewalis/windows_allocator_fix
fixing windows8 build
2014-12-23 11:48:03 +08:00
yusheng.lu 7eedef71e6 armature node test completed 2014-12-23 11:13:05 +08:00
yangxiao 3d77c7535d merge cocos 2014-12-23 10:35:35 +08:00
yangxiao 2309a524fd simplify AsyncTaskPool 2014-12-23 10:12:37 +08:00
lvlong 026f0a8b25 modify code format. 2014-12-23 09:57:46 +08:00
XiaoYang c94088238a Merge pull request #184 from tangziwen/v3
remove the float type "f" postfix in /simple_shadow.frag
2014-12-23 08:07:17 +07:00
XiaoYang e5b812516a Merge pull request #187 from lvlonggame/frustum
Frustum
2014-12-23 08:04:25 +07:00
mannewalis 9d885fe664 default lock macros to nothing for unsupported platforms 2014-12-22 19:49:20 -05:00
mannewalis 09f2eed4b8 default lock macros to nothing for unsupported platforms 2014-12-22 19:46:16 -05:00
mannewalis aad45d6952 fixing windows8 build 2014-12-22 19:43:40 -05:00
yusheng.lu 1e05361873 ios/mac project compeleted 2014-12-22 20:08:27 +08:00
yusheng.lu 2de5ba7c2f vs filters update 2014-12-22 19:43:14 +08:00
yusheng.lu 02b9269cff completed multiplatform projects 2014-12-22 19:39:10 +08:00
Liam 1e85f1a080 Merge branch 'UILayout_Widget' into UILayout_Reader 2014-12-22 19:23:03 +08:00
Liam 377d8ec3c0 Merge branch 'UILayout' into UILayout_Widget 2014-12-22 19:22:09 +08:00
youyou ebdb2030e4 revert timeline test 2014-12-22 19:11:13 +08:00
Liam 39d0f183d4 update for code format 2014-12-22 19:05:31 +08:00
youyou 70052b2a3f support animation list 2014-12-22 18:57:48 +08:00
Liam 0465ff8325 remote unuseful format 2014-12-22 18:39:44 +08:00
yusheng.lu b0bfc2906a change armature codes files path 2014-12-22 18:26:50 +08:00