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
minggo
3336f7edad
use reference instead
2014-06-24 14:53:02 +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
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
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