Huabing.Xu
|
1b0c55ef15
|
issue #4629: test case add a spriteInGroup instead of sprite, the sprite can not be seen now
|
2014-04-07 22:31:24 +08:00 |
Huabing.Xu
|
beda294be1
|
issue #4629: add test case for group command
|
2014-04-07 22:02:43 +08:00 |
James Chen
|
f9ac3c82fc
|
Update CHANGELOG [ci skip]
|
2014-04-07 16:34:56 +08:00 |
James Chen
|
cdb68cc918
|
Update AUTHORS [ci skip]
|
2014-04-07 16:33:40 +08:00 |
James Chen
|
1b85be2b9b
|
Merge pull request #6150 from mgcL/Value-memory-leak
A potential memory leak in value's default constructor.
|
2014-04-07 16:32:01 +08:00 |
James Chen
|
0d8c70e93f
|
Update AUTHORS [ci skip]
|
2014-04-07 16:20:47 +08:00 |
James Chen
|
cd2a74d4ec
|
Merge pull request #6156 from zakmandhro/patch-1
A typo fix in RELEASE_NOTES.md
|
2014-04-07 16:19:38 +08:00 |
James Chen
|
7019a8cf83
|
Update CHANGELOG [ci skip]
|
2014-04-07 16:18:49 +08:00 |
James Chen
|
92d1169747
|
Update AUTHORS [ci skip]
|
2014-04-07 16:16:51 +08:00 |
James Chen
|
7142dcfce3
|
Merge pull request #6157 from dbaack/remove_event_listener_fix
closed #4700: Removing and re-adding an event listener will trigger an assert.
|
2014-04-07 16:14:48 +08:00 |
dbaack
|
6262c9c910
|
Fixed a bug where an event listener removed from the event dispatcher while it is still in the _toAddedListeners vector would never have _isRegistered set to false on removal. This causes it to fail an assert if it is attempted to be added to the event dispatcher again later.
|
2014-04-06 21:59:40 -07:00 |
Zak Mandhro
|
03b5c879a7
|
Update RELEASE_NOTES.md
|
2014-04-06 21:42:34 -07:00 |
mgcL
|
d9e0124ff8
|
delete _scriptHandlerMgr in destruct will cause stack overflow
|
2014-04-05 21:26:56 +08:00 |
mgcL
|
a5da6d71b4
|
add destroyInstance for ScriptHandlerMgr
|
2014-04-05 21:09:49 +08:00 |
mgcL
|
a3a3fa0907
|
fix Value's memory leak
|
2014-04-05 18:55:55 +08:00 |
Ricardo Quesada
|
f1a2db9006
|
Merge pull request #6140 from dumganhar/render-clean
Adds `Renderer::clean`, and fixes crash in `PerformanceTest/Node children Test`.
|
2014-04-04 13:34:29 -07:00 |
James Chen
|
8c1035c132
|
Merge pull request #6147 from CocosRobot/update_lua_bindings_1396608271
[AUTO]: updating luabinding automatically
|
2014-04-04 19:42:28 +08:00 |
CocosRobot
|
cd33967dc4
|
[AUTO]: updating luabinding automatically
|
2014-04-04 10:45:34 +00:00 |
James Chen
|
541d4dea0c
|
Merge pull request #6105 from andyque/feature3636
Added create functions with parameters for all ui controls
|
2014-04-04 18:34:59 +08:00 |
andyque
|
4b6aa2a22c
|
closed #4636. remove Hungary style
|
2014-04-04 18:26:53 +08:00 |
cw
|
c0fe791aae
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into luaruntime
Conflicts:
templates/lua-template-runtime/src/main.lua
|
2014-04-04 18:17:54 +08:00 |
James Chen
|
2f0d561f03
|
Merge pull request #6144 from shujunqiao/cocos-console-test-add
[ci skip]add send email in cocos-console-test.py.
|
2014-04-04 18:06:38 +08:00 |
minggo
|
cf3cf86537
|
[ci skip]
|
2014-04-04 18:04:29 +08:00 |
minggo
|
439b30434e
|
Merge pull request #6097 from newnon/android_crash_fix
Android crash fix on new devices
|
2014-04-04 18:01:59 +08:00 |
andyque
|
e346ed3559
|
closed #4636. done
|
2014-04-04 17:38:58 +08:00 |
andyque
|
e20b3d8eb8
|
issue #4636. refactor SliderReader
|
2014-04-04 17:35:15 +08:00 |
andyque
|
af5fe04480
|
issue #4636. refactor LoadingBarReader
|
2014-04-04 17:25:20 +08:00 |
andyque
|
a4e0c1a6e2
|
issue #4636. refactor LayoutReader
|
2014-04-04 17:21:23 +08:00 |
andyque
|
3482815e69
|
issue #4636. refactor ImageViewReader
|
2014-04-04 17:18:24 +08:00 |
andyque
|
c252aa5a55
|
issue #4636. refactor CheckBoxReader
|
2014-04-04 17:12:47 +08:00 |
shujunqiao
|
1d2c91e403
|
add send email in cocos-console-test.py.
|
2014-04-04 17:11:16 +08:00 |
James Chen
|
eaaab7a49f
|
Update CHANGELOG [ci skip]
|
2014-04-04 17:02:06 +08:00 |
James Chen
|
9cb7871cb4
|
Merge pull request #6103 from natural-law/issue4584
Add feature to force update the environment variables in setup.py
|
2014-04-04 16:59:57 +08:00 |
andyque
|
77aee27f05
|
issue #4636. refactor ButtonReader
|
2014-04-04 16:51:07 +08:00 |
andyque
|
51404500b7
|
issue #4636. fixed WidgetReader error
|
2014-04-04 16:24:54 +08:00 |
andyque
|
ec83b3db04
|
issue #4636. fix ButtonReader
|
2014-04-04 15:21:28 +08:00 |
James Chen
|
7b4a1308ea
|
Adds `Renderer::clean`, and fixes crash in `PerformanceTest/Node
children Test`.
|
2014-04-04 12:48:16 +08:00 |
James Chen
|
fe036c3870
|
Merge pull request #6137 from CocosRobot/update_lua_bindings_1396519852
[AUTO]: updating luabinding automatically
|
2014-04-03 18:16:55 +08:00 |
CocosRobot
|
c72f256d01
|
[AUTO]: updating luabinding automatically
|
2014-04-03 10:12:05 +00:00 |
James Chen
|
51697a8906
|
Update CHANGELOG [ci skip]
|
2014-04-03 18:04:38 +08:00 |
James Chen
|
1ec3f014e8
|
Merge pull request #6130 from dumganhar/iss4557-set-enabled-listener
closed #4557: Adds `EventListener::setEnabled/isEnabled`.
|
2014-04-03 18:02:44 +08:00 |
James Chen
|
c595dd5dec
|
Merge pull request #6136 from CocosRobot/update_lua_bindings_1396518289
[AUTO]: updating luabinding automatically
|
2014-04-03 17:46:51 +08:00 |
CocosRobot
|
279b371031
|
[AUTO]: updating luabinding automatically
|
2014-04-03 09:46:03 +00:00 |
James Chen
|
b174eca9ee
|
Merge pull request #6135 from CocosRobot/update_cocosfiles_1396518155
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-04-03 17:45:15 +08:00 |
CocosRobot
|
25b24a62cb
|
[AUTO][ci skip]: updating cocos2dx_files.json
|
2014-04-03 09:42:36 +00:00 |
andyque
|
c501aa2dec
|
issue #4636. replace __String with StringUtils::format
|
2014-04-03 17:42:04 +08:00 |
James Chen
|
cb8edabb30
|
Merge pull request #6133 from samuele3hu/develop_new_label
fix the error about `draw` of GLNode and modify the related test cases
|
2014-04-03 17:34:27 +08:00 |
James Chen
|
a2081ea210
|
issue #4557: Updates comments for EventListener::setPaused.
|
2014-04-03 17:20:16 +08:00 |
andyque
|
9bcfea2279
|
issue #4636. fix some typo
|
2014-04-03 17:13:24 +08:00 |
samuele3hu
|
550f4dca29
|
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_new_label
|
2014-04-03 17:03:09 +08:00 |