minggo
0be6d27271
Merge pull request #7295 from minggo/support-regular-expression
...
Support regular expression
2014-07-03 15:20:06 +08:00
andyque
32724e559d
fix container default color issue
2014-07-03 14:38:45 +08:00
Pisces000221
1596848979
Also cascade the colours
2014-07-03 14:08:00 +08:00
minggo
fffdfb3711
Merge pull request #7290 from chengstory/v3_OpBinaryParse
...
V3 op binary parse
2014-07-03 14:00:01 +08:00
minggo
2cfea323b0
Merge pull request #7300 from 2youyouo2/v3
...
fixed add relative data bug
2014-07-03 13:56:04 +08:00
minggo
6cc600ccce
fix compiling warnings
2014-07-03 11:43:56 +08:00
chuanweizhang2013
b88b5e4c3d
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
2014-07-03 11:13:59 +08:00
Pisces000221
1cf2910f73
Cascade slide ball's opacity and the Slider's
2014-07-02 18:27:01 +08:00
Huabing.Xu
0214131bb2
optimise tile map rendering
2014-07-02 17:16:03 +08:00
minggo
d8c9f6a0a6
add regular support in Node::enumerateChildren()
2014-07-02 17:07:36 +08:00
minggo
1a089f4a18
Merge pull request #7286 from Dhilan007/v3-gc0702
...
fixed can't get valid value from trigger button.
2014-07-02 16:24:24 +08:00
minggo
666b0e3a2e
Merge pull request #7289 from boyu0/lua_xcode6_support
...
add lua Xcode6 iphone 5s simulator support.
2014-07-02 16:17:33 +08:00
zhangcheng
d1db470cf2
Merge branch 'macLoader' into v3_OpBinaryParse
2014-07-02 16:11:02 +08:00
zhangcheng
2b1ef55ea9
1. fixes scene parse crash.
2014-07-02 15:58:42 +08:00
zhangcheng
9204ac28df
1. merge v3
2014-07-02 15:37:15 +08:00
Huabing.Xu
efa452e0c4
support for fast tmx hex
2014-07-02 15:19:11 +08:00
Dhilan007
097f782c38
remove ControllerAutoAdapter project.
2014-07-02 15:17:29 +08:00
boyu0
35ff23fa6d
support for Xcode6 iphone 5s simulator
2014-07-02 15:16:06 +08:00
Dhilan007
adfc010555
fixed can't get valid value from trigger button[Moga]
2014-07-02 15:09:24 +08:00
samuele3hu
1271c1b62e
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix
2014-07-02 14:29:33 +08:00
samuele3hu
2aee9ed35d
Add the Lua bindings for FastTMXTileMap and FastTMXLayer,then add related test cases
2014-07-02 14:26:56 +08:00
Dhilan007
c5dc7b9cd0
fixed can't get valid value from trigger button.
2014-07-02 14:19:10 +08:00
minggo
f49e230e97
Merge pull request #7284 from chengstory/v3_fixesWarning
...
1. fixes same name warning.
2014-07-02 13:40:07 +08:00
andyque
6e64714331
fix scroll
2014-07-02 11:48:28 +08:00
yangxiao
91cb18389c
Merge branch 'newcode' into v3
2014-07-02 10:55:38 +08:00
zhangcheng
cf9b049926
1. fixes same name warning.
2014-07-02 10:53:35 +08:00
tangnan
dd81e009f8
could add seach path and resolution order path in front.
2014-07-02 10:29:09 +08:00
CocosRobot
2821a23640
[AUTO]: updating luabinding automatically
2014-07-02 02:15:26 +00:00
minggo
5b282e338f
Merge pull request #7279 from andyque/fixTextReader
...
fix Text reader font name
2014-07-02 10:04:00 +08:00
andyque
fb3e499d9d
fix Text reader font name
2014-07-02 10:08:04 +08:00
minggo
d9a1f76755
fix effect of spine
2014-07-02 09:58:07 +08:00
Nite Luo
4cb59683e4
Add Sprite3DRotation test
2014-07-01 12:36:53 -07:00
Nite Luo
a81bea886e
Rotate around anchor point
2014-07-01 10:26:47 -07:00
minggo
aff1e3e1d2
fix compiling error
2014-07-01 22:26:15 +08:00
andyque
7d2685ba02
fix content Size
2014-07-01 21:02:37 +08:00
geron-cn
17c320f1e2
fix
2014-07-01 19:06:51 +08:00
geron-cn
c561f4e2f4
fix win can not compile
2014-07-01 18:55:09 +08:00
Dhilan007
0fbcbec9de
Add missing file for game controller support.
...
Fix using incorrect library project.
2014-07-01 16:44:10 +08:00
zhangcheng
02c7c93e43
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into OpBinaryParse
2014-07-01 16:36:37 +08:00
zhangcheng
4b8f818a1d
1、Update binary parse lib.
2014-07-01 16:31:17 +08:00
minggo
05ca61d62b
Merge pull request #7269 from minggo/fix-crash
...
Fix crash
2014-07-01 16:30:50 +08:00
geron-cn
dfdc4f6b66
fix bug: did not addarmature to the relativedata
2014-07-01 16:24:59 +08:00
minggo
6654bf1129
Merge pull request #7265 from visiblelight/beta_test
...
Fix the crash when capturing screen on WP8
2014-07-01 16:19:45 +08:00
minggo
cc3a9d0737
fix crash caused by std::regex()
2014-07-01 16:09:25 +08:00
minggo
e15d563219
Merge pull request #7247 from andyque/fixFocus
...
fix focus functions
2014-07-01 16:02:23 +08:00
minggo
d130bf84e5
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix-crash
2014-07-01 15:59:43 +08:00
minggo
daa5e257df
Merge pull request #7259 from Dhilan007/v3-gc0627
...
issue #4895:split controller adapter[android]
2014-07-01 15:51:21 +08:00
pandamicro
81df54b82e
Fixed #5635 : Correction of mouse event's cursor position
2014-07-01 15:14:41 +08:00
Dhilan007
66673d88fa
split controller adapter[android]
2014-07-01 15:08:51 +08:00
Dhilan007
abeeb9a0c7
fixing incorrect optimization
2014-07-01 14:57:10 +08:00
Dhilan007
584e90c097
Rotate the frame buffer for WP8 during the snapshot
2014-07-01 14:48:43 +08:00
田矢 慎太朗
39040540fc
Remove redundant comment in ccConfig.h
2014-07-01 15:12:29 +09:00
andyque
fefdc70af9
add default value to widget reader
2014-07-01 14:01:27 +08:00
minggo
80204e3048
Merge pull request #7201 from chengstory/cleanupBinaryLoader_AddSceneBinaryParse
...
Cleanup binary loader add scene binary parse
2014-07-01 13:47:35 +08:00
pandamicro
abfbc4bffb
Fixed #5632 : Indicate the correct button in mouse move event
2014-07-01 13:01:04 +08:00
lvlong
ff908d771a
add a space to test pushing
2014-07-01 11:26:29 +08:00
lvlong
e44dee6607
merge
2014-07-01 11:08:37 +08:00
lvlong
e3cc234cfb
Revert "modify BundleReader and the version read"
...
This reverts commit 660c80fac7
.
2014-07-01 11:05:48 +08:00
andyque
b9a968680f
add default value to widgets reader
2014-07-01 10:57:12 +08:00
lvlong
660c80fac7
modify BundleReader and the version read
2014-07-01 10:45:01 +08:00
andyque
4e63a3da7d
modify nodeReader to support LabelAtlas and LabelBMFont
2014-07-01 10:11:36 +08:00
minggo
eb6ddea26e
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into fix-crash
2014-07-01 10:01:24 +08:00
samuele3hu
1bc0397644
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer
2014-07-01 09:47:41 +08:00
lvlong
c1afd7133a
modify BundleReader and the version read
2014-07-01 09:30:14 +08:00
lvlong
df7ab50062
modify BundleReader and the version read
2014-07-01 09:26:21 +08:00
minggo
00695eed49
Merge pull request #7261 from boyu0/fix_pvr_bgra8888_crash
...
fix crash when load pvr bgra8888 image on android.
2014-06-30 21:39:20 +08:00
minggo
3f4cbffa43
Merge pull request #7260 from visiblelight/beta_test
...
fix that FastTileMapTest crashes on WP8
2014-06-30 21:21:08 +08:00
Dhilan007
3eea298428
unbind the VAO anyway to for safety.
2014-06-30 21:08:43 +08:00
boyu0
6db8ec8aad
fix crash when load pvr bgra8888 image in android.
2014-06-30 20:58:26 +08:00
Dhilan007
79264daf1e
fix the crash on WP8 for FastTileMapTest
2014-06-30 20:56:59 +08:00
minggo
9bcc66912a
fix crash cause by std::regex
2014-06-30 20:45:01 +08:00
Dhilan007
83f4e536c5
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-gc0630
...
Conflicts:
tests/game-controller-test/proj.android/project.properties
2014-06-30 19:27:01 +08:00
Dhilan007
afac6b86ff
move controller support to 'libcontrollerdeleate' project.
2014-06-30 18:41:47 +08:00
minggo
d7cbc2872e
Merge pull request #7250 from minggo/fix-compiling
...
fix compiling error
2014-06-30 18:06:54 +08:00
chuanweizhang2013
4481149a30
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
2014-06-30 17:53:46 +08:00
minggo
a01b305b64
Merge pull request #7257 from CocosRobot/update_lua_bindings_1404121406
...
[AUTO]: updating luabinding automatically
2014-06-30 17:47:52 +08:00
CocosRobot
774c851dcb
[AUTO]: updating luabinding automatically
2014-06-30 09:45:03 +00:00
minggo
f39fa108bb
Merge pull request #7242 from joshuastray/scrollview_fix
...
fix scrollview crashes on win32 because of variable returned without ini...
2014-06-30 17:43:26 +08:00
minggo
36e864552e
Merge pull request #7253 from super626/v3
...
c3b loader bug
2014-06-30 17:33:13 +08:00
minggo
40e88ab6eb
Merge pull request #7251 from 2youyouo2/v3_current_frame_index
...
add gotoFrameAndPlay and setCurrentFrame interface
2014-06-30 17:32:24 +08:00
minggo
f85d84f2ef
Merge pull request #7252 from visiblelight/beta_test
...
Fixing compile errors on WP8
2014-06-30 17:24:08 +08:00
minggo
3b13855374
fix compiling error on iOS
2014-06-30 17:20:13 +08:00
zhangcheng
a3fcddde39
1. NULL->nullptr.
...
2. bRet->ret.
2014-06-30 17:15:55 +08:00
lvlong
701a2b60c2
sub-version > 0
2014-06-30 17:14:47 +08:00
lvlong
42aaf38468
modify reader-64bit bug
2014-06-30 17:10:07 +08:00
Dhilan007
26f3445311
add missing files for the projects
2014-06-30 17:07:55 +08:00
2youyou2
b76127231c
add gotoFrameAndPlay and setCurrentFrame interface
2014-06-30 15:53:12 +08:00
andyque
60ea37cabc
fix focus functions
2014-06-30 14:09:27 +08:00
Dhilan007
2a9e10be2c
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-gc0630
2014-06-30 13:41:55 +08:00
Dhilan007
ef5da0649a
issue #4895:Add test case[ios]
2014-06-30 12:53:26 +08:00
pandamicro
bee41712ad
Fix Travis CI compilation issue
2014-06-30 11:58:15 +08:00
minggo
dc1018e7e2
Merge pull request #7244 from 2youyouo2/v3
...
update armature
2014-06-30 11:33:46 +08:00
minggo
dfe69cdfd8
Merge pull request #7243 from dabingnn/fast_tmx
...
fix bug for tileset searching
2014-06-30 11:14:23 +08:00
Huabing.Xu
d506cf613a
fix bug for tileset searching
2014-06-30 11:08:57 +08:00
2youyou2
30a13c05c9
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-06-30 11:08:22 +08:00
joshuastray
99b127ba5d
fix scrollview crashes on win32 because of variable returned without initialization
2014-06-30 10:19:00 +08:00
2youyou2
aba7421ef6
fixed crashed when remove armature in frame event.
2014-06-30 10:14:31 +08:00
2youyou2
1a9e42ef85
fixed armature blend func has no effect
2014-06-30 10:11:43 +08:00
minggo
ef44e96ff3
Merge pull request #7211 from dabingnn/fast_tmx
...
Fast tmx (added culling for Tile Map)
2014-06-30 09:36:05 +08:00
Dhilan007
74579f19f5
issue #4895:Get events from controller to engine[android]
2014-06-30 03:23:51 +08:00
Dhilan007
5ed581758e
issue #4895:Get events from controller to engine[android]
2014-06-30 03:20:22 +08:00
Dhilan007
3c614d5670
issue #4895:Get events from controller to engine[ios]
2014-06-30 00:31:45 +08:00
Dhilan007
7cd7b9e054
issue #4892:Implement logical codes of game controller
2014-06-30 00:28:21 +08:00
Huabing.Xu
c50394c4f3
fix merge conflitcts on windows
2014-06-29 20:30:26 +08:00
Huabing.Xu
47471e202d
Merge branch 'v3' into fast_tmx
...
Conflicts:
cocos/2d/cocos2d.vcxproj.filters
2014-06-29 20:23:43 +08:00
CocosRobot
bb9df773a9
[AUTO]: updating luabinding automatically
2014-06-29 09:28:33 +00:00
minggo
4f79176da2
Merge pull request #7234 from boyu0/iss5614_physics_transform
...
closed #5614 : add transform support for physics
2014-06-29 17:23:20 +08:00
CocosRobot
afe11ca435
[AUTO]: updating luabinding automatically
2014-06-29 08:45:14 +00:00
minggo
7f28e81d09
Merge pull request #7226 from super626/v3
...
Animation3D
2014-06-29 16:41:13 +08:00
chuanweizhang2013
a8f4dcb59f
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
2014-06-28 18:10:17 +08:00
yangxiao
58e9fcc741
remove unused code
2014-06-27 22:11:29 +08:00
Huabing.Xu
9227c4f30a
refactor updateTiles
2014-06-27 19:41:34 +08:00
Huabing.Xu
46e5b8e5bd
refactor FastTMXTiledMap::tilesetForLayer to a more elegant implementation
2014-06-27 18:28:59 +08:00
samuele3hu
67423e0dd2
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_bu_fix
2014-06-27 18:00:34 +08:00
Huabing.Xu
3771654e66
remove deprecated function
...
rename enum to static const member of class
remove hex tile map(we do not support it yet)
2014-06-27 18:00:06 +08:00
samuele3hu
318e39a6d2
Fix the bug that lua-tests can’t be loaded in iOS64bit device and Linux
2014-06-27 17:58:59 +08:00
boyu0
91126341bd
fix transform for physics.
2014-06-27 17:30:21 +08:00
yangxiao
fd41f33165
unused code
2014-06-27 17:21:39 +08:00
Huabing.Xu
33a8b6563f
windows works for fast tmx
2014-06-27 16:56:26 +08:00
minggo
5c0a1b2248
Merge pull request #7232 from CocosRobot/update_lua_bindings_1403857751
...
[AUTO]: updating luabinding automatically
2014-06-27 16:41:16 +08:00
minggo
26292b3e63
Merge pull request #7231 from andyque/fixUIMargin
...
fix ui Margin
2014-06-27 16:37:24 +08:00
yangxiao
2a6ce26335
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-06-27 16:36:36 +08:00
yangxiao
343ef9ae55
update sprite3d test
2014-06-27 16:36:01 +08:00
CocosRobot
9393777c22
[AUTO]: updating luabinding automatically
2014-06-27 08:31:17 +00:00
minggo
af0b8e5195
Merge pull request #7065 from Teivaz/v3
...
Custom uniform search optimization
2014-06-27 16:26:07 +08:00
Huabing.Xu
9126819941
linux work now for bundleReader
2014-06-27 01:22:41 -07:00
andyque
94e311bebb
fix platform compile error
2014-06-27 16:11:35 +08:00
andyque
1eab15ea41
add MarginZero as an external variable
2014-06-27 15:56:29 +08:00
andyque
62e046c0d5
add deprecated variable
2014-06-27 15:42:00 +08:00
andyque
bd663ac55e
fix margin zero
2014-06-27 15:39:10 +08:00
samuele3hu
6ec93b3575
Remove some auto lua binding files by mistake
2014-06-27 14:58:18 +08:00
samuele3hu
acc1004e28
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer
2014-06-27 14:53:25 +08:00
Huabing.Xu
eba84b5dea
fix wrong indentions
2014-06-27 14:45:30 +08:00
Huabing.Xu
1152f77ed7
clean up fast tmx code
2014-06-27 14:42:53 +08:00
lvlong
9d9c1eb51a
change the tab in code to space
2014-06-27 14:42:48 +08:00
samuele3hu
b1d07f2711
Add VideoPlayer Test for Lua
2014-06-27 13:56:39 +08:00
Huabing.Xu
b232896f85
roll back fps compute logic
...
fix crash bug
2014-06-27 13:41:06 +08:00
Huabing.Xu
7254977358
roll back quadcommand
2014-06-27 12:44:19 +08:00
Huabing.Xu
6292ed05be
improvement for fast tmx rendering
2014-06-27 11:50:44 +08:00
Huabing.Xu
a04b5fc5d5
use custom command for fast_tmx rendering
2014-06-27 10:30:21 +08:00
lvlong
e6e9c6caa9
modify bug about parent index is -1
2014-06-27 09:32:09 +08:00
minggo
49da072b1a
Merge pull request #7214 from lite3/addValueEqual
...
add operator == != for Value
2014-06-26 22:57:01 +08:00
yangxiao
392a769c8f
merge cocos2d v3
2014-06-26 22:48:42 +08:00
yangxiao
1be44465b5
android version
2014-06-26 22:34:05 +08:00
yangxiao
2175b25730
fix animation bug
2014-06-26 21:58:26 +08:00
Huabing.Xu
81aa9c2c74
use custom command for rendering
2014-06-26 20:45:08 +08:00
yangxiao
ccb39e51b2
animation3d transition not finished
2014-06-26 18:35:12 +08:00
oleksandr.kuznietsov
1fbdbfc8f4
Updated pull request #7065 due to new changes in current branch
...
- Switched ProgramState from unordered_map<string, Uniform> to unordered_map<GLint, Uniform> for faster uniform search
- changed `uniformValue` variable name to more relative
2014-06-26 13:26:41 +03:00
minggo
f91084500d
Merge pull request #7223 from andyque/fixMinorBugs
...
fix gui reader
2014-06-26 17:29:04 +08:00
andyque
d06ca0e75d
fix gui reader
2014-06-26 17:29:07 +08:00
lite3
568a4bad49
fix Value equal ( float and double)
2014-06-26 17:26:57 +08:00
minggo
768eb4e1d0
Merge pull request #7222 from minggo/warnings-fix
...
fix warnings
2014-06-26 17:24:13 +08:00
samuele3hu
b3da322920
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer
...
Conflicts:
build/cocos2d_tests.xcodeproj/project.pbxproj
2014-06-26 16:21:09 +08:00
samuele3hu
32c355dca4
Add VideoPlayer Lua bindings and update bindings-generator submodule
2014-06-26 16:19:22 +08:00
minggo
dc635db163
fix warnings
2014-06-26 16:15:02 +08:00
minggo
e0e9d3379c
Merge pull request #6948 from lite3/v3
...
Add immediate send request
2014-06-26 16:05:58 +08:00
minggo
b033f7f664
Merge pull request #7218 from minggo/add-findChildren
...
Add utils::findChildren
2014-06-26 15:19:54 +08:00
minggo
ed5b548b18
add comment
2014-06-26 14:14:37 +08:00
minggo
2917596d5e
add utils::findChildren()
2014-06-26 14:05:30 +08:00
Huabing.Xu
87e5e1460e
adjust some code to reduce indentions
2014-06-26 11:45:15 +08:00
Huabing.Xu
e19ce7054b
add comments
2014-06-26 11:21:29 +08:00
CocosRobot
57513d4c2e
[AUTO]: updating luabinding automatically
2014-06-26 03:10:44 +00:00
zhangcheng
a6d6287b29
1. remove hungary style.
...
2. fixes build error.
2014-06-26 10:08:17 +08:00
samuele3hu
c892939968
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_SceneReader
2014-06-26 09:52:41 +08:00
samuele3hu
3bd195d4ef
Add Lua binding for ActionTimeline related and related test cases
2014-06-26 09:51:32 +08:00
lite3
07245ebf6e
put request param in lambda in HttpClient::networkThreadAlone
2014-06-26 02:03:53 +08:00
lite3
1096cdc52f
add operator == != for Value
2014-06-26 01:49:54 +08:00
Dale Stammen
3fd615845b
removed deleted header file from project
2014-06-25 10:08:54 -07:00
Dale Stammen
33e39b5786
added source files for component to be consistent with other platforms templates
2014-06-25 09:51:32 -07:00
zhangcheng
98c21f6f57
1. remove Hungary style.
2014-06-25 18:10:06 +08:00
minggo
8db7caff2a
Merge pull request #7050 from gin0606/videoPlayerIssue
...
Fix crash when try to remove videoView(STATE_PLAYBACK_COMPLETED) in android
2014-06-25 17:56:03 +08:00
minggo
31d9ecd599
Merge pull request #7210 from CocosRobot/update_lua_bindings_1403688877
...
[AUTO]: updating luabinding automatically
2014-06-25 17:38:15 +08:00
yangxiao
02c7775d83
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-06-25 17:37:07 +08:00
yangxiao
accf6f91ea
render optimization
2014-06-25 17:36:55 +08:00
CocosRobot
755b907e69
[AUTO]: updating luabinding automatically
2014-06-25 09:36:50 +00:00
minggo
0ef26e208b
Merge pull request #7165 from timur-losev/v3
...
- Due to the fact that map::insert doesn't allow to insert an element by...
2014-06-25 17:34:28 +08:00
minggo
46d380b5ac
Merge pull request #7204 from andyque/fixListViewTestHorizentalCarsh
...
fix ListView addChild problem
2014-06-25 17:20:17 +08:00
CocosRobot
68649695b2
[AUTO]: updating luabinding automatically
2014-06-25 09:17:16 +00:00
andyque
a4bd3879ac
fix ListView addChild problem
2014-06-25 16:17:16 +08:00
samuele3hu
5f63514d6b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_ui_focus
2014-06-25 15:15:05 +08:00
samuele3hu
3a0e750926
Add deprecated support for lua binding of `getSize` and `setSize` of Widget
2014-06-25 15:13:08 +08:00
samuele3hu
5c765f6883
Add coco studio ui focus test cases for Lua
2014-06-25 15:08:59 +08:00
minggo
6a3d3aa4a4
Merge pull request #7186 from billtt/v3_fixNodeSetScale
...
fix a bug that Node::setScale(float) may not work properly
2014-06-25 14:41:15 +08:00
zhangcheng
bdf7be6fa0
1. add classname = "" log.
2014-06-25 14:32:38 +08:00
CocosRobot
515f967f96
[AUTO]: updating luabinding automatically
2014-06-25 06:17:41 +00:00
minggo
e90e7699a6
Merge pull request #7195 from minggo/addChild-override
...
override addChild by name
2014-06-25 14:12:10 +08:00
minggo
728fab706e
Merge pull request #7194 from andyque/fixTouchEvent
...
fix touch related issue
2014-06-25 14:05:16 +08:00
andyque
6df8079fd7
closed #5591 , fix UIButton setTitleColor & getTitleColor not match
2014-06-25 13:47:29 +08:00
lvlong
658a955e36
modify skindata binary reading
2014-06-25 13:20:42 +08:00
zhangcheng
644b61e261
1. add SceneBinary to 2.x
2014-06-25 11:58:36 +08:00
chuanweizhang2013
ac539131e2
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
2014-06-25 11:39:17 +08:00
lvlong
da835cb837
modify origin-pos stuff
2014-06-25 11:35:55 +08:00
minggo
66703addb2
fixed #4693 : override addChild by name
2014-06-25 11:27:48 +08:00
andyque
78e119ef56
Merge branch 'v3' into fixTouchEvent
...
Conflicts:
cocos/ui/UIWidget.cpp
2014-06-25 11:10:51 +08:00
Huabing.Xu
c1b5984ce8
using stable sort for quads
2014-06-25 11:08:47 +08:00
andyque
693ec0be29
fix listView Item move respond to click event
2014-06-25 10:50:18 +08:00
andyque
65e4c6f4d5
fix listView item click move
2014-06-25 10:45:08 +08:00
yangxiao
db60512c4b
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-06-25 10:24:28 +08:00
lvlong
984e9079a7
modify bundle3d
2014-06-25 10:13:11 +08:00
Huabing.Xu
290897af14
Merge branch 'v3' into fast_tmx
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-06-25 10:10:08 +08:00
Huabing.Xu
bda9708206
clean up Fast TMX code2
2014-06-25 10:06:37 +08:00
Huabing.Xu
67f83f43b0
clean up Fast TMX code
2014-06-25 10:04:20 +08:00
lvlong
ab910dfe19
reader test
2014-06-25 09:13:24 +08:00
yangxiao
2e4c801b2f
load originpose
2014-06-24 23:33:30 +08:00
yangxiao
697f0d4796
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-06-24 19:46:22 +08:00
yangxiao
617ec1dcf9
support vao
2014-06-24 19:45:51 +08:00
CocosRobot
2cd212b1b0
[AUTO]: updating luabinding automatically
2014-06-24 10:48:02 +00:00
minggo
63d0f66553
Merge pull request #7189 from andyque/feature5161
...
replace size with contentSize
2014-06-24 18:43:33 +08:00
minggo
7155eb4ebb
use reference instead
2014-06-24 18:23:10 +08:00
andyque
547ad379ae
closed #5589
2014-06-24 15:51:14 +08:00
andyque
4d82673760
issue #5161 , replace _size with _contentSize
2014-06-24 15:08:58 +08:00
pandamicro
9d450d6513
Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into FileUtils_FILE_API
2014-06-24 14:57:12 +08:00
minggo
3336f7edad
use reference instead
2014-06-24 14:53:02 +08:00
pandamicro
d5bed908d3
Refactor #5580 : Fix some issues
2014-06-24 14:51:01 +08:00
lvlong
dc0101737c
test for tony
2014-06-24 14:43:20 +08:00
lvlong
431378a41e
commit for tony test
2014-06-24 14:10:03 +08:00
lvlong
2de28eea89
for tony
2014-06-24 13:40:04 +08:00
Huabing.Xu
740372ceb3
new version of rendering for tile map
2014-06-24 11:04:17 +08:00
minggo
76e2540fd7
Merge pull request #7163 from darkdukey/fixNodeReader
...
Fix NodeReader crash
2014-06-24 10:49:10 +08:00
minggo
4bb6545250
Merge pull request #7166 from boyu0/bug5541_rotation_action_for_physics
...
closed #5541 : Add rotation action support for physics.
2014-06-24 10:46:10 +08:00
CocosRobot
879862b993
[AUTO]: updating luabinding automatically
2014-06-24 02:35:55 +00:00
boyu0
f2ecb31958
closed #5541 : add more warning for unsupported functions.
2014-06-24 10:33:21 +08:00
minggo
66763bd400
Merge pull request #7180 from MSOpenTech/wp8-v3
...
WP8 v3 broken build fix
2014-06-24 10:31:56 +08:00
andyque
199ad9c623
issue #5161 , replace deprecated methods
2014-06-24 10:18:01 +08:00
samuele3hu
e34fcf05f6
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_fix
2014-06-24 10:14:53 +08:00
samuele3hu
50f82ce1d0
Fix compile error for lua bindings in the different platforms
2014-06-24 10:12:32 +08:00
Zhou Yuntao
50a1449af9
fix a bug that Node::setScale(float) may not work properly if (_scaleX != _scaleY || _scaleX != _scaleZ)
2014-06-24 10:05:52 +08:00
andyque
312ab4f396
Merge branch 'v3' into feature5161
...
Conflicts:
cocos/editor-support/cocostudio/CCSGUIReader.cpp
cocos/editor-support/cocostudio/WidgetReader/ButtonReader/ButtonReader.cpp
cocos/editor-support/cocostudio/WidgetReader/ImageViewReader/ImageViewReader.cpp
cocos/editor-support/cocostudio/WidgetReader/LoadingBarReader/LoadingBarReader.cpp
cocos/editor-support/cocostudio/WidgetReader/WidgetReader.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIListViewTest/UIListViewTest.cpp
2014-06-24 09:51:18 +08:00
yangxiao
ace56df74d
batch sprite3D rendering
2014-06-24 09:27:10 +08:00
yangxiao
c03ac80700
Sprite3D render batch, not finished
2014-06-23 23:58:45 +08:00
Dale Stammen
44d6248056
added missing cocoloader files
2014-06-23 08:31:29 -07:00
yangxiao
c65e5d6872
simplify shader, bath sprite3D render
2014-06-23 19:08:26 +08:00
minggo
fc7b42c0e5
Merge pull request #7157 from 2youyouo2/v3
...
update action timeline
2014-06-23 18:38:46 +08:00
andyque
7eae7625c1
Merge branch 'v3' into cleanupBinaryLoader
2014-06-23 18:30:03 +08:00
andyque
d2680f2884
fix windows compile error
2014-06-23 18:29:23 +08:00
samuele3hu
a339afb2c0
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_lua_fix
2014-06-23 17:53:41 +08:00
samuele3hu
b23e1384f6
Update the implementation of Lua bindings for `lua_cocos2dx_ListView_addScrollViewEventListener`
2014-06-23 17:42:04 +08:00
chuanweizhang2013
7f75b58acf
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
...
Conflicts:
templates/lua-template-runtime/cocos-project-template.json
2014-06-23 17:30:33 +08:00
samuele3hu
9126608138
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_bug_fix
2014-06-23 17:30:24 +08:00
samuele3hu
dce4c8a0a8
Add Lua bindings for `addScrollViewEventListener` of `ui.ListView` and related test cases
2014-06-23 17:29:56 +08:00
minggo
7ef217ee4d
Merge pull request #7168 from andyque/fixListView
...
fix addEventListener hidden problem
2014-06-23 17:20:56 +08:00
andyque
3e5ab0ec8e
fix linux compile error
2014-06-23 17:09:54 +08:00
andyque
dcc650a6f8
fix android compile error
2014-06-23 17:04:59 +08:00
andyque
ce58c2ddd6
remove unused header file
2014-06-23 16:53:06 +08:00
samuele3hu
0d7c453878
Fix the error that lua binding for create function of Sequence would lead to endless loop
2014-06-23 16:38:35 +08:00
andyque
808c4bd763
remove unused override method
2014-06-23 15:46:07 +08:00
andyque
93319f3a3b
fix lua ui binding compile error
2014-06-23 14:56:41 +08:00
boyu0
c40c461848
closed #5541 : add warning code and comment.
2014-06-23 13:55:52 +08:00
andyque
c9bcbfb265
fix addEventListener hidden problem
2014-06-23 12:09:49 +08:00
pandamicro
ee82e9aaba
Refactor #5580 : Fix Win32 compile issue
2014-06-23 11:13:33 +08:00
lvlong
e48982aeaa
unsigned int -> size_t
2014-06-23 11:12:08 +08:00
lvlong
0ac6b8c96d
1.delete write function from bundle reader.
...
2.unsigned int -> size_t.
2014-06-23 11:10:03 +08:00
andyque
87455b0ecb
add constness to some function
2014-06-23 10:12:54 +08:00
andyque
8a463e7964
remove Hungry style
2014-06-23 10:02:09 +08:00
andyque
5624da5448
Merge branch 'v3' into cleanupBinaryLoader
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/editor-support/cocostudio/CCSGUIReader.h
cocos/editor-support/cocostudio/proj.win32/libCocosStudio.vcxproj.filters
2014-06-23 09:37:39 +08:00
yangxiao
c92ba3f3dc
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-06-23 09:32:59 +08:00
lvlong
75f1ef5288
modify warning
2014-06-23 09:23:09 +08:00
yangxiao
92da41694d
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-06-23 09:05:03 +08:00
Timur Losev
196a924f89
- Due to the fact that map::insert doesn't allow to insert an element by existing key, I suggest to use operator []. It allows to change the
...
cached value, very helpful on Android platform: when context is lost, the application will reset - rebuild - recache all it's shaders.
2014-06-22 20:53:01 +03:00
lite3
e3eb5aeddd
put duplicate code to processResponse
2014-06-22 12:37:23 +08:00
lite3
ebbcb3ea33
change immediateSend to sendImmediate
2014-06-22 11:39:39 +08:00
lite3
cb42f549ce
fix: request will be delete in thread.
2014-06-22 00:08:02 +08:00
lite3
758a1f5dc4
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-06-21 17:34:11 +08:00
Nite Luo
21330860a9
Fix NodeReader will crash when encountered unknown NodeType
2014-06-20 17:24:34 -07:00
Dale Stammen
5e1f0b5799
added missing files and tests that broke wp8 build
2014-06-20 09:07:51 -07:00
Dale Stammen
83c5b7bdb0
updated wp8 precompiled shaders
2014-06-20 09:07:29 -07:00
yangxiao
2a6dfaf91b
Merge branch 'newcode' into v3
2014-06-20 22:55:27 +08:00
yangxiao
1e319bc1f8
fix compile bug
2014-06-20 22:38:09 +08:00
yangxiao
1581396810
Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3
2014-06-20 18:54:34 +08:00
yangxiao
3096979b1f
rename createSubAnimate3D to create
2014-06-20 18:54:09 +08:00
XiaoYang
2371e8e6ae
Merge pull request #38 from lvlonggame/v3
...
binary loader
2014-06-20 18:46:52 +08:00
boyu0
2fc8889791
issue #5541 : change RotateTo/RotateBy for Physics.
2014-06-20 18:40:21 +08:00
Huabing.Xu
bb4128036c
use quad command for tile map rendering
2014-06-20 18:10:18 +08:00
pandamicro
d90116a8da
Refactor #5580 : Add new file&directory apis into FileUtils
2014-06-20 18:01:34 +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
Reck Hou
bc5f4d9d59
Optimize FPS control algorithm under Android.
2014-06-16 16:05:40 +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
gin0606
afbed7ee32
Fix video scale issue in iOS
2014-06-12 20:19:41 +09: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
boyu0
a3f32cf894
closed #5537 : add setAutoStep, isAutoStep and step method for PhysicsWorld.
2014-06-12 12:45:21 +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
Frank.Xu
11919413c8
Fix UITextField IME can't auto detach
2014-06-10 14:53:27 +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
minggo
76d9916864
Merge pull request #6990 from Dhilan007/v3-wp8fix
...
fixed WP8 project:compile error,missing files,wrong file path.
2014-06-06 15:43:43 +08:00
Dhilan007
fd4e233432
fixed WP8 project:compile error,missing files,wrong file path.
2014-06-06 15:41:17 +08:00
minggo
716769241a
Merge pull request #6938 from CaryZheng/v3
...
Simplify BlendFunc operator< judgement
2014-06-06 15:29:33 +08:00
minggo
bbff18c96f
add some comment
2014-06-06 12:09:39 +08:00
minggo
49f7b2aec1
Merge pull request #6986 from iSevenDays/patch-11
...
Fix CCImage to be compatible with UNIX2003
2014-06-06 12:05:58 +08:00
minggo
6cee3fe830
Merge pull request #6979 from visiblelight/TextureOptimize
...
Texture Optimize
2014-06-06 11:38:49 +08:00
andyque
6bbf5a1459
tests
2014-06-06 10:12:23 +08:00
Anton Sokolchenko
770d5e91b7
Update CCImage.cpp
2014-06-05 18:02:45 +03:00
Anton Sokolchenko
5f74b8568d
Fix CCImage to be compatible with UNIX2003
...
Without this wrapper I get errors below.
Mac Os X 10.9.3 Xcode 6 beta(the same problem also exists in Xcode 5)
I found a solution at http://stackoverflow.com/questions/8732393/code-coverage-with-xcode-4-2-missing-files and added one more wrapping function.
Undefined symbols for architecture i386:
"_fwrite$UNIX2003", referenced from:
_unixErrorHandler in libcocos2dx iOS.a(tif_unix.o)
_unixWarningHandler in libcocos2dx iOS.a(tif_unix.o)
_empty_output_buffer in libcocos2dx iOS.a(jdatadst.o)
_term_destination in libcocos2dx iOS.a(jdatadst.o)
_Fax3PrintDir in libcocos2dx iOS.a(tif_fax3.o)
_PredictorPrintDir in libcocos2dx iOS.a(tif_predict.o)
"_strerror$UNIX2003", referenced from:
_TIFFOpen in libcocos2dx iOS.a(tif_unix.o)
ld: symbol(s) not found for architecture i386
clang: error: linker command failed with exit code 1 (use -v to see invocation)
2014-06-05 16:54:00 +03:00
Frank.Xu
7ece807a63
Add shadow, outline, glow filter support for UITextField
2014-06-05 19:21:06 +08:00
yangxiao
87c7e2b0e9
worldmat cache in bone
2014-06-05 18:21:25 +08:00
Frank.Xu
b74040a2ac
Add getStringLength() support for UITextField
2014-06-05 17:59:54 +08:00
yangxiao
32ba5f2873
change comment
2014-06-05 16:47:03 +08:00
yangxiao
ed8f8a9cad
sprite3d with skin render&bundle
2014-06-05 16:36:01 +08:00
CocosRobot
b749d0b5ca
[AUTO]: updating luabinding automatically
2014-06-05 07:06:07 +00:00
samuele3hu
373d4dfb1a
Replace `log` with `CCLOG`
2014-06-05 14:49:02 +08:00
minggo
366beedbb2
Merge pull request #6955 from samuele3hu/v3_fix
...
Add xxtea encrypt support for lua and update the console submodule
2014-06-05 11:49:40 +08:00
andyque
c96a6086c3
improve parsing code
2014-06-05 11:43:43 +08:00
CocosRobot
0010ed2e44
[AUTO]: updating luabinding automatically
2014-06-05 03:01:43 +00:00
vision
860057c307
Use the image format instead of RGBA8888 when initializing a texture, this would remove the redudant conversion and save memories.
2014-06-05 10:58:27 +08:00
andyque
8690122c96
add version 300 parsing code in widget reader
2014-06-05 10:25:08 +08:00
andyque
b570487bf3
add cocostudio binary file parser
2014-06-05 10:24:12 +08:00
vision
c90f2b3251
remove unused codes in CCTexture2D
2014-06-05 10:09:36 +08:00
Ricardo Quesada
59b966731e
Compiles on Windows and Android
2014-06-04 09:48:35 -07:00
Ricardo Quesada
0c2f8ed401
Lua compiles and runs
2014-06-04 09:26:39 -07:00
Ricardo Quesada
79ebc546f8
Merge remote-tracking branch 'cocos2d/v3' into normalized_position
...
Conflicts:
CHANGELOG
cocos/ui/UILayout.cpp
2014-06-04 09:19:22 -07:00
yangxiao
54caf26a57
animation3d
2014-06-04 18:17:09 +08:00
andyque
d1e664fd44
fix win7 compile error
2014-06-04 15:43:53 +08:00
andyque
d089b251db
fix other platform compile error
2014-06-04 14:56:34 +08:00
andyque
54e93f6c41
fix ObjectFactory refactor issue
2014-06-04 14:56:34 +08:00
andyque
f0d38290a1
refactor ObjectFactor and move it to base
2014-06-04 14:56:34 +08:00
andyque
38e274de73
refact ui header file include
2014-06-04 14:56:33 +08:00
minggo
7bf2be6033
Merge pull request #6959 from kezhuw/bugfix_autorelease_pool_manager
...
Bugfix autorelease pool manager
2014-06-04 14:31:30 +08:00
minggo
700b0f7320
Merge pull request #6966 from kicktheken/v3
...
fix layout constant syntax error
2014-06-04 14:12:52 +08:00
minggo
b174481645
Merge pull request #6967 from ntotani/fix-lua-binding-release-build
...
fix lua-binding release build
2014-06-04 14:06:29 +08:00
CocosRobot
a70d6628a7
[AUTO]: updating luabinding automatically
2014-06-04 05:58:29 +00:00
minggo
5432698674
Merge pull request #6969 from boyu0/bug5482_setPhysicsBody
...
closed #5482 : Node::setPhysicsBody() doesn't work after node added to another node.
2014-06-04 13:52:43 +08:00
minggo
56d931aa71
Merge pull request #6963 from andyque/refactorLayout
...
refactor Layout, remove sortChildren and unify doLayout
2014-06-04 12:01:07 +08:00
boyu0
dd0eecb905
closed #5482 : fix issue: Node::setPhysicsBody() doesn't work after node added to other node.
2014-06-04 11:58:04 +08:00
samuele3hu
c785d64ba1
Adjust the xxtea directory structure and modify configs files for platforms
2014-06-04 11:50:04 +08:00
Kenneth Chan
d7fcf39386
fix layout constant syntax error
2014-06-03 20:26:59 -07:00
Naoyuki Totani
c7597e5396
surround tolua_isnumber with debug flug
2014-06-04 12:17:43 +09:00
andyque
c6cb3a56fb
refactor ListView, add do Layout
2014-06-04 10:51:32 +08:00
andyque
652c214374
remove sortChildren of Layout
2014-06-04 10:10:50 +08:00
minggo
2c9c94c4a9
Merge pull request #6954 from visiblelight/AlphaIssues
...
Make PNG files premultiplied alpha when loading
2014-06-04 10:04:20 +08:00
samuele3hu
3fddb798ea
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
2014-06-04 10:00:52 +08:00
samuele3hu
e1310e2660
Adjust the xxtea directory structure and modify some grammar expressions
2014-06-04 09:59:29 +08:00
Kezhu Wang
eb8e08ccdd
prefer std::vector to other containers
2014-06-03 19:09:48 +08:00
Kezhu Wang
f1ce9e032d
remove unnecessary cache-variable
2014-06-03 19:08:28 +08:00
Kezhu Wang
1eb991df59
bugfix related to AutoreleasePool's PoolManager
...
* duplicated AutoreleasePool added to PoolManager in
PoolManager::getInstance()
* redundant pop_back() in PoolManager::~PoolManager()
2014-06-03 18:57:52 +08:00
Dhilan007
9e6304d84c
fixed EVENT_COME_TO_BACKGROUND has not been sent on android.
2014-06-03 18:10:22 +08:00
samuele3hu
404db49538
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
2014-06-03 17:17:11 +08:00
samuele3hu
55bb9a7d09
Update setting for different platform
2014-06-03 17:15:28 +08:00
vision
1c4838e7f0
we are only udpating PNG now.
2014-06-03 16:22:50 +08:00
vision
0149fd81b5
no need for handling RAW_DATA
2014-06-03 15:19:01 +08:00
vision
8af737739b
premultiplied alpha for PNG,TGA,WEBP,RAW_DATA
2014-06-03 15:06:15 +08:00
minggo
691a77b148
Merge pull request #6928 from boyu0/bug5392_scheduleUpdate
...
closed #5392 : add priority check for schedulePerFrame() and add a ScheduleUpdatePriority test.
2014-06-03 14:38:07 +08:00
minggo
7b4ae98098
Merge pull request #6944 from minggo/treat-warning-as-error
...
Treat warning as error on iOS and Mac
2014-06-03 14:31:18 +08:00
minggo
26a4eaaac7
Merge pull request #6939 from dabingnn/v3FixAndroid
...
V3 fix android
2014-06-03 10:26:01 +08:00
samuele3hu
691e606b34
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
...
Conflicts:
tools/cocos2d-console
2014-06-03 09:58:57 +08:00
samuele3hu
b91d8255bd
Add xxtea encrypt support for lua and update the console submodule
2014-06-03 09:55:57 +08:00
Ricardo Quesada
449b588400
Compiles on iOS
2014-06-02 16:02:54 -07:00
Ricardo Quesada
b24c674d25
Little fixes for setNormalized
2014-05-30 21:50:39 -07:00
Ricardo Quesada
1b8d0d88df
Adds setNormalizedPosition()
...
Changes in `visit()` were done in order to do it
in a robust and fast way.
2014-05-30 16:42:05 -07:00
Hanju Kim
05b992c628
Bug fix
2014-05-31 00:13:08 +02:00
Hanju Kim
28b95bd54a
* Skip UTF8 BOM if it exists
...
* Fix when string isn't terminated if fread() reads less size than paramter at FileUtils getData
2014-05-31 00:06:56 +02:00
John_He
3bf4c5e985
fix mingw32/64 build:
...
MinGW uses system installed libcurl, rather than libcurl_imp.
2014-05-30 19:54:59 +08:00
CaryZheng
3b99c5ea42
Modify BlendFunc operator< judgement
2014-05-30 17:57:27 +08:00
boyu0
56590f09eb
change comment.
2014-05-30 17:40:35 +08:00
boyu0
dd0771852f
change comment.
2014-05-30 17:36:54 +08:00
minggo
4b979d67db
issue #5429 : treat warning as error on Mac
2014-05-30 16:46:01 +08:00
minggo
e76feceada
fix coding style
2014-05-30 15:13:59 +08:00
minggo
402dc9f9ce
fix memory leak
2014-05-30 15:10:57 +08:00
Huabing.Xu
41d19007eb
Merge branch 'v3.1hotfix' into v3
...
Conflicts:
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h
2014-05-30 10:19:56 +08:00
CaryZheng
28954fddd0
Simplify BlendFunc operator< judgement
2014-05-30 00:23:58 +08:00
Nick Barrios
7bac05a497
CCUserDefault.cpp: Should not compile on Mac platform (should be using CCUserDefault.mm implementation).
2014-05-29 10:36:15 -04:00
lite3
ae7c93dd4e
Merge remote-tracking branch 'upstream/v3' into v3
2014-05-29 20:41:00 +08:00
minggo
05df2a4db1
Merge pull request #6657 from asmodehn/asmo_newv3_cmake_win32
...
Fixing cmake project for win32
2014-05-29 15:25:58 +08:00
minggo
b68525ac1f
Merge pull request #6916 from John-He-928/mingw-build
...
Fix mingw64 build: convert from LPVOID to DWORD losses precision on 64-b...
2014-05-29 15:17:07 +08:00
boyu0
5e62c4e069
closed #5392 : add comment for unscheduleUpdate() at schedulePerFrame()
2014-05-29 15:16:11 +08:00
minggo
e5cbe5439b
Merge pull request #6922 from zawasp/android_flicker
...
prevent flickering when opening another activity
2014-05-29 15:15:15 +08:00
boyu0
91db87a2f6
closed #5392 : add priority check for schedulePerFrame() and add a ScheduleUpdatePriority test.
2014-05-29 13:51:43 +08:00
Dhilan007
e1bb1c62c0
[hot fixed]issue#4999:fixed label is unsharp if it's created by smaller font.
2014-05-29 10:26:07 +08:00
John_He
299e93bca7
Merge branch 'mingw-build' of github.com:John-He-928/cocos2d-x into mingw-build
2014-05-29 01:33:44 +08:00
Mircea Rila
23b7d76797
prevent flickering when opening another activity
2014-05-28 16:33:35 +03:00
minggo
2e7865a4f6
coding style fix
2014-05-28 17:41:34 +08:00
Huabing.Xu
99d1ccf41e
remove foreground event listener when GLProgramState is deleted
2014-05-28 16:51:33 +08:00
minggo
1618d2a4e2
don't have to set _orderOfArrival to 0 after visit
2014-05-28 15:50:42 +08:00
Huabing.Xu
2084fc4ddc
using lambda function instead of member function
2014-05-28 15:50:37 +08:00
minggo
8f274e5a99
Merge pull request #6918 from minggo/fix-object-leak
...
Fix NSNotificationCenter and NSTimer leaks
2014-05-28 15:23:37 +08:00
minggo
2e70380dd9
invalidate NSTimer instance in destroy to prevent memory leak
2014-05-28 15:19:07 +08:00
minggo
013b3a328f
remove keyboard notifications from NSNotificationCenter
2014-05-28 15:17:26 +08:00
Huabing.Xu
30f4f256d8
fix background/forground of Sprite3D on android platform
2014-05-28 15:16:00 +08:00
minggo
3d3fb6ad7e
Merge pull request #6914 from andyque/refactorLayoutExecutant
...
refactor: rename UILayoutExecutant to UILayoutManager
2014-05-28 13:47:54 +08:00
John_He
2aa4b9936c
Fix mingw64 build: convert from LPVOID to DWORD losses precision on 64-bit platform.
2014-05-28 12:37:35 +08:00
andyque
769300d25e
rename UILayout
...
Executant.h to UILayoutManager.h
2014-05-28 10:17:34 +08:00
andyque
c5a118ee1b
refactor UILayoutExecutant to LayoutManager
2014-05-28 10:11:49 +08:00
John_He
8233b5bf93
fix mingw32/mingw64 compiling
2014-05-28 00:17:09 +08:00
minggo
99290b83c7
Merge pull request #6871 from asuuma/v3_Repeat_fix
...
Fix Repeat will run one more over in rare situations
2014-05-27 16:22:42 +08:00
minggo
0b661d8192
Merge pull request #6907 from visiblelight/screenshot_refactor
...
adding comments for the new utility
2014-05-27 14:52:09 +08:00
minggo
f3de239647
Merge pull request #6616 from xhcnb/fix_callback
...
Fix crash: use cocostudio gui editor, create a action in editor, when yo...
2014-05-27 14:51:36 +08:00
vision
d392fad70f
udpate the comments
2014-05-27 14:51:13 +08:00
vision
5764677bba
update the comments
2014-05-27 14:40:55 +08:00
CocosRobot
e1ab346e70
[AUTO]: updating luabinding automatically
2014-05-27 06:31:18 +00:00
vision
e81db73b0a
adding comments for the new utility.
2014-05-27 14:29:52 +08:00
minggo
9d2c765fc0
Merge pull request #6862 from favorcode/v3
...
Update UILoadingBar.h doxygen comments
2014-05-27 13:54:52 +08:00
andyque
df13d4033c
refactor Layout and Widget
2014-05-27 13:49:00 +08:00
andyque
30582ffa6f
add constness to UIPageView's removeAllPages method
2014-05-27 11:30:37 +08:00
andyque
070abfdb44
add constness to UIVideoPlayer
2014-05-27 11:30:36 +08:00
andyque
3cda4e76a0
add constness to UIImageView
2014-05-27 11:30:36 +08:00
andyque
eb91aed3f2
add constness to UICheckBox
2014-05-27 11:30:36 +08:00
andyque
f87e4243ee
add constness to UIButton
2014-05-27 11:30:36 +08:00
andyque
884d4c5d1f
add constness to UITextField
2014-05-27 11:30:36 +08:00
andyque
5da1f1f78c
add constness to UIText
2014-05-27 11:30:36 +08:00
andyque
5acd2ed89d
add constness to UISlider
2014-05-27 11:30:36 +08:00
andyque
36e7c9cdfc
add constness to UIScrollView
2014-05-27 11:30:36 +08:00
andyque
e1f9ff7eaa
add constness to UIPageView
2014-05-27 11:30:36 +08:00
andyque
78ac4b4d86
add constness to UILoadingBar
2014-05-27 11:30:35 +08:00
andyque
0518e494b1
add constness to UIListView
2014-05-27 11:30:35 +08:00
andyque
b17de0cdcb
add const to UILayout
2014-05-27 11:30:35 +08:00
andyque
e32a637bf5
add const to ui framework methods
2014-05-27 11:30:35 +08:00
minggo
a01315e2f5
Merge pull request #6726 from visiblelight/screenshot
...
Add a new utility function to snap the screen
2014-05-27 11:18:25 +08:00
vision
bfd945c592
remove unused variables
2014-05-27 10:47:25 +08:00
vision
363fd8dc2a
move the capturen screen interface from Director to ccUtils
2014-05-27 10:44:23 +08:00
minggo
626e0acb9d
Merge pull request #6848 from newnon/v3_android_jni_improvements
...
android jni error clear & more readable log
2014-05-27 10:40:59 +08:00
minggo
f7450730fb
Merge pull request #6901 from andyque/fixDpadNavigation
...
issue #5176 , refactor FocusNavigationController
2014-05-27 10:40:00 +08:00
CocosRobot
9e9cab9e53
[AUTO]: updating luabinding automatically
2014-05-27 02:21:22 +00:00
andyque
9cef55d62c
issue #5176 , refactor FocusNavigationController
2014-05-27 10:20:37 +08:00
minggo
94a1013f75
Merge pull request #6898 from andyque/5176
...
add FocusManager, refactor UI framework
2014-05-27 10:09:43 +08:00
andyque
d8d5139aaf
closed #5176 , refactor UILayout and focus
2014-05-26 23:04:44 +08:00
vision
c72ae9e3c5
merge from the latest v3
2014-05-26 20:18:11 +08:00
andyque
f32044fca9
closed #5176 , fix FocusNavigationController
2014-05-26 18:38:03 +08:00
andyque
642969cc84
issue #5176 , move setting setFirstFocsuedWidget to setFocused method
2014-05-26 18:27:06 +08:00
andyque
69d5b486af
Revert "issue #5176 , fix compile error on other platforms"
...
This reverts commit 9118d7a98a
.
Conflicts:
cocos/ui/UIFocusManager.h
2014-05-26 18:19:23 +08:00
andyque
1a6dba8656
issue #5176 , refactor UIFocusManager
2014-05-26 18:17:47 +08:00
andyque
cc8b70b87d
issue #5176 , refactor UIFocusManager and UIScrollView
2014-05-26 17:34:56 +08:00
vision
f40f0e0bb9
more define check
2014-05-26 17:00:31 +08:00
minggo
f619c096da
Merge pull request #6874 from HoGarfield/CCMenuLoader_v3
...
The default size of CCMenu in CocosBuilder is 0,0
2014-05-26 03:34:13 -05:00
2youyou2
b0bc406bdc
fixed Armature::getBoundingBox() is wrong when bone's display is null
2014-05-26 16:16:06 +08:00
vision
bb4ce31644
new empty line appended to the file end
2014-05-26 16:15:30 +08:00
andyque
9118d7a98a
issue #5176 , fix compile error on other platforms
2014-05-26 15:35:43 +08:00
andyque
e866800044
issue #5176 , refactor UICheckBox releaseUpEvent
2014-05-26 14:44:28 +08:00
andyque
40f2128acd
Merge branch 'v3' into 5176
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/ui/UIPageView.cpp
cocos/ui/UIScrollView.cpp
cocos/ui/UIScrollView.h
2014-05-26 14:00:23 +08:00
vision
21f7e34d18
remove unused variables
2014-05-26 13:49:00 +08:00
CocosRobot
3245aeedd4
[AUTO]: updating luabinding automatically
2014-05-26 05:44:22 +00:00
vision
7edfe78f7d
remove the parameter rect
2014-05-26 13:42:47 +08:00
lite3
99b37c3048
Merge remote-tracking branch 'upstream/v3' into v3
2014-05-26 13:42:05 +08:00
minggo
75cb686573
Merge pull request #6894 from andyque/refactor5183
...
refactor Layout, LayoutParameter and LayoutExecutant
2014-05-26 00:41:04 -05:00
hanbihui
332f75a57c
Update CCActionObject.h Doxygen comments
2014-05-26 12:02:14 +08:00
minggo
32964de7c5
Merge pull request #6877 from sachingarg05/BetterJpegSaveQuality
...
[ci skip]Set jpeg save quality to 90 (default is only 75, on a scale of 0 to 100)
2014-05-25 22:30:26 -05:00
CocosRobot
bff5fdfdda
[AUTO]: updating luabinding automatically
2014-05-26 01:58:46 +00:00
minggo
f29654ff6c
Merge pull request #6890 from visiblelight/FixTextureCache
...
Fix the crash in TextureAsync test
2014-05-25 20:55:13 -05:00
andyque
8112962778
issue #5183 , remove in class member initialization
2014-05-26 09:51:05 +08:00
andyque
634fea7c45
Merge remote-tracking branch 'upstream/v3' into refactor5183
2014-05-26 09:18:32 +08:00
minggo
399571f542
Merge pull request #6892 from samuele3hu/v3_fix
...
Update the OpenGL lua binding and related test case
2014-05-23 07:37:49 -05:00
samuele3hu
3bd196f077
Update the openGL lua binding and related test case
2014-05-23 19:12:30 +08:00
vision
e2ce876260
remove new lines
2014-05-23 18:01:17 +08:00
vision
ffdf3d7b67
assure threading safety
2014-05-23 17:59:34 +08:00
vision
fb6ea21ca8
assure threading safety
2014-05-23 17:49:25 +08:00
vision
e3a365ad60
assure threading safety
2014-05-23 17:48:07 +08:00
vision
8128bfce68
check the condition guard
2014-05-23 17:27:59 +08:00
vision
66a33e7d93
no need to pass all the references
2014-05-23 17:21:46 +08:00
vision
910099fbe5
add new interfaces for TextureCache to unbind the bound image asynchronous load callbacks.
2014-05-23 17:08:22 +08:00
cw
ca68a273e3
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
2014-05-23 16:38:03 +08:00
andyque
d612518421
fix ui widget copyProperties issue
2014-05-23 15:03:46 +08:00
minggo
6539b558bd
update version
2014-05-23 14:30:08 +08:00
cocoscodeide
5e198aaae2
Merge pull request #26 from cocos2d/v3
...
update cocos2d-x
2014-05-23 12:46:42 +08:00
andyque
6d9a21d0ed
issue #5176 , add focus event listener to UIScrollView
2014-05-23 11:18:26 +08:00
CocosRobot
293ced84c2
[AUTO]: updating luabinding automatically
2014-05-23 03:12:39 +00:00
andyque
3f363f0e51
issue #5176 , add focus to UIScrollView
2014-05-23 10:59:18 +08:00
andyque
26be2708a0
issue #5176 , refactor UIScrollView
2014-05-23 10:08:53 +08:00
Ricardo Quesada
5601048829
Fixes compiler warnings for mac and ios
2014-05-22 16:34:16 -03:00
lite3
dff6b2f338
fix: Incorrect error buffer in two thread
2014-05-23 01:43:32 +08:00
lite3
f02a0c49c0
Merge remote-tracking branch 'github/v3' into v3
2014-05-23 00:47:59 +08:00
vision
e263c5f2de
use shared_ptr for better readibility
2014-05-22 23:34:27 +08:00
Sachin Garg
eec7a81b02
Set jpeg save quality to 90 (default is only 75, on a scale of 0 to 100).
2014-05-22 16:24:29 +05:30
andyque
65fe431eae
issue #5176 , fix a typo
2014-05-22 18:11:27 +08:00
andyque
1165ba8bc3
issue #5176 , readd addChild methods into UIListView
2014-05-22 17:49:19 +08:00
garfield_ho
d5d0df6933
The default size of CCMenu in CocosBuilder is 0,0
2014-05-22 16:21:51 +08:00
CocosRobot
0ab8624d2f
[AUTO]: updating luabinding automatically
2014-05-22 08:08:54 +00:00
andyque
c8d9ab8122
issue #5176 , refactor passTouchEventToParent method of UIWidget
2014-05-22 15:23:13 +08:00
hanbihui
76d0448b12
Update UILoadingBar.h Doxygen comments
2014-05-22 15:08:53 +08:00
Ishiguro Yusuke
90cea76008
Fix Repeat will run one more over in rare situations
2014-05-22 15:59:47 +09:00
andyque
4d82d8d26b
issue #5176 , rename UIScrollInterface to ScrollViewProtocol
2014-05-22 14:15:29 +08:00
andyque
2344928945
issue #5176 , refactor AutoScrollDirection in UIPageView
2014-05-22 14:09:01 +08:00
andyque
0c065b4be0
issue #5176 , refactor Layout and UIPageView
2014-05-22 13:51:44 +08:00
vision
a68515dbff
adding guard for the callback condition
2014-05-22 12:42:52 +08:00
chuanweizhang2013
111840f37b
add play ui
2014-05-22 11:52:49 +08:00
andyque
ebcb7b78a3
issue #5176 , refactor UIPageView
2014-05-22 11:43:02 +08:00
andyque
e70a772c0f
issue #5176 , refactor UIPageView
2014-05-22 11:01:58 +08:00
andyque
e88d91357b
issue #5176 , refacotr UIPageView
2014-05-22 11:01:58 +08:00
andyque
3b777646c4
issue #5176 . fix UIScrollView
2014-05-22 11:01:58 +08:00
andyque
e184ac9e0c
issue #5176 , refacotr UIPageView
2014-05-22 11:01:58 +08:00
andyque
e9ff42064f
issue #5176 , remove unneeded functions in UIPageView
2014-05-22 11:01:58 +08:00
andyque
d5e68e4803
issue #5176 , fix override problems
2014-05-22 11:01:58 +08:00
andyque
0e8197b6ee
issue #5176 , add UIFocusManager
2014-05-22 11:01:58 +08:00
andyque
d1df19794a
fixed ui header file include problem
2014-05-22 10:49:28 +08:00
minggo
cda9183e01
Merge pull request #6861 from boyu0/bug4944_physics_crash
...
closed #4944 : fixed bug: physics engine crashes occasionally when remove...
2014-05-21 18:32:19 +08:00
hanbihui
5547031e5c
Update UILoadingBar.h doxygen comments
2014-05-21 16:35:47 +08:00
boyu0
b6274a469d
closed #4944 : fixed bug: physics engine crashes occasionally when remove bodies at physics contact callback.
2014-05-21 16:07:49 +08:00
lite3
4679e08c3d
networkThreadAlone callback on main thread use lambda
2014-05-21 15:31:58 +08:00
andyque
dbd2de63b2
issue #5183 , fix Layout visit issue
2014-05-21 15:21:55 +08:00
minggo
3b5417a325
Merge pull request #6854 from MSOpenTech/wp8-v3-fix
...
Wp8 v3 fix for precompiled shaders and precompiled headers
2014-05-21 14:31:18 +08:00
Dhilan007
d13ed93fc1
issue #5277:Label:It could be possible that for using outline and invoking 'Director::setContentScaleFactor' cause label show nothing.
2014-05-21 14:08:30 +08:00
Dhilan007
ac258439b0
close issue#5277:Label:It could be possible that for using outline and invoking 'Director::setContentScaleFactor' cause label show nothing.
2014-05-21 11:38:45 +08:00
minggo
40df6a28a2
Merge pull request #6844 from Dhilan007/v3-labelfix
...
closed issue#5252:Label:It could be possible that for using outline cause crash.
2014-05-21 11:19:12 +08:00
Dhilan007
70346c4437
Merge branch 'v3_wp8fix' of https://github.com/Dhilan007/cocos2d-x into v3-wp8
2014-05-21 10:44:48 +08:00
lite3
ed7ecabe8f
replace tab to space.
2014-05-21 10:44:07 +08:00
minggo
5a309fbc6e
Merge pull request #6721 from zifter/FixNodeConst
...
[ci skip]Getter always must be a const method.
2014-05-21 09:48:27 +08:00
Dale Stammen
2a7b223b5b
updated link() for wp8
2014-05-20 11:47:33 -07:00
Dale Stammen
3971666426
updated pch file for wp8
2014-05-20 10:06:24 -07:00
Dale Stammen
c0798a3c0a
updated precompiled shaders for wp8
2014-05-20 10:06:02 -07:00
Dale Stammen
f0e4c97bc6
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into wp8-v3-fix
2014-05-20 07:50:12 -07:00
Dale Stammen
3db6856d27
added missing pch files for WP8
2014-05-20 07:48:42 -07:00
Dale Stammen
0efc070104
fixed shader compiler after cocos refactor
2014-05-20 07:48:12 -07:00
lite3
953ca4a44b
Add immediate send request
2014-05-20 20:08:26 +08:00
CocosRobot
f734cc3f7b
[AUTO]: updating luabinding automatically
2014-05-20 11:46:42 +00:00
Sergey
cd892abc77
android uni error clear & more readable log
2014-05-20 14:52:21 +04:00
samuele3hu
a2ebe428da
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
2014-05-20 18:11:28 +08:00
samuele3hu
2d65f9bc6f
issue #5255:Add Sprite3D test cases for Lua
2014-05-20 18:09:04 +08:00
minggo
dd428b527b
Merge pull request #6843 from favorcode/v3
...
[ci skip]Update UIImageView.h param name
2014-05-20 17:34:56 +08:00
Dhilan007
55c1319426
closed issue#5252:Label:It could be possible that for using outline cause crash.
2014-05-20 16:54:51 +08:00
hanbihui
855b8a2784
Update UIImageView.h
...
Update param name
2014-05-20 16:45:09 +08:00