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 |
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 |
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 |
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 |