minggo
|
8a5829631d
|
Merge pull request #8171 from huangshiwu/v3_Teivaz
Enable screen orientation change handling - by Teivaz
|
2014-09-29 18:02:03 +08:00 |
minggo
|
f7fcb047aa
|
[ci skip] Update CHANGELOG
|
2014-09-29 18:00:29 +08:00 |
minggo
|
f4b080a03f
|
Merge pull request #8192 from samuele3hu/v3_3D
Add Camera3DTest ,BillBoradTest and more Sprite3DTest for Lua, and update the related lua bindings files
|
2014-09-29 17:56:42 +08:00 |
minggo
|
736ce4d12d
|
Merge pull request #8197 from cocoscodeide/v3
change script file modified time will cause Cocos Code IDE reload file.
|
2014-09-29 17:53:30 +08:00 |
minggo
|
bfac4b4793
|
[ci skip]Update Authors
|
2014-09-29 17:53:10 +08:00 |
minggo
|
f2fe4efdee
|
[ci skip] Update CHANGELOG
|
2014-09-29 17:52:10 +08:00 |
minggo
|
df0bfddcd5
|
Merge pull request #6984 from zhouxiaoxiaoxujian/improvement/COC-4
Improvement ImageViewReader don't necessary loadTexture when imageFilePa...
|
2014-09-29 17:49:38 +08:00 |
songchengjiang
|
9ba70ec7bf
|
Sprite3DHitTest use BoundingBox
|
2014-09-29 16:57:45 +08:00 |
honghui
|
82eb6eeff9
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-09-29 16:28:18 +08:00 |
honghui
|
7a7a83020d
|
change script file modified time will cause Cocos Code IDE reload file.
|
2014-09-29 16:27:13 +08:00 |
Frank.Xu
|
1c1d917620
|
Fix pull request #6894 merge conflicts
|
2014-09-29 16:22:55 +08:00 |
Dhilan007
|
65a14a6d3f
|
Improved thread safety
|
2014-09-29 14:17:51 +08:00 |
minggo
|
c4fac7b37d
|
Merge pull request #8193 from andyque/improveCocostudioReader
replace raw string literal with const external variables to keep consistence.
|
2014-09-29 13:49:28 +08:00 |
minggo
|
6583bf6b1f
|
Merge pull request #8179 from MSOpenTech/wp8-v3-fix
WP8 fixes for v3.3 app certification tests
|
2014-09-29 13:42:40 +08:00 |
songchengjiang
|
a2a52348fd
|
Finished Sprite3DHitTest
|
2014-09-29 11:43:52 +08:00 |
andyque
|
c9b959ec82
|
replace raw string literal with const external variables to keep consistence.
|
2014-09-29 11:35:03 +08:00 |
samuele3hu
|
87fccd7881
|
Remove manaul lua-bindings for Armature::getOffsetPoints
|
2014-09-29 10:37:19 +08:00 |
samuele3hu
|
cb38f6bd5b
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D
|
2014-09-29 10:27:46 +08:00 |
samuele3hu
|
6ea43a60b0
|
Update cocos2dx.ini to skip Node::setAdditionalTransform
|
2014-09-29 10:19:32 +08:00 |
Dhilan007
|
f2f1331026
|
New Audio Engine[Win32]
|
2014-09-29 10:15:41 +08:00 |
minggo
|
804aa18bcf
|
Merge pull request #8191 from CocosRobot/update_lua_bindings_1411953820
[AUTO]: updating luabinding automatically
|
2014-09-29 10:06:46 +08:00 |
samuele3hu
|
f00187d3bb
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3D
Conflicts:
tools/tolua/cocos2dx.ini
|
2014-09-29 09:48:35 +08:00 |
samuele3hu
|
99e1c6640e
|
Add BillBoardTest and update related bindings files
|
2014-09-29 09:43:22 +08:00 |
CocosRobot
|
fd9ed15d6d
|
[AUTO]: updating luabinding automatically
|
2014-09-29 01:25:31 +00:00 |
minggo
|
2af0d4427b
|
Merge pull request #8190 from Dhilan007/v3-win32
fix linker errors on WIN32
|
2014-09-29 09:21:04 +08:00 |
Dhilan007
|
d52144d1e0
|
fix linker errors on WIN32
|
2014-09-28 21:45:09 +08:00 |
songchengjiang
|
3b7dd194a5
|
Add Sprite3DHitTest
|
2014-09-28 18:05:09 +08:00 |
minggo
|
bca00dac1a
|
[ci skip]Update Authors
|
2014-09-28 17:30:19 +08:00 |
XiaoYang
|
f976a116c7
|
Merge pull request #134 from songchengjiang/light_new
move light from 3d to base(Windows)
|
2014-09-28 17:25:07 +08:00 |
minggo
|
913102d923
|
[ci skip] Update CHANGELOG
|
2014-09-28 17:25:04 +08:00 |
songchengjiang
|
39deb73c3a
|
move light from 3d to base(Windows)
|
2014-09-28 17:23:25 +08:00 |
songchengjiang
|
ca4fa42691
|
Sprite3DTest.lua:
Add Sprite3DWithSkinTest
Add AttachmentTest
Add Sprite3DReskinTest
Add Sprite3DMirrorTest
|
2014-09-28 17:01:43 +08:00 |
minggo
|
9511f0deb5
|
Merge pull request #8130 from yestein/v3
Add Cocostudio Armature getOffsetPoints API for Lua
|
2014-09-28 16:48:37 +08:00 |
samuele3hu
|
6b2acf88fc
|
Modify CameraTest and update related lua-bindings files
|
2014-09-28 16:47:06 +08:00 |
minggo
|
ab8db5aced
|
[ci skip] Update CHANGELOG
|
2014-09-28 16:45:38 +08:00 |
minggo
|
8ed336c681
|
Merge pull request #8167 from hongliang-goudou/v3
bugfix for UI animation playing crash if GUI JSON file is loaded again.
|
2014-09-28 16:42:49 +08:00 |
minggo
|
289c1edfe7
|
Merge pull request #8174 from lite3/v3
fix compile error when CC_SPRITE_DEBUG_DRAW
|
2014-09-28 16:21:04 +08:00 |
minggo
|
59294902d4
|
Merge pull request #8177 from CocosRobot/update_lua_bindings_1411745709
[AUTO]: updating luabinding automatically
|
2014-09-28 16:13:35 +08:00 |
minggo
|
cc02931c43
|
Merge pull request #8181 from krzysztof-jusiak/linux-cpp-template-fix
fix for wrong directory in linux cpp-template
|
2014-09-28 16:12:31 +08:00 |
yangxiao
|
e8904454e9
|
add to template
|
2014-09-28 16:08:05 +08:00 |
yangxiao
|
38873dd999
|
move light fix linux and android
|
2014-09-28 16:05:20 +08:00 |
yangxiao
|
dbf564208b
|
move light from 3d to base
|
2014-09-28 16:02:12 +08:00 |
samuele3hu
|
e50eaf684f
|
Add CameraTest and update related lua-bindings files
|
2014-09-28 14:31:58 +08:00 |
Sergey Perepelitsa
|
c1f37a6926
|
Misprint fix
scale9Image double draw fix
|
2014-09-28 10:30:33 +04:00 |
yangxiao
|
744e09c141
|
reset change to getDirectionInWorld
|
2014-09-28 11:03:18 +08:00 |
yangxiao
|
53dee7ef86
|
can ci android compile?
|
2014-09-28 10:21:47 +08:00 |
yangxiao
|
75e5ca30ee
|
merge cocos
|
2014-09-28 09:55:31 +08:00 |
Sergey Perepelitsa
|
094716a500
|
Scale9Sprite cropped frames tests
|
2014-09-28 01:58:26 +04:00 |
Sergey Perepelitsa
|
ab45c582a7
|
Scale9Sprite improvements
small bugs fix
small optimizations
support for cropped sprite frames
|
2014-09-28 01:58:26 +04:00 |
Krzysztof Jusiak
|
bb01201fa6
|
fix for wrong directory in linux cpp-template
|
2014-09-27 10:38:10 +01:00 |