Huabing.Xu
|
bb4128036c
|
use quad command for tile map rendering
|
2014-06-20 18:10:18 +08:00 |
yangxiao
|
c5e562106f
|
Animate3D support spawn
|
2014-06-20 17:55:25 +08:00 |
lvlong
|
478ea8949a
|
Merge branch 'v3' of https://github.com/lvlonggame/cocos2d-x into v3
Conflicts:
tools/bindings-generator
tools/cocos2d-console
|
2014-06-20 16:14:46 +08:00 |
lvlong
|
69436ddd65
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
Conflicts:
cocos/3d/CCBundle3D.cpp
cocos/3d/CCBundle3D.h
cocos/3d/CCBundle3DData.h
|
2014-06-20 16:02:22 +08:00 |
lvlong
|
e4bbfad773
|
1. binary loader is OK.
2. add some comment.
|
2014-06-20 15:30:08 +08:00 |
andyque
|
9b945683b5
|
fix contentSize not set properly problem
|
2014-06-20 14:55:42 +08:00 |
andyque
|
5f5b705bee
|
refactor setSize to setContentSize and deprecated the old interface
|
2014-06-20 14:03:33 +08:00 |
yangxiao
|
f633c6a8c2
|
create sub Animate3D
|
2014-06-20 12:01:54 +08:00 |
yinkaile
|
1aa07906a1
|
add new line at the end of the file
|
2014-06-20 11:36:48 +08:00 |
yinkaile
|
aac4ded898
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-06-20 11:24:12 +08:00 |
yinkaile
|
510bc23b16
|
1.fixed action may shake a little
2.fixed frame event will emit even they do not in current play section
|
2014-06-20 11:23:26 +08:00 |
andyque
|
4ca184b58a
|
issue #5161, deprecated getSize
|
2014-06-20 11:18:53 +08:00 |
yinkaile
|
043c640037
|
fixed warning and logic error
|
2014-06-20 10:52:14 +08:00 |
zhangbin
|
ec62f05b12
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-06-20 10:51:13 +08:00 |
zhangbin
|
0019d9a061
|
Optimize the win32 projects configuration.
|
2014-06-20 10:50:43 +08:00 |
andyque
|
585ccf2c71
|
issue #5161, replace all _size to _contentSize
|
2014-06-20 10:40:16 +08:00 |
Mazyad Alabduljaleel
|
433dc140cd
|
CCLOGINFO compilation fix
|
2014-06-19 20:59:08 +04:00 |
minggo
|
9f0a566b8a
|
Merge pull request #6945 from John-He-928/mingw-build
Fix MinGW build
|
2014-06-19 22:08:28 +08:00 |
lite3
|
77210d60ae
|
fix: can not create networkThread at second create HttpClient.
|
2014-06-19 22:07:24 +08:00 |
minggo
|
e374bd67c7
|
Merge pull request #6946 from hanjukim/skip-utf8-bom
Skip UTF8 BOM if it exists and bug fix for unterminated string
|
2014-06-19 22:02:38 +08:00 |
CocosRobot
|
a3bee308f6
|
[AUTO]: updating luabinding automatically
|
2014-06-19 13:24:36 +00:00 |
minggo
|
0d07e19cd1
|
Merge pull request #7054 from 2youyouo2/v3
add TimelineAction
|
2014-06-19 21:05:15 +08:00 |
minggo
|
190d6d4859
|
Merge pull request #7136 from CocosRobot/update_lua_bindings_1403162482
[AUTO]: updating luabinding automatically
|
2014-06-19 20:56:10 +08:00 |
minggo
|
cdbd3508d4
|
Merge pull request #7139 from zawasp/uniform_struct
fix warning Uniform is struct, not class.
|
2014-06-19 20:55:37 +08:00 |
lite3
|
05df5b8e14
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-06-19 19:54:09 +08:00 |
gin0606
|
79f82b00bc
|
Add new line at the end of a file to *.mm
|
2014-06-19 20:48:50 +09:00 |
gin0606
|
3ae8e29ce5
|
Add new line at the end of a file to *.h
|
2014-06-19 20:45:49 +09:00 |
gin0606
|
bf4f30d14b
|
Add new line at the end of a file to *.cpp
|
2014-06-19 20:45:24 +09:00 |
Huabing.Xu
|
f82be936b5
|
Merge branch 'fast_tmx_copy' into fast_tmx
Conflicts:
cocos/2d/CCFastTMXLayer.cpp
|
2014-06-19 18:10:44 +08:00 |
Huabing.Xu
|
e03c412e71
|
refactor fast tmx rendering
|
2014-06-19 18:05:21 +08:00 |
chuanweizhang2013
|
be8775e314
|
Merge branch 'v3' of https://github.com/cocoscodeide/cocos2d-x into v3luaruntime
|
2014-06-19 17:23:36 +08:00 |
andyque
|
4d64b166cc
|
refactor - replace magic string with const string
|
2014-06-19 17:04:14 +08:00 |
Mircea Rila
|
69f1bb6193
|
fix warning Uniform is struct, not class.
|
2014-06-19 11:46:00 +03:00 |
boyu0
|
5f10ff2c29
|
issue #4437: change name TMXLayer2 and TMXTiledMap2 to FastTMXLayer and FastTMXTiledMap, change Point to Vec2
|
2014-06-19 15:57:13 +08:00 |
lvlong
|
8493c4579b
|
before switch branch save
|
2014-06-19 15:43:02 +08:00 |
CocosRobot
|
c638cb8816
|
[AUTO]: updating luabinding automatically
|
2014-06-19 07:22:49 +00:00 |
andyque
|
a26ef87783
|
cleanup reader code
|
2014-06-19 15:16:56 +08:00 |
minggo
|
136033c282
|
not set _orderOfArrival to 0 after visit
|
2014-06-19 15:09:27 +08:00 |
andyque
|
515de9eda5
|
remove magic string of widget json reader
|
2014-06-19 14:40:24 +08:00 |
2youyou2
|
0ce51162af
|
support Label widget
|
2014-06-19 14:11:37 +08:00 |
yangxiao
|
c5bb10e5f4
|
add comments
|
2014-06-19 14:11:14 +08:00 |
samuele3hu
|
3a350e11ae
|
Add Lua binding for Animation3D and Animate3D ,and add related test case
|
2014-06-19 14:05:38 +08:00 |
子龙山人
|
e1095c4f09
|
Merge pull request #9 from geron-cn/guanghuiv3
Guanghuiv3
|
2014-06-19 13:38:53 +08:00 |
yangxiao
|
4db0bea73f
|
bone original pose
|
2014-06-19 12:01:03 +08:00 |
minggo
|
e60e3c217d
|
Merge pull request #7046 from Dhilan007/v3-label-improve
1.Support setting up the line height and additional kerning of label.
|
2014-06-19 09:44:51 +08:00 |
geron-cn
|
6abc9aba0e
|
add binary read to test-cpp
|
2014-06-18 20:09:12 +08:00 |
andyque
|
b55b95adc3
|
fix linux compile error
|
2014-06-18 18:28:31 +08:00 |
andyque
|
20b41d2886
|
fix android compile error
|
2014-06-18 18:25:31 +08:00 |
boyu0
|
d89c2176c3
|
issue #4437: add vertex z support, fix some bugs.
|
2014-06-18 18:19:13 +08:00 |
Dhilan007
|
9351172baf
|
add test case for new API of Label.
|
2014-06-18 18:01:55 +08:00 |
geron-cn
|
5cfbd3a2bd
|
add binary decode to armature
|
2014-06-18 17:43:13 +08:00 |
yangxiao
|
9eaff7465d
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-06-18 17:17:33 +08:00 |
yangxiao
|
052b4fa1ce
|
bone origin matrix
|
2014-06-18 17:16:54 +08:00 |
zhangbin
|
1b056b6c49
|
Remove the debug symbols for release mode in xcode projects.
Modify the template of lua runtime.
|
2014-06-18 17:06:56 +08:00 |
andyque
|
9398395de8
|
fix custom property
|
2014-06-18 16:19:24 +08:00 |
andyque
|
1533374bd1
|
add ui animation for binary parsing
|
2014-06-18 15:55:01 +08:00 |
andyque
|
aa5df68b96
|
Merge branch 'v3' into cleanupBinaryLoader
Conflicts:
cocos/3d/CCAnimationCurve.h
cocos/3d/CCAnimationCurve.inl
|
2014-06-18 15:13:34 +08:00 |
子龙山人
|
0b677a86d7
|
Merge pull request #8 from geron-cn/guagnhuiv3
Guagnhuiv3
|
2014-06-18 14:47:11 +08:00 |
andyque
|
63475a6f81
|
refactor Loader
|
2014-06-18 14:44:00 +08:00 |
geron-cn
|
12bb7564cd
|
fix cannot compile in windows
|
2014-06-18 14:35:43 +08:00 |
2youyou2
|
b323f5772e
|
optimize frame
|
2014-06-18 14:21:33 +08:00 |
andyque
|
615995af54
|
add base property parser for WidgetReader
|
2014-06-18 14:15:11 +08:00 |
minggo
|
a587931ce3
|
Merge pull request #7115 from minggo/windows-fix
fix compiling error on windows
|
2014-06-18 14:14:39 +08:00 |
CocosRobot
|
155638f2de
|
[AUTO]: updating luabinding automatically
|
2014-06-18 06:10:38 +00:00 |
minggo
|
d6776b664a
|
fix compiling error on windows
|
2014-06-18 14:01:57 +08:00 |
minggo
|
08453b911d
|
Merge pull request #7071 from pandamicro/Script_onEnter_fix
Fixed #5563: Wrap override onEnter function by script call detection code to solve bugs in JSB
|
2014-06-18 13:37:57 +08:00 |
pandamicro
|
950894de80
|
Fixed #5563: Fix include issue
|
2014-06-18 12:47:48 +08:00 |
andyque
|
95f1bd7e72
|
update loader
|
2014-06-18 11:54:25 +08:00 |
pandamicro
|
94fdff1da9
|
Fixed #5563: Make sendNodeEventToXXX as static functions of ScriptEngineManager in CCScriptSupport
|
2014-06-18 11:51:52 +08:00 |
CocosRobot
|
d58d36d1c8
|
[AUTO]: updating luabinding automatically
|
2014-06-18 03:44:06 +00:00 |
minggo
|
6ecca08340
|
Merge pull request #7039 from minggo/get-child-by-name
issue #4693: add getName(), setName() and getChildByName()
|
2014-06-18 11:30:14 +08:00 |
minggo
|
246d6f12c9
|
Merge pull request #7047 from samuele3hu/v3_keypad_fix
Resolve the compile warning for Lua bindings project
|
2014-06-18 11:29:54 +08:00 |
minggo
|
bd499d4bd6
|
Merge pull request #7003 from andyque/back_compatible_fix
fix KeyCode back compatible
|
2014-06-18 11:29:02 +08:00 |
andyque
|
2cef0cb437
|
update ccs-res
|
2014-06-18 11:26:26 +08:00 |
2youyou2
|
719fdb712d
|
add frame event test
|
2014-06-18 11:22:38 +08:00 |
andyque
|
ca24ad6768
|
Merge branch 'v3' into cleanupBinaryLoader
|
2014-06-18 11:19:19 +08:00 |
minggo
|
f05eb9532d
|
fix compiling error
|
2014-06-18 11:11:08 +08:00 |
minggo
|
8a0a6a2ded
|
Merge pull request #7064 from kyokomi/TextReader_filePath_fix
Fix bug for TextReader #setFontName.
|
2014-06-18 10:36:29 +08:00 |
minggo
|
7589bc7b40
|
Merge pull request #7068 from kyokomi/UIButton_ttfFont
Fix UIButton.cpp added TTFFont.
|
2014-06-18 10:32:46 +08:00 |
Dale Stammen
|
da9a652868
|
added missing files to project
|
2014-06-17 09:27:36 -07:00 |
Dale Stammen
|
6fcf43e64d
|
#undef NEAR reserved word for WP8 and WinRT
|
2014-06-17 09:27:19 -07:00 |
CocosRobot
|
22e1d69f9f
|
[AUTO]: updating luabinding automatically
|
2014-06-17 13:24:08 +00:00 |
minggo
|
26cca348cb
|
Merge pull request #7085 from super626/v3
Sprite3D animation
|
2014-06-17 21:05:58 +08:00 |
yangxiao
|
1ba59fba94
|
code adjustment according to minggo
|
2014-06-17 19:18:56 +08:00 |
minggo
|
552c3cbb2f
|
[ci skip]
|
2014-06-17 18:42:10 +08:00 |
minggo
|
4da24dfade
|
issue #4693: correct comment
|
2014-06-17 16:21:24 +08:00 |
kyokomi
|
b6ed783b0b
|
fix use raw char* to represent string.
|
2014-06-17 17:05:44 +09:00 |
2youyou2
|
806d74b6f9
|
add change play section test
|
2014-06-17 15:57:30 +08:00 |
2youyou2
|
c221a59954
|
fixed frame's value not right when enter frame
|
2014-06-17 15:57:06 +08:00 |
kyokomi
|
3f7cecaf8b
|
fix move this enum class to private part and change `Type` to `FontType`.
|
2014-06-17 16:34:54 +09:00 |
yangxiao
|
e1fb8c82f0
|
missing include
|
2014-06-17 15:31:45 +08:00 |
yangxiao
|
6c39dc0e18
|
adjust includes
|
2014-06-17 15:28:14 +08:00 |
lvlong
|
c1fd9adebf
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
|
2014-06-17 13:59:25 +08:00 |
lvlong
|
ef32bffceb
|
modify bundle3D load()
|
2014-06-17 13:59:03 +08:00 |
CocosRobot
|
657b90422d
|
[AUTO]: updating luabinding automatically
|
2014-06-17 05:53:04 +00:00 |
yangxiao
|
fd02a914f4
|
remove unused code
|
2014-06-17 13:50:58 +08:00 |
yangxiao
|
17854cd922
|
change speed
|
2014-06-17 13:45:58 +08:00 |
yangxiao
|
b9824e1778
|
remove external from include path
|
2014-06-17 21:16:32 +08:00 |
2youyou2
|
d2a6782a9e
|
fixed start frame not right
|
2014-06-17 11:45:57 +08:00 |
minggo
|
53963a2441
|
issue #4693:enumerateChildren() support regular expression
|
2014-06-17 11:43:03 +08:00 |
yangxiao
|
ae180d8326
|
merge
|
2014-06-17 11:02:05 +08:00 |
lvlong
|
020d6da43c
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
|
2014-06-17 10:53:47 +08:00 |
lvlong
|
ae5965f05f
|
test new version and modify vs2012 project
|
2014-06-17 10:52:55 +08:00 |
yangxiao
|
189fbb7071
|
resolve conflict
|
2014-06-17 10:52:48 +08:00 |
yangxiao
|
fb7fc23ee9
|
refactor code
|
2014-06-17 10:49:52 +08:00 |
Huabing.Xu
|
07ec5970fb
|
1. using external/json folder for rapidjson
2. linux works now
|
2014-06-16 19:18:02 -07:00 |
andyque
|
9ab45744bb
|
Merge branch 'v3' into cleanupBinaryLoader
|
2014-06-17 09:45:16 +08:00 |
Dale Stammen
|
753167b5f2
|
updated xaml resources
|
2014-06-16 09:25:35 -07:00 |
Dale Stammen
|
b66269d85d
|
Merge branch 'v3' into wp8-v3-template
|
2014-06-16 09:11:27 -07:00 |
yangxiao
|
10a49523b9
|
fix cache, android work
|
2014-06-16 23:43:07 +08:00 |
yangxiao
|
452fdc047a
|
Merge branch 'newcode' into v3
|
2014-06-16 22:36:01 +08:00 |
yangxiao
|
7ae06d44a6
|
cache work
|
2014-06-16 20:58:13 +08:00 |
lvlong
|
d587971c09
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
|
2014-06-16 19:35:35 +08:00 |
lvlong
|
32cc5b12d6
|
ready
|
2014-06-16 19:30:45 +08:00 |
yangxiao
|
36808abb72
|
simplify shader
|
2014-06-16 19:23:51 +08:00 |
yangxiao
|
531f8998a1
|
skincache
|
2014-06-16 19:17:07 +08:00 |
lvlong
|
4b7f6a6185
|
static Sprite3D is ok
|
2014-06-16 19:08:43 +08:00 |
yangxiao
|
2c6f7b63d1
|
avoid reopen file
|
2014-06-16 18:46:58 +08:00 |
yangxiao
|
0c07b05e1d
|
remove unused code
|
2014-06-16 18:36:30 +08:00 |
yangxiao
|
c00cdd0ae3
|
use bone dirtyflag
|
2014-06-16 18:22:32 +08:00 |
yangxiao
|
927d29f334
|
bug on Repeat when diff bigger than duration
|
2014-06-16 18:21:47 +08:00 |
2youyou2
|
02363c2ae4
|
read visible property
|
2014-06-16 17:20:59 +08:00 |
yangxiao
|
bc31d6b082
|
merge lv
|
2014-06-16 16:45:43 +08:00 |
yangxiao
|
58a6adca02
|
construct BoneBlendState
|
2014-06-16 15:45:58 +08:00 |
lvlong
|
a4ee8b8dc2
|
Merge branch 'lv' of https://github.com/super626/cocos2d-x into v3
|
2014-06-16 15:39:05 +08:00 |
lvlong
|
2282c98f2e
|
do some test
|
2014-06-16 15:38:03 +08:00 |
Huabing.Xu
|
a0ba6775c6
|
adjust animation logic
|
2014-06-16 15:22:00 +08:00 |
2youyou2
|
f9a817a2bf
|
read flip property
|
2014-06-16 15:19:58 +08:00 |
2youyou2
|
7bb188f15a
|
fixed not read zorder
|
2014-06-16 15:03:53 +08:00 |
lvlong
|
2840409933
|
for tony test
|
2014-06-16 14:09:41 +08:00 |
pandamicro
|
d00c9fe70a
|
Fixed #5563: Add sendNodeEventToJSExtended function to fix issues and remove lua event send (unnecessary)
|
2014-06-16 12:50:35 +08:00 |
CocosRobot
|
30c91729eb
|
[AUTO]: updating luabinding automatically
|
2014-06-16 02:49:38 +00:00 |
minggo
|
111e08062f
|
Merge pull request #7056 from visiblelight/render_texture
Use RGBA when saving a file from render texture
|
2014-06-16 10:44:30 +08:00 |
2youyou2
|
c5fe56ef21
|
update CMakeLists.txt
|
2014-06-16 09:44:14 +08:00 |
yangxiao
|
7b621c5c93
|
aa
|
2014-06-16 00:26:31 +08:00 |
yangxiao
|
dd8f66ce57
|
merge loader
|
2014-06-16 00:01:38 +08:00 |
yangxiao
|
9dd7241176
|
load c3t animation work 90%
|
2014-06-15 22:45:56 +08:00 |
andyque
|
1d01fe8bbc
|
refactor
|
2014-06-15 16:12:24 +08:00 |
kyokomi
|
7d710f6aed
|
Fix UIButton.cpp added TTFFont.
|
2014-06-15 16:58:05 +09:00 |
kyokomi
|
d7199204bd
|
Fix bug for TextReader #setFontName.
|
2014-06-14 23:56:12 +09:00 |
2youyou2
|
d9f34a1412
|
change texture to textureName
|
2014-06-13 19:52:53 +08:00 |
lvlong
|
4ae01d148f
|
11
|
2014-06-13 19:26:46 +08:00 |
yangxiao
|
ff6ef1140d
|
two animate3d the same time
|
2014-06-13 19:20:19 +08:00 |
2youyou2
|
5bce6b87ea
|
change ActionTimeline to cocostudio ActionTimeline folder
|
2014-06-13 18:51:32 +08:00 |
2youyou2
|
c60e424ef2
|
Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3
|
2014-06-13 18:01:17 +08:00 |
2youyou2
|
57fe37f9f1
|
add const word
|
2014-06-13 18:00:46 +08:00 |
2youyou2
|
369ed3e6d3
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-06-13 18:00:01 +08:00 |
pandamicro
|
d524ba1013
|
Fixed #5563: Wrap override onEnter function by script call detection code to solve bugs in JSB
|
2014-06-13 17:59:23 +08:00 |
pipu
|
cb213183bc
|
adjust project.pbxproj and files associated with ActionTimeLine
|
2014-06-13 16:33:07 +08:00 |
2youyou2
|
2031e0e92d
|
change TimelineAction to ActionTimeline
|
2014-06-13 16:03:03 +08:00 |
vision
|
0b8e6a6a83
|
The filename should be converted to lower case before comparing.
|
2014-06-13 15:32:49 +08:00 |
vision
|
33fb1dd050
|
Make the API more extendable
|
2014-06-13 15:27:59 +08:00 |
minggo
|
7c789e6a36
|
Merge pull request #7049 from dabingnn/v3_fixDeleteTexture
fix bug for deleteTexture
|
2014-06-13 15:26:16 +08:00 |
minggo
|
405186a415
|
Merge pull request #7055 from pandamicro/origin_v3
Fixed #5554: Define __NodeRGBA's constructor as CC_CONSTRUCTOR_ACCESS for JSB usage
|
2014-06-13 15:21:20 +08:00 |
2youyou2
|
b181eaf802
|
modify mk file
|
2014-06-13 14:43:53 +08:00 |
samuele3hu
|
9b3b6c0e53
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_keypad_fix
|
2014-06-13 14:39:11 +08:00 |
samuele3hu
|
5b6330d59b
|
Add more conversion functions and manual binding functions
|
2014-06-13 14:10:08 +08:00 |
minggo
|
19fa4733c5
|
Merge pull request #7029 from samuele3hu/v3_lua_ui_fix
Update `LuaStack::executeScriptFile` to support template project loading lua or luac files
|
2014-06-13 13:41:52 +08:00 |
2youyou2
|
e0f6ae9db4
|
change TimelineAction to cocos/2d folder
|
2014-06-13 13:36:01 +08:00 |
vision
|
7e99121af7
|
Change the default pixel format from RGB to RGBA for render texture when saving as PNG.
|
2014-06-13 13:35:18 +08:00 |
yangxiao
|
247734e2e0
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
|
2014-06-13 12:25:04 +08:00 |
Huabing.Xu
|
4e94eaabed
|
Merge branch 'v3' into v3Animation
|
2014-06-13 12:06:11 +08:00 |
Huabing.Xu
|
f7b8acd6fd
|
change pointer to std::vector for mesh
|
2014-06-13 11:59:13 +08:00 |
chuanweizhang2013
|
2eac73cde3
|
add protobuf win32
|
2014-06-13 11:19:04 +08:00 |
boyu0
|
ee919b673f
|
issue #4437: config for android and linux.
|
2014-06-13 11:07:21 +08:00 |
pipu
|
65c2a5e3e1
|
add parse actionTag in loadWidget method of CCNodeReader
|
2014-06-13 10:49:57 +08:00 |
pandamicro
|
7ccff325b6
|
Issue #5554: Define __NodeRGBA's constructor as CC_CONSTRUCTOR_ACCESS for JSB usage
|
2014-06-13 10:29:40 +08:00 |
yangxiao
|
09fe7e13b7
|
blendstate
|
2014-06-13 09:12:29 +08:00 |
Dale Stammen
|
2d913470a0
|
updated fast resume code for app
|
2014-06-12 16:36:53 -07:00 |
Dale Stammen
|
29b9da34ea
|
updated to latest version of Angle to fix memory leak when switching apps
|
2014-06-12 16:35:24 -07:00 |
Dale Stammen
|
b0bc971523
|
fixed reloading of cocos2d-x after app switch
|
2014-06-12 16:34:21 -07:00 |
Dale Stammen
|
70f3f0f913
|
release glTextures before reloading cached textures
|
2014-06-12 16:31:46 -07:00 |
Dale Stammen
|
48404a8fb5
|
fixed reloading of textures from VolatileTexture cache
|
2014-06-12 16:31:07 -07:00 |
Dale Stammen
|
49a94a20ef
|
added releaseGLTexture to release only the glTexture but leave the rest of the texture object intact. Needed to reload cached textures
|
2014-06-12 16:28:38 -07:00 |
Dale Stammen
|
2c5b449c9c
|
updated app name to App
|
2014-06-12 16:27:09 -07:00 |
2youyou2
|
f09b1863a9
|
fixed read sprite
|
2014-06-12 20:16:39 +08:00 |
pipu
|
c0170d23c7
|
fixed warnings
|
2014-06-12 19:56:15 +08:00 |
2youyou2
|
b2c5334de1
|
change NodeCache to NodeReader
|
2014-06-12 19:24:27 +08:00 |
2youyou2
|
eb2e973e07
|
change read name
|
2014-06-12 19:12:05 +08:00 |
2youyou2
|
ea7e24ba24
|
add TimelineActionData
|
2014-06-12 18:50:37 +08:00 |
lvlong
|
dbadabb6e9
|
skin: getPosition()
|
2014-06-12 18:46:45 +08:00 |
yangxiao
|
ae0b850d89
|
boneblendstate 30%
|
2014-06-12 18:32:47 +08:00 |
lvlong
|
14f4b6430f
|
modify 3dloader, you can run animation.
|
2014-06-12 18:26:42 +08:00 |
2youyou2
|
e4f1ac6126
|
add hd resource
|
2014-06-12 17:38:26 +08:00 |
2youyou2
|
7eda0ae999
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-06-12 16:43:04 +08:00 |
lvlong
|
1ca69d2689
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
Conflicts:
cocos/3d/CCBundle3D.cpp
cocos/3d/CCBundle3D.h
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
|
2014-06-12 16:28:36 +08:00 |
2youyou2
|
db992b6d0f
|
modify cocostudio Android.mk
|
2014-06-12 16:26:18 +08:00 |
2youyou2
|
f536020d26
|
remove unused files
|
2014-06-12 16:21:41 +08:00 |
minggo
|
eb21bf1ad1
|
Merge pull request #7030 from Rumist/v3
#5506 bug fix
|
2014-06-12 16:16:13 +08:00 |
lvlong
|
742ea7f2df
|
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
Conflicts:
cocos/2d/cocos2d.vcxproj.filters
cocos/3d/CCBundle3D.cpp
cocos/3d/CCBundle3D.h
|
2014-06-12 15:53:41 +08:00 |
gin0606
|
80c5349d75
|
Fix crash when videoView to remove in android
|
2014-06-12 16:47:08 +09:00 |
yangxiao
|
ee5aa0f648
|
android work
|
2014-06-12 15:42:53 +08:00 |
samuele3hu
|
c6b913145c
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_ui_fix
|
2014-06-12 15:41:52 +08:00 |
samuele3hu
|
27a3a46d62
|
Modify the implemetation of `LuaStack::executeScriptFile`
|
2014-06-12 15:39:59 +08:00 |
Huabing.Xu
|
9acf8e6253
|
fix bug for deleteTexture
|
2014-06-12 15:22:41 +08:00 |
minggo
|
5a28ba68b4
|
Merge pull request #7031 from sachingarg05/GLProgramNoAbort
GLProgram should not abort() if shader compilation fails, returning false is better.
|
2014-06-12 15:03:29 +08:00 |
boyu0
|
acb87f414e
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fast_tmx
|
2014-06-12 14:44:28 +08:00 |
minggo
|
ed14108ab1
|
Merge pull request #7042 from Dhilan007/v3-systemfont-ios
LinWenhai fixed calculating height of multi-line string was incorrect on IOS.
|
2014-06-12 14:44:26 +08:00 |
Dhilan007
|
b2d8e4fc93
|
add assert.
|
2014-06-12 14:41:01 +08:00 |
samuele3hu
|
5bdecadd70
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_ui_fix
|
2014-06-12 14:09:00 +08:00 |
Huabing.Xu
|
e70918e325
|
extract Animation3DData
|
2014-06-12 14:03:33 +08:00 |
samuele3hu
|
c2288936db
|
Remove `handleStudioEventListener` of LuaEngine
|
2014-06-12 13:50:52 +08:00 |
samuele3hu
|
f687f63bfd
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_keypad_fix
|
2014-06-12 13:44:15 +08:00 |
samuele3hu
|
6c7b538ee1
|
Add deprecated support for the related UI addEventListener functions
|
2014-06-12 12:02:22 +08:00 |
Dhilan007
|
3511d1e87e
|
1.Support setting up the line height and additional kerning of label.
2.Add more annotation
|
2014-06-12 12:01:15 +08:00 |
minggo
|
5c718e27da
|
Merge pull request #7044 from Dhilan007/v3-label-improve
Ensuring release cache texture in timely.
|
2014-06-12 11:39:36 +08:00 |
minggo
|
c5a8ba3a2c
|
Merge pull request #7043 from Dhilan007/v3-texturecachefix
issue #3341:fix TextureCache::addImageAsync repeatedly generate Image for the same image file.
|
2014-06-12 11:35:34 +08:00 |
samuele3hu
|
379db53673
|
Reconstruct the _sendRequest function of LuaMinXmlHttpRequest
|
2014-06-12 11:24:46 +08:00 |
Dhilan007
|
d755b7ffcb
|
issue #3341:fix TextureCache::addImageAsync repeatedly generate Image for the same image file.
|
2014-06-12 11:21:42 +08:00 |
minggo
|
05a65a68bb
|
issue #4693: added enumerateChildren()
|
2014-06-12 10:41:08 +08:00 |
samuele3hu
|
5349125ad0
|
Reconstruct the addEventListener for cocostudio ui control
|
2014-06-12 10:10:37 +08:00 |
samuele3hu
|
108c0d0da9
|
Modify ini files for bindings-generator to fix the compile warning
|
2014-06-12 10:08:58 +08:00 |
lvlong
|
9fe7c1a9da
|
loader
|
2014-06-12 10:01:54 +08:00 |
LinWenhai
|
b268536385
|
fixed typo.
|
2014-06-12 09:46:18 +08:00 |
2youyou2
|
4d1bf0c1a2
|
Merge branch 'v3' of https://github.com/2youyouo2/cocos2d-x into v3
Conflicts:
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioTimelineActionTest/TimelineActionTestScene.cpp
|
2014-06-12 09:42:20 +08:00 |
Dale Stammen
|
775832a710
|
added missing files
|
2014-06-11 13:18:10 -07:00 |
youyou
|
28ae57c5fc
|
add AsyncReader
|
2014-06-12 00:38:23 +08:00 |
Dhilan007
|
7cc3879257
|
Ensuring release cache texture in timely.
|
2014-06-11 22:03:10 +08:00 |
Dhilan007
|
63a68632a5
|
fixed calculating height of multi-line string was incorrect on IOS.
|
2014-06-11 21:49:08 +08:00 |
2youyou2
|
aa06fab776
|
support relative path for reading json
|
2014-06-11 21:11:22 +08:00 |
Huabing.Xu
|
f1bc0971aa
|
extract mesh data, material data, skin data into a header file for reuse in converter and engine
|
2014-06-11 18:24:14 +08:00 |
Huabing.Xu
|
65acec013b
|
Merge branch 'v3' into v3Animation
|
2014-06-11 17:45:31 +08:00 |
minggo
|
8a5bfb9840
|
issue #4693: add getName(), setName() and getChildByName()
|
2014-06-11 16:57:43 +08:00 |
andyque
|
5515c43bb2
|
improve lasers
|
2014-06-11 15:16:08 +08:00 |
Huabing.Xu
|
18663609b4
|
add interface for speed and playback in animate
|
2014-06-11 15:07:37 +08:00 |
andyque
|
f50263402a
|
improve parser
|
2014-06-11 14:56:12 +08:00 |
minggo
|
ccb24abf52
|
Merge pull request #7028 from heliclei/cocos-version
[ccconsole]Add version command.
|
2014-06-11 14:49:47 +08:00 |
andyque
|
2f6f1b7151
|
improve binary format
|
2014-06-11 14:45:35 +08:00 |
yangxiao
|
d76525ced1
|
use my data temp
|
2014-06-11 14:20:14 +08:00 |
andyque
|
7a8f27ee0b
|
remove unused parser code
|
2014-06-11 14:15:34 +08:00 |
yangxiao
|
5b05ab6353
|
fix rendering bug
|
2014-06-11 14:05:35 +08:00 |
Huabing.Xu
|
9ee6f1f3e0
|
adjust shader uniform settings
use a new fake data for testing
|
2014-06-11 12:07:25 +08:00 |
Huabing.Xu
|
a8c321fe64
|
add use glprogram before setting uniform data for meshcommand
|
2014-06-11 11:34:04 +08:00 |
2youyou2
|
09a2ceb7df
|
add TimelineAction
|
2014-06-11 11:10:07 +08:00 |
CocosRobot
|
818c478224
|
[AUTO]: updating luabinding automatically
|
2014-06-11 02:30:38 +00:00 |
samuele3hu
|
4ce2d7f193
|
Update values of KeyCode used in the Lua to fix related error
|
2014-06-11 10:10:11 +08:00 |
yangxiao
|
cddad40ec0
|
make it rotate
|
2014-06-11 10:01:52 +08:00 |
andyque
|
b895018765
|
update parser
|
2014-06-11 09:35:24 +08:00 |
Sachin Garg
|
8ba4c7a083
|
GLProgram should not abort() if shader compilation fails, returning false will allow app to show custom error message to user (or use other simple shaders if a complicated shader fails to compile on some device).
|
2014-06-10 17:59:15 +05:30 |
yangxiao
|
6d09b50699
|
animation bug
|
2014-06-10 19:53:06 +08:00 |
elsanide
|
2e73f63156
|
#5506 bug fix
when Director->convertToUI() called, returned wrong value.
kazmath code (under 3.0 version.)
//********************************************************
kmVec3* kmVec3TransformCoord(kmVec3* pOut, const kmVec3* pV, const kmMat4* pM)
{
/*
a = (Vx, Vy, Vz, 1)
b = (a×M)T
Out = 1 ⁄ bw(bx, by, bz)
*/
kmVec4 v;
kmVec4 inV;
kmVec4Fill(&inV, pV->x, pV->y, pV->z, 1.0);
kmVec4Transform(&v, &inV,pM);
pOut->x = v.x / v.w;
pOut->y = v.y / v.w;
pOut->z = v.z / v.w;
return pOut;
}
//********************************************************
Mat4.h & MathUtil version (3.1 or later)
//********************************************************
inline void MathUtil::transformVec4(const float* m, const float* v, float* dst)
{
// Handle case where v == dst.
float x = v[0] * m[0] + v[1] * m[4] + v[2] * m[8] + v[3] * m[12];
float y = v[0] * m[1] + v[1] * m[5] + v[2] * m[9] + v[3] * m[13];
float z = v[0] * m[2] + v[1] * m[6] + v[2] * m[10] + v[3] * m[14];
float w = v[0] * m[3] + v[1] * m[7] + v[2] * m[11] + v[3] * m[15];
dst[0] = x;
dst[1] = y;
dst[2] = z;
dst[3] = w;
}
//****************************************************
Transforms 3-D vector or an array of 3-D vectors using a given matrix, projecting the result back into w = 1.
but, it is not apply w = 1.
|
2014-06-10 18:15:07 +09:00 |
samuele3hu
|
46e5b72827
|
Add a log
|
2014-06-10 16:56:07 +08:00 |
samuele3hu
|
90907f451e
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_ui_fix
|
2014-06-10 16:50:26 +08:00 |
samuele3hu
|
5aec5d4a83
|
Update `LuaStack::executeScriptFile` to support template project loading lua or luac files
|
2014-06-10 16:47:32 +08:00 |
heliclei
|
d4a9640a5e
|
[ccconsole]Add version command.
|
2014-06-10 16:29:06 +08:00 |
2youyou2
|
24990b37bf
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-06-10 15:25:15 +08:00 |
andyque
|
48f7743daa
|
Merge branch 'v3' into cleanupBinaryLoader
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
|
2014-06-10 15:08:10 +08:00 |
minggo
|
d7af5eccd4
|
Merge pull request #7024 from pandamicro/SpriteFrame_Ctor
Issue #5533: Add SpriteFrame's constructor
|
2014-06-10 13:38:27 +08:00 |
pandamicro
|
8bc531a0fb
|
Fixed #5533: Fix usage of new SpriteFrame in engine
|
2014-06-10 12:04:20 +08:00 |
pandamicro
|
92a33225ff
|
Fixed #5533: Make SpriteFrame's constructor and init functions public temporarily to avoid issues
|
2014-06-10 11:39:48 +08:00 |
samuele3hu
|
aa877f2b50
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_ui_fix
|
2014-06-10 11:31:08 +08:00 |
samuele3hu
|
5a80b4da2e
|
Fix the crash of cocostudio ui lua test cases and add some deprecated functions of Widget
|
2014-06-10 11:30:39 +08:00 |
pandamicro
|
bb7cf801e6
|
Fixed #5533: Add SpriteFrame's constructor and make constructor & init functions protected
|
2014-06-10 11:28:34 +08:00 |
minggo
|
0ca9a98f4a
|
Merge pull request #6920 from minggo/orrderOfArrival
don't have to set _orderOfArrival to 0 after visit
|
2014-06-10 10:28:38 +08:00 |
2youyou2
|
0c7cbda144
|
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
|
2014-06-10 09:09:53 +08:00 |
yangxiao
|
a991940268
|
debug Sprite3D with .c3t
|
2014-06-09 18:37:58 +08:00 |
minggo
|
9517f9b852
|
Merge pull request #6996 from newnon/v3_setparent_fix
move node from one parent to another fix
|
2014-06-09 17:13:59 +08:00 |
minggo
|
66c7b85134
|
fix issue on Xcode 6
|
2014-06-09 17:06:40 +08:00 |
CocosRobot
|
e2630f915d
|
[AUTO]: updating luabinding automatically
|
2014-06-09 07:30:49 +00:00 |
boyu0
|
3975f55de7
|
issue #4437: fix crash when doesn't support VAO, and make calculation more precisely.
|
2014-06-09 15:28:49 +08:00 |
minggo
|
8a3e64918d
|
Merge pull request #7014 from andyque/ImproveUIText
improve UIText
|
2014-06-09 15:27:04 +08:00 |
CocosRobot
|
e1a43d8ac4
|
[AUTO]: updating luabinding automatically
|
2014-06-09 07:20:59 +00:00 |
minggo
|
ecf32bcbf7
|
Merge pull request #7015 from andyque/improveUITextField
add getStringLength to UITextField
|
2014-06-09 15:16:47 +08:00 |
andyque
|
d46025af64
|
Merge branch 'improvement/COC-3' of https://github.com/zhouxiaoxiaoxujian/cocos2d-x into improveUITextField
Conflicts:
cocos/ui/UITextField.h
|
2014-06-09 14:46:04 +08:00 |
andyque
|
b7c8759f3b
|
modify outline size parameter
|
2014-06-09 14:37:56 +08:00 |
andyque
|
a52532c3c5
|
Merge branch 'feature/COC-5' of https://github.com/zhouxiaoxiaoxujian/cocos2d-x into ImproveUIText
Conflicts:
cocos/ui/UIText.cpp
|
2014-06-09 14:17:57 +08:00 |
minggo
|
59c7b7e9a0
|
Merge pull request #7004 from Dhilan007/v3-labelfix
close issue#5158:Label's display may go bonkers if using outline feature.
|
2014-06-09 14:17:46 +08:00 |
minggo
|
48443b8d52
|
Merge pull request #7008 from visiblelight/ProgramState
Fix issue 5393
|
2014-06-09 11:47:57 +08:00 |
boyu0
|
dff0fada28
|
issue #4437: fix some bugs.
|
2014-06-09 11:36:44 +08:00 |
CocosRobot
|
638f7f12c5
|
[AUTO]: updating luabinding automatically
|
2014-06-09 03:15:50 +00:00 |
vision
|
ae16c88538
|
Save the bound texture unit so that the sampler can be updated dynamiclly.
|
2014-06-09 10:58:28 +08:00 |
andyque
|
6bc82ef5ab
|
restore UIScrollView constructor and destructor to public
|
2014-06-09 10:47:02 +08:00 |
andyque
|
c4f5e71bbd
|
restore Widget's constructor and destructor to public
|
2014-06-09 10:41:17 +08:00 |
andyque
|
1a933807b5
|
remove UIInterface.h header file
|
2014-06-09 10:35:54 +08:00 |
andyque
|
7a25fbfe29
|
refactor touch event
|
2014-06-09 10:23:11 +08:00 |
Dhilan007
|
4e0759533b
|
close issue#5158:Label's display may go bonkers if using outline feature.
|
2014-06-09 10:12:22 +08:00 |
andyque
|
38f28d4bd5
|
fix KeyCode back compatible
|
2014-06-09 09:50:13 +08:00 |
minggo
|
46ed99f611
|
Merge pull request #7001 from CocosRobot/update_lua_bindings_1402278332
[AUTO]: updating luabinding automatically
|
2014-06-09 09:47:10 +08:00 |
CocosRobot
|
c604c09069
|
[AUTO]: updating luabinding automatically
|
2014-06-09 01:46:34 +00:00 |
minggo
|
fa74de8511
|
Merge pull request #6993 from Teivaz/v3
* Set COCOS2D_VERSION to 3.2.0
|
2014-06-09 09:43:50 +08:00 |
Sergey
|
904f157c2c
|
move node from one parent to another fix
|
2014-06-07 12:25:20 +04:00 |
yangxiao
|
0c95fe1fbd
|
animation test
|
2014-06-06 19:12:08 +08:00 |
boyu0
|
fc5e58b521
|
issue #4437: add dirty tag.
|
2014-06-06 18:03:44 +08:00 |
oleksandr.kuznietsov
|
2640938c68
|
* Set COCOS2D_VERSION to 3.2.0
|
2014-06-06 12:58:32 +03:00 |
boyu0
|
560053d23c
|
issue #4437: add test and fix transform.
|
2014-06-06 17:33:27 +08:00 |
Frank.Xu
|
d7f808934d
|
Add const for getStringLength() function
|
2014-06-06 17:06:55 +08:00 |
zhouxiaoxiaoxujian
|
e0cc5153fa
|
Remove misleading comment, add new comment
Remove misleading comment, add new comment for enableOutline
|
2014-06-06 16:54:51 +08:00 |
zhouxiaoxiaoxujian
|
fabc4d03ee
|
Update UIText.cpp
|
2014-06-06 16:50:25 +08:00 |
zhouxiaoxiaoxujian
|
03eeb2cade
|
Remove unnecessary Type::TTF Check
Remove unnecessary TTF type check on enableOutline or enableGlow function。
|
2014-06-06 16:41:45 +08:00 |
boyu0
|
a8a5f6b230
|
issue #4437: add new tmx.
|
2014-06-06 16:15:46 +08:00 |
andyque
|
4f22b03d7f
|
refactor Widget setColor & setOpacity
|
2014-06-06 16:14:35 +08:00 |
andyque
|
282264575b
|
refactor TextField setColor & setOpacity
|
2014-06-06 16:10:33 +08:00 |
andyque
|
5ae97da030
|
refactor TextBMFont setColor & setOpacity
|
2014-06-06 16:09:59 +08:00 |
andyque
|
d615de8299
|
refactor TextAtlas setColor & setOpacity
|
2014-06-06 16:09:13 +08:00 |
andyque
|
a37a6737ca
|
refactor Text setColor & setOpacity
|
2014-06-06 16:08:31 +08:00 |
andyque
|
f0f4d41813
|
refactor Slider setColor & setOpacity
|
2014-06-06 16:07:47 +08:00 |
andyque
|
3c80fe53d3
|
refactor LoadingBar setColor & setOpacity
|
2014-06-06 16:03:59 +08:00 |
andyque
|
6193893b2b
|
refactor ImageView setColor & setOpacity
|
2014-06-06 16:02:44 +08:00 |
andyque
|
0805c215b3
|
refactor UICheckBox setColor & setOpacity
|
2014-06-06 16:01:55 +08:00 |
andyque
|
46ad4edab3
|
refactor UIButton setColor & setOpacity
|
2014-06-06 16:00:28 +08:00 |