andyque
1dc1df0827
fix Layout typo
2014-07-15 14:57:10 +08:00
minggo
d830580dc3
Merge pull request #7442 from pandamicro/ArmatureTrans
...
Fixed #5724 : Fix armature bone's transform issue
2014-07-15 14:37:02 +08:00
boyu0
8400ce2e84
fix error.
2014-07-15 14:14:35 +08:00
boyu0
812ad7cd5b
fix lua compile error in xcode6 beta3
2014-07-15 14:10:36 +08:00
Huabing.Xu
dbd3fce0a5
windows dll version of cpp-tests works
2014-07-15 13:54:08 +08:00
samuele3hu
19cc5b9c4d
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix
2014-07-15 13:34:46 +08:00
Huabing.Xu
63de5f6acc
add CC_DLL
2014-07-15 12:00:31 +08:00
andyque
52596dc97f
fix Text line wrap issue
2014-07-15 11:46:53 +08:00
samuele3hu
55e77d8fd2
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix
2014-07-15 11:34:57 +08:00
pandamicro
216af377d0
Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into ArmatureTrans
2014-07-15 11:32:12 +08:00
pandamicro
db8f0ea3ab
Fixed #5724 : Use correct transform in CCSkin's updateTransform function
2014-07-15 11:31:10 +08:00
pandamicro
67c07f94f4
Issue #5724 : Correction of property name in CCBone
2014-07-15 11:30:36 +08:00
Huabing.Xu
4b059689d3
add CC_DLL for functions
2014-07-15 11:18:05 +08:00
Huabing.Xu
9db59c0046
add CC_DLL for Event and Physics
2014-07-15 10:55:40 +08:00
Huabing.Xu
cd9e42eb99
add CC_DLL for colorXXX
2014-07-15 10:04:24 +08:00
Huabing.Xu
60334e8b3e
add CC_DLL for 3d
2014-07-15 09:45:43 +08:00
boyu0
2354c79c3f
Fix compile error
2014-07-14 23:05:16 +08:00
Huabing.Xu
8bbce767f3
add CC_DLL for ActionEase
2014-07-14 22:42:44 +08:00
minggo
ff31144bd2
Merge pull request #7438 from Dhilan007/v3-320final
...
disable warn on zero-sized structure[android].
2014-07-14 21:04:03 +08:00
boyu0
c7fec217ba
Change atof() to utils::atof()
2014-07-14 20:45:24 +08:00
boyu0
7fd0ca217c
Implement utils::atof()
2014-07-14 20:42:08 +08:00
Huabing.Xu
91314ed504
remove CC_DLL for template class and CC_DLL for CCValue
2014-07-14 18:40:10 +08:00
samuele3hu
7757df222a
Add bit extend module
2014-07-14 18:26:39 +08:00
Dhilan007
5e10575ab0
disable warn on zero-sized structures.
2014-07-14 17:53:55 +08:00
Huabing.Xu
9806b37398
add CC_DLL of DrawPrimitive
2014-07-14 17:40:02 +08:00
Huabing.Xu
952ca0eb75
add CC_DLL in Renderer folder
2014-07-14 17:02:06 +08:00
CocosRobot
1ef1a809b5
[AUTO]: updating luabinding automatically
2014-07-14 08:53:13 +00:00
Huabing.Xu
190264c090
add CC_DLL in Event systems
2014-07-14 16:43:28 +08:00
Huabing.Xu
09a75f73cf
add CC_DLL in math folder
2014-07-14 16:40:54 +08:00
minggo
981922eb95
Merge pull request #7432 from joshuastray/transition_ctor_access
...
move constructors and destructors to CC_CONSTRUCTOR_ACCESS and add needed constructors for js bindings
2014-07-14 16:28:18 +08:00
samuele3hu
4cb6c1c74f
Add lua bindings for TextureCache::addImageAsync and update the related test cases
2014-07-14 16:05:48 +08:00
Huabing.Xu
52c0bd365b
add chipmunk.lib for release
2014-07-14 14:47:00 +08:00
Huabing.Xu
469dbea7da
window dll version work now
2014-07-14 14:40:47 +08:00
joshuastray
98b1c0bbed
add needed constructors for js bindings
2014-07-14 14:25:36 +08:00
joshuastray
e14c2587b5
move constructors and destructors to CC_CONSTRUCTOR_ACCESS
2014-07-14 14:25:06 +08:00
minggo
92cfe90937
Merge pull request #7424 from kyokomi/bugfix_UITextField_ttfFont
...
Fix the bug that UITextField doesn't support TTF font
2014-07-14 13:57:54 +08:00
edwardzhou
c0254c9318
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-07-14 11:14:03 +08:00
Dhilan007
b3017fb773
fixed crash cause by incorrect font name.
2014-07-14 10:01:29 +08:00
zhangbin
272146cfb6
Solve the error when compiling lua projects on android.
2014-07-14 09:48:16 +08:00
zhangbin
e4319bf534
Adjust the dependencies of cocosbuilder & cocostudio on android.
2014-07-14 09:48:16 +08:00
zhangbin
b0c465d96b
Adjust the dependencies between modules on android.
2014-07-14 09:48:16 +08:00
kyokomi
915bdae4a6
Fix the bug that UITextField doesn't support TTF font
2014-07-12 22:42:44 +09:00
minggo
7c43b59c6b
Merge pull request #7422 from minggo/get-curent-language
...
return correct language type
2014-07-12 20:45:05 +08:00
minggo
bf4b376ae5
return correct language type
2014-07-12 20:40:15 +08:00
minggo
cfc291e49d
Merge pull request #7379 from joshuastray/v3
...
move JumoTo's copy constuctor and operator= to private
2014-07-12 20:19:03 +08:00
minggo
5c26dc5db4
Merge pull request #7417 from geron-cn/chukongv3
...
fix bug: crash in ui csbs
2014-07-11 20:37:51 +08:00
geron-cn
64408a5d8f
fix bug: crash in ui csbs
2014-07-11 19:02:14 +08:00
minggo
05b485cd41
Merge pull request #7407 from visiblelight/fix_wp8_errors
...
Fix compile errors on WP8
2014-07-11 18:51:23 +08:00
minggo
86e5b37f16
Merge pull request #7413 from CocosRobot/update_lua_bindings_1405071955
...
[AUTO]: updating luabinding automatically
2014-07-11 18:50:58 +08:00
minggo
8cdbe5a019
Merge pull request #7412 from Dhilan007/v3-320final
...
fixed warning: deleting pointer to incomplete type.
2014-07-11 18:50:25 +08:00
CocosRobot
87aaf7dcef
[AUTO]: updating luabinding automatically
2014-07-11 09:48:20 +00:00
Dhilan007
d2e8154dc3
fixed warning: deleting pointer to incomplete type.
2014-07-11 17:45:15 +08:00
minggo
7308668e63
Merge pull request #7411 from minggo/warning-fix
...
fix warnings
2014-07-11 17:42:12 +08:00
minggo
ecb915fabf
fix warnings
2014-07-11 17:39:56 +08:00
samuele3hu
01c3f2a4ed
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_hot_fix
...
Conflicts:
tests/lua-tests/src/mainMenu.lua
tools/tolua/cocos2dx.ini
2014-07-11 16:44:59 +08:00
samuele3hu
d1bd21b1db
Fix the bug that LuaStack::executeFunctionReturnArray hasn't deal with the condition of numArgs == 0
2014-07-11 16:17:51 +08:00
samuele3hu
d9291031cd
Fix the bug that LuaStack::executeFunctionReturnArray hasn't deal with the condition of numArgs == 0
2014-07-11 16:10:42 +08:00
vision
7495a611ea
fix conflict
2014-07-11 16:03:40 +08:00
samuele3hu
54970c109f
Fix the bug that LuaStack::executeFunctionReturnArray hasn't deal with the condition of numArgs == 0
2014-07-11 15:34:21 +08:00
Dhilan007
d8cdb75851
Fix compile errors on WP8
2014-07-11 15:10:19 +08:00
minggo
c63983345b
Merge pull request #7353 from andyque/addStudio1.4
...
add studio v1.3, v1.4, v1.5 tests
2014-07-11 14:15:07 +08:00
andyque
d4122d616a
fix text reader binray version setFontName
2014-07-11 13:58:08 +08:00
andyque
43255e2b96
Merge branch 'v3' into addStudio1.4
...
Conflicts:
cocos/editor-support/cocostudio/WidgetReader/TextReader/TextReader.cpp
2014-07-11 13:55:13 +08:00
minggo
41c267fdb7
Merge pull request #7400 from CocosRobot/update_lua_bindings_1405057491
...
[AUTO]: updating luabinding automatically
2014-07-11 13:52:38 +08:00
CocosRobot
563386a777
[AUTO]: updating luabinding automatically
2014-07-11 05:46:37 +00:00
minggo
f205c0b704
Merge pull request #7392 from xhcnb/fix_CC_ENABLE_SCRIPT_BINDING_build
...
Fix build with -DCC_ENABLE_SCRIPT_BINDING=0 , it causes failed
2014-07-11 13:41:33 +08:00
minggo
d1d84e0d1f
Merge pull request #7386 from chengstory/v3_fixesLoaddTTFError
...
1. fixes TextReader load default font error.
2014-07-11 13:40:16 +08:00
andyque
646f7c7e3f
Merge branch 'v3' into addStudio1.4
2014-07-11 13:39:34 +08:00
minggo
72f8ab8483
Merge pull request #7395 from samuele3hu/v3_controller
...
Add Lua bindings for controller and related test case project
2014-07-11 13:39:30 +08:00
minggo
65404066ec
Merge pull request #7396 from CocosRobot/update_lua_bindings_1405051544
...
[AUTO]: updating luabinding automatically
2014-07-11 13:37:55 +08:00
minggo
6c37541657
Merge pull request #7363 from Dhilan007/v3-event-clear
...
Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8.
2014-07-11 13:36:52 +08:00
minggo
7cf8cf42d3
Merge pull request #7389 from Dhilan007/v3-gc-nibiru
...
Update Nibiru SDK and remove prompt box of install driver .
2014-07-11 13:36:19 +08:00
CocosRobot
20c4e6530d
[AUTO]: updating luabinding automatically
2014-07-11 04:07:14 +00:00
minggo
a0b16a29d1
Merge pull request #7394 from Dhilan007/v3-gc-annotation
...
Add annotation for Controller class.
2014-07-11 12:03:01 +08:00
samuele3hu
2cbe262842
Add newline for some files
2014-07-11 12:00:43 +08:00
samuele3hu
77a82731a5
Remove auto bindings files for controller
2014-07-11 11:57:40 +08:00
samuele3hu
9b9713073e
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_controller
2014-07-11 11:55:10 +08:00
samuele3hu
dd76ae93f6
Update controller lua binding and related test cases
2014-07-11 11:52:05 +08:00
Huabing.Xu
60dd7a4514
Merge branch 'v3' into v3_dll
2014-07-11 11:10:26 +08:00
Dhilan007
4e4464c9c1
Add annotation for Controller class.
2014-07-11 10:56:09 +08:00
Jason Xu
d94941243a
Fix build with -DCC_ENABLE_SCRIPT_BINDING=0 , it causes failed
2014-07-11 10:27:00 +08:00
Huabing.Xu
f5cffba6c9
change pure virtual function to virtual function in action series
...
remove unimplemented function to deprecated and give an empty implementation
add CC_DLL to Vec2
2014-07-11 10:19:49 +08:00
yangxiao
fd8541e32d
rename Bone to Bone3D
2014-07-11 10:17:36 +08:00
samuele3hu
caae8392d4
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_controller
...
Conflicts:
build/cocos2d_tests.xcodeproj/project.pbxproj
cocos/scripting/lua-bindings/Android.mk
cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/project.pbxproj
tools/tolua/genbindings.py
2014-07-10 22:42:09 +08:00
Dhilan007
dfbeb0fb63
Update Nibiru SDK and remove prompt box of install driver .
2014-07-10 22:33:58 +08:00
CocosRobot
c205bd0806
[AUTO]: updating luabinding automatically
2014-07-10 14:10:03 +00:00
minggo
e876065d3e
Merge pull request #7229 from samuele3hu/v3_VideoPlayer
...
Add VideoPlayer Lua bindings and update bindings-generator submodule
2014-07-10 22:04:46 +08:00
minggo
4895e6d54a
Merge pull request #7362 from geron-cn/chukongv3
...
Chukongv3
2014-07-10 21:17:19 +08:00
minggo
b30d758d09
Merge pull request #7383 from 2youyouo2/v3
...
fixed call Bone::setRotation has no effect
2014-07-10 21:16:48 +08:00
zhangcheng
a0ecae21c3
1. fixes TextReader load default font error.
2014-07-10 19:29:39 +08:00
minggo
e749a9a598
Merge pull request #7380 from huangshiwu/v3
...
change "const static" to "static const"
2014-07-10 18:31:09 +08:00
geron-cn
1c4cb78745
deal with null in string
2014-07-10 18:24:11 +08:00
joshuastray
7396f447a4
move initWithDuration to CC_CONSTRUCTOR_ACCESS
2014-07-10 17:56:20 +08:00
kaile.yin
04c63cc370
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-07-10 17:51:02 +08:00
kaile.yin
42f2302866
fixed call Bone::setRotation has no effect
2014-07-10 17:50:38 +08:00
huangshiwu
2a65b7d98e
change "const static" to "static const"
2014-07-10 16:50:25 +08:00
andyque
f76f71eb5d
fix win32 & win8 compile error
2014-07-10 16:37:15 +08:00
andyque
41ccd5e465
add v1.4 tests
2014-07-10 16:37:15 +08:00
edwardzhou
814f45179e
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-07-10 16:10:11 +08:00
edwardzhou
efde627f5b
no use JoinThread
2014-07-10 16:10:02 +08:00
minggo
831b0b332b
Merge pull request #7371 from minggo/enumerateChildren-fix
...
Node::enumerateChildren just searches from itself
2014-07-10 15:46:04 +08:00
minggo
c7856b21fd
Merge pull request #7366 from Dhilan007/v3-fixed-warn
...
fixed warn and replace NULL with nullptr.
2014-07-10 15:42:02 +08:00
joshuastray
30574af6c5
move JumoTo's copy constuctor and operator= to private
2014-07-10 14:30:08 +08:00
minggo
0ba3f6c1c9
Merge pull request #7376 from joshuastray/v3
...
use CC_CONSTRUCTOR_ACCESS to replace protected/private
2014-07-10 14:14:08 +08:00
joshuastray
6b22870e27
use CC_CONSTRUCTOR_ACCESS to replace protected
2014-07-10 14:00:23 +08:00
minggo
cdc02aea7c
Merge pull request #7368 from CocosRobot/update_lua_bindings_1404957724
...
[AUTO]: updating luabinding automatically
2014-07-10 13:54:21 +08:00
minggo
316564d58a
Node::enumerateChildren just searches from itself
2014-07-10 11:07:39 +08:00
yangxiao
0b4c6b7f7a
comment
2014-07-10 11:05:48 +08:00
yangxiao
d7b88e86ff
add comment
2014-07-10 10:56:52 +08:00
yangxiao
ef1f6892e1
deprecated Mesh::create use less parameter ones instead
2014-07-10 10:54:37 +08:00
CocosRobot
af460a1530
[AUTO]: updating luabinding automatically
2014-07-10 02:03:40 +00:00
minggo
345fb040e7
Merge pull request #7352 from super626/v3
...
adjust api according feedback
2014-07-10 09:53:27 +08:00
Dhilan007
6cff8cb564
fixed warn and replace NULL with nullptr.
2014-07-10 00:45:27 +08:00
Dhilan007
dbcb20b886
Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8.
...
Make clear EVENT_COME_TO_FOREGROUND event.
2014-07-09 23:03:04 +08:00
samuele3hu
2bc1cd0486
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_controller
...
Conflicts:
cocos/scripting/lua-bindings/script/Cocos2dConstants.lua
2014-07-09 22:31:05 +08:00
minggo
7d74be3158
Merge pull request #7356 from 2youyouo2/v3
...
fixed Armature blend func effect
2014-07-09 18:37:15 +08:00
samuele3hu
243fa49c09
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer
2014-07-09 18:08:09 +08:00
samuele3hu
3546c131dd
Add Lua bindings for controller and related test case project
2014-07-09 18:05:02 +08:00
kaile.yin
c53cb42e83
fixed Armature blend func effect
2014-07-09 14:25:51 +08:00
yangxiao
dbea3a4d04
deprecated functions
2014-07-09 14:07:33 +08:00
CocosRobot
ae12030745
[AUTO]: updating luabinding automatically
2014-07-09 05:42:06 +00:00
yangxiao
0c28106b48
init playreverse
2014-07-09 09:59:18 +08:00
yangxiao
7b35f36ba3
Merge branch 'newcode' into v3
2014-07-09 09:56:23 +08:00
yangxiao
90b6841e25
adjust api according feedback
2014-07-09 09:53:15 +08:00
zhangcheng
af0613cf32
1、fixes warning.
2014-07-09 00:09:35 +08:00
minggo
0f7968de89
Merge pull request #7339 from super626/v3
...
fix android, add 3d files to cocos2d.h and remove unused resources
2014-07-08 22:09:50 +08:00
minggo
f7af8938bd
Merge pull request #7277 from darkdukey/fix_rotation3D
...
Fix setRotation3D
2014-07-08 22:05:27 +08:00
minggo
eba1735d04
Merge pull request #7347 from Dhilan007/v3-memory-leak
...
fixed memory leak cause by singleton.
2014-07-08 21:13:56 +08:00
minggo
c2474ea7c0
Merge pull request #7262 from pandamicro/origin_v3
...
Indicate correct button and cursor position infomation in mouse move event
2014-07-08 21:07:09 +08:00
minggo
36ef5dd3e8
Merge pull request #7346 from CocosRobot/update_lua_bindings_1404813827
...
[AUTO]: updating luabinding automatically
2014-07-08 20:19:22 +08:00
minggo
4f42df3cea
Merge pull request #7336 from andyque/addMoreUITests
...
fix opacity issue when replace Widget textures
2014-07-08 20:15:21 +08:00
pandamicro
d597a535c1
Refactor #5580 : Make isDirectoryExist support relative path
2014-07-08 18:26:11 +08:00
Dhilan007
10defddc2e
fixed memory leak cause by singleton.
2014-07-08 18:22:48 +08:00
CocosRobot
5838370b31
[AUTO]: updating luabinding automatically
2014-07-08 10:05:47 +00:00
minggo
2398f6b8f0
Merge pull request #7341 from samuele3hu/v3_3
...
Fix some type conversion error and add manual lua binding for Node::enumerateChildren
2014-07-08 18:00:23 +08:00
Frank.Xu
5db9fa6e4b
Add getChildByName method for get a node that can be cast to Type T
2014-07-08 15:58:34 +08:00
yangxiao
ae97d6ebc6
Bone conflict
2014-07-08 15:48:55 +08:00
minggo
5ec2f76a68
Merge pull request #7340 from Dhilan007/v3-opacity-issue
...
fixed opacity issue in SpriteBatchNode.
2014-07-08 15:29:48 +08:00
minggo
0e5e2cbe5e
Merge pull request #7338 from Dhilan007/v3
...
fixed duplicate definition.
2014-07-08 15:29:02 +08:00
samuele3hu
521f805219
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer
...
Conflicts:
tests/lua-tests/src/mainMenu.lua
tools/bindings-generator
tools/tolua/cocos2dx_physics.ini
2014-07-08 14:57:19 +08:00
samuele3hu
f7c8674584
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3
2014-07-08 14:25:10 +08:00
samuele3hu
7095298735
Add manual lua binding for Node::enumerateChildren
2014-07-08 14:22:05 +08:00
Dhilan007
e31abe3f54
fixed opacity issue in SpriteBatchNode.
2014-07-08 14:08:53 +08:00
minggo
2d20b282a4
Merge pull request #7334 from dabingnn/v3_rollBackTexture
...
change the logic of texture loading
2014-07-08 13:52:16 +08:00
yangxiao
e9d3bc1b76
remove unused code
2014-07-08 13:36:22 +08:00
Dhilan007
7d924d2b64
fixed duplicate definition.
2014-07-08 12:50:47 +08:00
lvlong
6de3309f90
have two GL_UNSIGNED_INT delete one
2014-07-08 20:13:57 +08:00
samuele3hu
c59ba7851e
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_3
2014-07-08 12:03:04 +08:00
samuele3hu
a1615123a3
Fix some type conversion error
2014-07-08 12:01:35 +08:00
andyque
2a2184331e
fix opacity issue when replace Widget textures
2014-07-08 11:30:27 +08:00
yangxiao
b19ca902ce
Merge branch 'newcode' into v3
2014-07-08 11:19:26 +08:00
yangxiao
61f4a4d6b3
add 3d file to cocos2d.h
2014-07-08 11:02:29 +08:00
yangxiao
8b482fdfcd
remove gl_fixed
2014-07-08 11:02:00 +08:00
minggo
b0d260d293
Merge pull request #7027 from zhouxiaoxiaoxujian/improvement/COC-9
...
Fix UITextField IME can't auto detach
2014-07-08 10:56:16 +08:00
minggo
4ef666ef8b
Merge pull request #7335 from Dhilan007/v3-labelttf-color
...
fixed can's set color for LabelTTF correctly on IOS.
2014-07-08 10:54:40 +08:00
Dhilan007
6e2caf1c78
fixed can's set color for LabelTTF correctly on IOS.
2014-07-08 10:31:14 +08:00
kaile.yin
f01b249880
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-07-08 10:21:00 +08:00
kaile.yin
d5a79f17ab
fixed set color to parent, it will effect its children
2014-07-08 10:13:15 +08:00
Huabing.Xu
9fb85e303f
change the logic of texture loading
2014-07-08 10:08:02 +08:00
Dale Stammen
021ee7d1e7
check if _itemsPerRow == 0 to avoid divide by zero
2014-07-07 11:17:05 -07:00
Dale Stammen
fa62f4273f
fixed missing zlib.h header path
2014-07-07 10:14:57 -07:00
XiaoYang
b0f5ce36ff
Merge pull request #48 from lvlonggame/v3
...
delete the cube model file and modify 3DBundle
2014-07-07 21:51:10 +08:00
minggo
e1b29a8ef6
Merge pull request #7329 from Dhilan007/v3-gc-refactor
...
issue #4689:Fixed lose disconnected event and incorrect device name/id.
2014-07-07 18:45:23 +08:00
Dhilan007
bbf0fead91
update API annotation.
2014-07-07 18:25:53 +08:00
minggo
38e74e7881
Merge pull request #7328 from dabingnn/v3_rollBackTexture
...
roll back initWithImage logic
2014-07-07 17:50:20 +08:00
Dhilan007
d1034fdaae
1.fixed lose disconnected event.
...
2.fixed incorrect device name and device id;
2014-07-07 17:47:07 +08:00
Huabing.Xu
d935b5db38
roll back initWithImage logic
2014-07-07 17:35:05 +08:00
minggo
3f262568a2
[ci skip: update version]
2014-07-07 17:24:14 +08:00
lvlong
e315ef527a
parseGLType bug
2014-07-07 17:22:46 +08:00
lvlong
a48d33ce31
Merge branch 'newcode' into v3
2014-07-07 17:06:37 +08:00
minggo
cd77690032
Merge pull request #7326 from Dhilan007/v3-gc-refactor
...
issue #4689 : support external key.
2014-07-07 17:04:27 +08:00
andyque
037a7dc882
fix TextReader TTF font Reader issue
2014-07-07 15:22:14 +08:00
andyque
0483c64286
fix widget ignoreContentSize issue
2014-07-07 15:21:14 +08:00
Dhilan007
ddfe82ae08
Replace log with CCLOG
2014-07-07 15:04:29 +08:00
Dhilan007
68bd717ea7
issue #4689 : support external key.
2014-07-07 12:06:24 +08:00
lvlong
0a9e96bfdf
modify Bundle3D::parseGLType add other type
2014-07-07 09:16:08 +08:00
minggo
2d504dcc9b
Merge pull request #7264 from kanitaoru/removeRedandantCommentInConfig
...
Remove redundant comment in ccConfig.h
2014-07-06 21:09:39 +08:00
CocosRobot
4c1da7d89a
[AUTO]: updating luabinding automatically
2014-07-06 13:05:59 +00:00
mannewalis
f238593bfb
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
...
# By chuanweizhang2013 (30) and others
# Via chuanweizhang2013 (19) and others
* 'v3' of https://github.com/cocos2d/cocos2d-x : (78 commits)
fix ui::Helper::seekWigetByName can not find pages in pageview
[AUTO][ci skip]: updating cocos2dx_files.json
add const for getter. fixed redefinition of 'registerListeners'
Update CCController-android.cpp
fixed missing function
issue #4689 : Refactoring game controller API[ios]
Add resources
version1.2
Remove useless codes
Refactoring game controller API
should not include android cpp files in win/wp project
Remove useless codes
Remove useless codes
Add Lua bindings for utils and CaptureScreen test case
revert Android.mk
issue #4689 : Refactor controller API.
add setXXTEAKeyAndSign
fix indent problems
initialize member variable
fix windows compile and running error
...
2014-07-05 12:26:44 -07:00
yangxiao
c7ad436d8a
Merge branch 'newcode' into v3
2014-07-05 13:57:51 +08:00
minggo
9d6c5748dc
Merge pull request #7320 from andyque/fixSeekFile
...
fix ui::Helper::seekWigetByName can not find pages in pageview
2014-07-05 13:44:35 +08:00
andyque
841efea783
fix ui::Helper::seekWigetByName can not find pages in pageview
2014-07-05 12:53:56 +08:00
minggo
9db0f36c33
Merge pull request #7313 from Dhilan007/v3-gc-refactor
...
issue #4689 : Refactoring game controller API.
2014-07-05 01:05:48 +08:00
Dhilan007
2b3de76819
add const for getter.
...
fixed redefinition of 'registerListeners'
2014-07-04 23:07:48 +08:00
Dhilan007
e6c4bb454b
Merge branch 'v3-gc-refactor' of https://github.com/Dhilan007/cocos2d-x into v3-gc-refactorClass
2014-07-04 22:53:33 +08:00
LinWenhai
46435952f8
Update CCController-android.cpp
2014-07-04 21:31:10 +08:00
Dhilan007
eee26b5029
fixed missing function
2014-07-04 21:29:30 +08:00
LinWenhai
2ca5c01902
issue #4689 : Refactoring game controller API[ios]
2014-07-04 21:24:32 +08:00
minggo
a942aae84f
Merge pull request #7316 from cocoscodeide/v3
...
lua runtime template 1.2
2014-07-04 18:33:36 +08:00
minggo
b710dc590b
Merge pull request #7315 from samuele3hu/v3_animation3D
...
Add Lua bindings for utils and CaptureScreen test case
2014-07-04 17:58:18 +08:00
yangxiao
4304d740b4
delete call back
2014-07-04 17:22:39 +08:00
LinWenhai
3fb02acbde
Merge branch 'v3-gc-refactor' of https://github.com/Dhilan007/cocos2d-x into v3-gc-refactor
2014-07-04 17:03:48 +08:00
Dhilan007
6d48cd9523
Refactoring game controller API
2014-07-04 17:01:41 +08:00
minggo
83b7dccdfc
Merge pull request #7314 from joshuastray/fix_win_proj
...
should not include android cpp files in win/wp project
2014-07-04 16:51:27 +08:00
joshuastray
8ab8caf751
should not include android cpp files in win/wp project
2014-07-04 16:44:10 +08:00
samuele3hu
4725388646
Remove useless codes
2014-07-04 16:43:33 +08:00
yangxiao
e2a49ca9c4
Merge branch 'newcode' into v3
2014-07-04 16:36:38 +08:00
samuele3hu
3b23b0c1ff
Remove useless codes
2014-07-04 16:30:22 +08:00
samuele3hu
d9ffa33601
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_animation3D
2014-07-04 16:25:53 +08:00
samuele3hu
85dd2e55bf
Add Lua bindings for utils and CaptureScreen test case
2014-07-04 16:24:00 +08:00
yangxiao
0af286c3be
fix android background to foreground
2014-07-04 16:10:43 +08:00
chuanweizhang2013
39b03de8a9
revert Android.mk
2014-07-04 15:39:07 +08:00
LinWenhai
992245e744
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-gc-refactor
2014-07-04 15:29:40 +08:00
Dhilan007
552a9251c4
issue #4689 : Refactor controller API.
2014-07-04 15:22:53 +08:00
minggo
8b00e72f33
Merge pull request #7311 from andyque/fixWindowsError
...
fix windows compile and running error
2014-07-04 13:44:55 +08:00
chuanweizhang2013
e32eadc364
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3luaruntime
2014-07-04 13:36:51 +08:00
andyque
c8165bb2d9
fix indent problems
2014-07-04 11:53:06 +08:00
andyque
a429182765
fix windows compile and running error
2014-07-04 11:22:36 +08:00
yangxiao
d2cd2449d8
adjust code
2014-07-04 10:42:02 +08:00
minggo
95fe74a34b
Merge pull request #7299 from dabingnn/fast_tmx
...
Fast tmx
2014-07-04 09:49:30 +08:00
yangxiao
05d20d59d4
change position attributes to vec3
2014-07-04 09:25:06 +08:00
mannewalis
4b1f2ccc91
prefixing ivars
2014-07-03 10:16:10 -07:00
mannewalis
96605f801c
prefixing ivars
2014-07-03 10:13:46 -07:00
mannewalis
69341095fe
adding accessors to the on*Callback variables
2014-07-03 09:13:52 -07:00
mannewalis
92e08265cd
changes needed for swift bindings to work
2014-07-03 08:42:06 -07:00
minggo
eb97b9ad45
Merge pull request #7305 from andyque/fixLayoutReader
...
fix layout background image default color & opacity
2014-07-03 17:16:56 +08:00
andyque
f82e96daf0
fix layout background image default color & opacity
2014-07-03 16:56:05 +08:00
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