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
andyque
480c8cfe8f
Merge branch 'fix_revert_pr' into refactor5183
2014-05-20 16:17:38 +08:00
andyque
b07e82f7c3
Revert "Revert "Merge pull request #6752 from andyque/refactorLayout""
...
This reverts commit 1ed9b9749e
.
2014-05-20 16:17:10 +08:00
andyque
723e01f5df
issue #5183 , refactor UILayoutExecutant doLayout method
2014-05-20 16:09:30 +08:00
minggo
9a276c66a0
Merge pull request #6740 from zifter/FixProgressTo
...
Fix Progress Action. Not working with charging from 100 to 0.
2014-05-20 15:36:10 +08:00
CocosRobot
33d8973277
[AUTO]: updating luabinding automatically
2014-05-20 06:44:06 +00:00
andyque
1ed9b9749e
Revert "Merge pull request #6752 from andyque/refactorLayout"
...
This reverts commit ae118a9d22
, reversing
changes made to 6f2f2046c7
.
2014-05-20 14:36:29 +08:00
minggo
9cf21f9a6a
Merge pull request #6829 from favorcode/v3
...
[ci skip]Update UIText.h doxygen comments
2014-05-20 14:03:19 +08:00
favorcode
5ed9e781e4
Update UIText.h
...
Update the doxygen comment
2014-05-20 13:05:20 +08:00
CocosRobot
2c47eae1a0
[AUTO]: updating luabinding automatically
2014-05-20 04:10:28 +00:00
minggo
ae118a9d22
Merge pull request #6752 from andyque/refactorLayout
...
refactor Layout
2014-05-20 12:07:04 +08:00
minggo
6f2f2046c7
Merge pull request #6804 from hyqhyq3/v3
...
fix UIText's fontSize
2014-05-20 11:57:29 +08:00
andyque
993b735392
closed #5183 , done
2014-05-20 10:24:22 +08:00
andyque
432f688a67
issue #5183 , refactor
2014-05-20 10:16:19 +08:00
andyque
e0192e2a1b
issue #5183 , fix win32 compile error
2014-05-20 09:59:12 +08:00
andyque
fe01d12a21
issue #5183 , fix android compile error
2014-05-20 09:39:05 +08:00
andyque
28c3752641
issue #5183 , refacotr some variable names
2014-05-20 09:36:17 +08:00
andyque
834a72315a
issue #5183 , add deprecated function for Widget
2014-05-19 17:43:27 +08:00
GameEgg
9c5f7f0ce3
bug fix FontFNT.cpp
2014-05-19 18:42:11 +09:00
andyque
a9e1c50897
issue #5183 , refactor UIScrollView
2014-05-19 17:34:48 +08:00
andyque
ee24e137f7
issue #5183 , refactor obscure functions
2014-05-19 17:18:04 +08:00
andyque
121d6d3109
issue #5183 , refactor
2014-05-19 16:51:25 +08:00
andyque
5ddfc41414
Merge branch 'v3' into refactorLayout
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-05-19 13:54:16 +08:00
hyq
11dcf1e1dd
fix UIText's fontSize
...
if set fontsize before setting font family, fontsize was wrong
2014-05-19 11:38:45 +08:00
CocosRobot
9f9b0bc426
[AUTO]: updating luabinding automatically
2014-05-19 03:16:40 +00:00
vision
7d76d774e4
no need to use a singleton inside Director class
2014-05-19 10:00:56 +08:00
CocosRobot
a7485bb4e9
[AUTO]: updating luabinding automatically
2014-05-18 22:18:07 +00:00
Ricardo Quesada
2ab70ca39b
Point is no longer deprecated
...
As discussed on the forums:
- Point must not be deprecated (not it must not be used internally)
- Point2, Point3, must not be used. Use Vec2, Vec3 instead
2014-05-18 15:12:48 -07:00
Ricardo Quesada
6461e26c9f
Squashed commit of the following:
...
commit 64722e414c6cacc108fa6015d6af84bd9a4d79ec
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 14:03:53 2014 -0700
More WP8 fixes
commit 7934be32741cddee6d04cd4f32c7e9718ba83b4c
Merge: c2b1619 fea335f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 12:19:41 2014 -0700
Merge branch 'mesh3d' of github.com:ricardoquesada/cocos2d-x into mesh3d
commit c2b1619005b5a62ef77afe727429584d6a57010e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 12:19:19 2014 -0700
Adds missing resources for Windows Phone 8
commit fea335f573f975d9d2f6eafeb3ad4d3ea8095ee5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 11:54:15 2014 -0700
Updates CHANGELOG
commit b8b93da914de97662c9df55cfc351ad8b74ea779
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 11:48:59 2014 -0700
Adds Sprite3d files and tests
commit 059c842938e19068427bb2276d52f3e0ea1cc51f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 11:16:13 2014 -0700
fixes compiler warnings for windows
commit d3299f4cf443c9603f9120e431dbcb6ce8b8e26f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sun May 18 10:53:34 2014 -0700
fixes for Sprite3D
Adds copyright header
removes compilation warnings
cleans code a bit
commit 1377787a4bcebdf349f9de0a05c329066c6eb626
Merge: f89725f 9a3c2d0
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 20:46:26 2014 -0700
Merge pull request #34 from dumganhar/pull/6731
fix compilation error of missing bind Mesh for luabindings.
commit f89725f65ca604efb9abbcfe336c9d50135016b2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 20:45:12 2014 -0700
use const & and changed typo
commit 9a3c2d0df9abcd76292cc1f71b6615931aa807d5
Author: James Chen <jianhua.chen@cocos2d-x.org>
Date: Sat May 17 11:43:10 2014 +0800
fix compilation error of missing bind Mesh for luabindings.
commit 59524b3850b27342f3cb4c390751bdf97362a794
Merge: ee4ec94
5c5a6b9
Author: James Chen <jianhua.chen@cocos2d-x.org>
Date: Sat May 17 11:33:01 2014 +0800
Merge commit 'refs/pull/6731/head' of git://github.com/cocos2d/cocos2d-x into pull/6731
commit 5c5a6b9bde410027db948b539bc3111dc243cf0b
Merge: d4285e3 5f41732
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 20:23:58 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit d4285e336808699f828b82c6b90a83b1b0c0978c
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 20:22:49 2014 -0700
remove empty lines
commit 5f4173271101e2411ffb6cbf600066e204df98d3
Merge: e272583 ac8cf25
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 20:15:44 2014 -0700
Merge pull request #33 from dabingnn/mesh3d_work
Mesh3d work
commit ac8cf2571d92b03c9632d0415078d08526322289
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 20:14:01 2014 -0700
added mesh3d file to template
commit e272583cb8a7f41d8d74dbf7d7db71584187a779
Merge: 6a1b847 5d3a955
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 19:10:45 2014 -0700
Merge pull request #32 from dabingnn/mesh3d_work
Mesh3d work
commit 5d3a95543f66f7ec90bf06e6e1761722b8a33cca
Merge: 4feae11 97cae73
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 18:18:13 2014 -0700
Merge branch 'v3' into mesh3d_work
commit 6a1b847065a1b9d369892ab011478c47e80c9195
Merge: 4feae11 4ece4b3
Author: Trace0429 <yangtuo0429@gmail.com>
Date: Fri May 16 17:15:39 2014 -0700
Merge pull request #31 from Trace0429/mesh3d_work
windows work now
commit 4ece4b3255d84f2749298fdbdecc5ad0302c36a3
Author: Trace0429 <yangtuo@chukong-inc.com>
Date: Sat May 17 08:12:46 2014 +0800
windows work now
commit 4feae11577f64c3aff943af51adc37dcb987bdc1
Merge: 510fc0c fdf82d3
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 16:32:58 2014 -0700
Merge pull request #30 from dabingnn/mesh3d_work
Mesh3d work
commit fdf82d36d97ab68fdb7bab54241fdd94f18a53eb
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 16:32:00 2014 -0700
fix compile error after merge (MAC can work)
commit 4bef832c3f4d5e5f3c19ca36f13ceba9e4ff1dbe
Merge: 510fc0c d19de29
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 16:24:11 2014 -0700
Merge branch 'v3' into mesh3d_work
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/2d/cocos2d.vcxproj
cocos/2d/cocos2d.vcxproj.filters
cocos/Android.mk
cocos/CMakeLists.txt
cocos/renderer/CMakeLists.txt
commit 510fc0cea76bdedfae858bb930d98715ce54f7e9
Merge: e098ed7 7fea347
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 16:11:39 2014 -0700
Merge pull request #29 from dabingnn/mesh3d_work
Mesh3d work
commit 7fea34782f30ef0498a7a993016f45fcb786b771
Merge: a8a409a e098ed7
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 16:08:01 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit a8a409a7d5280b1075eb6258ee556611a5cba7b3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 16:05:37 2014 -0700
bind ARRAY_BUFFER and ELEMENT_ARRAY_BUFFER to 0 after draw
commit e098ed7a5c187256be8313ec5d66294d3554c914
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 16:02:27 2014 -0700
bind buffer to 0 when finish draw
commit d13f637a3777e81085e0285faf00105c58229d7c
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 14:00:38 2014 -0700
fix outline width
commit 8a79c98b163ad862a2e09cbcc19a939f06556358
Merge: e208712 a0cf4ef
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 13:47:17 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit e20871233915f8b6010e59595c38793ec3d6956e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 13:47:12 2014 -0700
make some member protected
commit a0cf4efc48af801636a55d1c330fb6841896d33b
Merge: c0b8902 8b723e8
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 13:06:17 2014 -0700
Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d
commit c0b89021cbbdb13db00b8844aac1f4ff9c90e968
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 13:04:27 2014 -0700
linux work now
commit 8b723e82d81cbffd78e7378cab6d11df30baa044
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 12:48:34 2014 -0700
inc drawcall
commit 5d0b6304b3e5c9bcb2354c3245511706438dc23c
Merge: 1e7032b e783da9
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 12:31:44 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit e783da91fe6c14c8594d3da865e965256376dd10
Merge: 5da20fd 8f7a19a
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 12:31:31 2014 -0700
Merge pull request #28 from dabingnn/mesh3d_work
Mesh3d work
commit 1e7032b448bc79d76a445258f2b0c5bd6dba5fea
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 12:30:01 2014 -0700
optimize code
commit 8f7a19a7b643ac63cbcd776095d6e8a2adb7ca64
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 12:29:37 2014 -0700
adjust code style
commit 5da20fd2e75001451ec790f775fc4fe9cb87aa1b
Merge: 659fbd6 553acfb
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 12:06:53 2014 -0700
Merge pull request #27 from dabingnn/mesh3d_work
Mesh3d work
commit 553acfb3ee685f5461a6d2a68779200abcca8670
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 12:06:02 2014 -0700
fix visual error for outline
commit 659fbd652aa7f4c2d3629fe446051c3dd0377510
Merge: 056c3e1 c617bb7
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 11:54:54 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit 056c3e1394b9c1588395ac8a7f70db1e63c88c31
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 11:54:47 2014 -0700
fix shader, add multiple sprite to Sprite3DEffectTest
commit c617bb74b6bc1e691ee488fd9ca43fa618710bfa
Merge: 94d7896 7b19c56
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 11:33:31 2014 -0700
Merge pull request #26 from dabingnn/mesh3d_work
Mesh3d work
commit 7b19c564e4053ad883617873b11043df1fb98a45
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 11:30:34 2014 -0700
share the same glprogram in effect3DOutline
commit 377d3bccd85dc566554c4fe7b529a9d0e82199e7
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 11:19:56 2014 -0700
add class static variable for EffectOutline
commit d4913bf735dbc74a21bd8327af0b74325bbf9d1d
Merge: 213bbb0 6837cea
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 11:07:04 2014 -0700
Merge branch 'v3' into mesh3d_work
commit 213bbb0c289e579895e92620153b95a8cf374521
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 10:55:28 2014 -0700
add mesh.h in cocos2d.h
commit 94d789610c9d4426b14e655a73197c652afc74f6
Merge: fa69e09 9af9da5
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 10:41:24 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit fa69e09ce0265b1fe3f4e76fa4dbc952abf17812
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 10:41:05 2014 -0700
remove namespace
commit 9af9da50a91804d11537cffe0750e486cf95c8a5
Merge: ff15926 8a38a38
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Fri May 16 10:30:23 2014 -0700
Merge pull request #25 from dabingnn/mesh3d_work
Mesh3d work
commit 8a38a384742ba130946de8ad1759b61ed2f70495
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 10:27:28 2014 -0700
remove redundant uniform CC_Texture0
commit db80bf7c7597fd20a1ca5e4ca89ad067b527f034
Merge: ff15926 511295e
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Fri May 16 10:20:01 2014 -0700
Merge branch 'v3' into mesh3d_work
commit ff15926f47edfbb1250440b060c1d887cfecd033
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 09:11:36 2014 -0700
warning more than one texture
commit 5debbf8d6de4563361974b67aa52e572f7df9dd6
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Fri May 16 08:45:03 2014 -0700
remove redundant line
commit ed357e7484a63bc3eb208d589943f802b7832e4d
Merge: a1e2306 25dd07e
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 22:53:10 2014 -0700
Merge pull request #24 from dabingnn/mesh3d_work
Mesh3d work
commit 25dd07edb7005f593003e90120d6e6439686e5f6
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 22:52:33 2014 -0700
fix memory leak
commit 945ae3444fc2d5eb7c6293960e9c11dfbc5b7cb3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 22:49:04 2014 -0700
remove unused member variable
commit a1e23064140328f4c9bbe434383ca6f25fcb7548
Merge: bac54fc 712e816
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 22:37:16 2014 -0700
Merge pull request #23 from dabingnn/mesh3d_work
Mesh3d work
commit 712e81606f2782ac41276c1e8a87d32217ac9d28
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 22:35:48 2014 -0700
fix memory leak
commit bac54fce097edd4040b0a7cd522d15644e6b482a
Merge: 8ed28c4 54538e8
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 20:01:49 2014 -0700
Merge pull request #22 from dabingnn/mesh3d_work
Mesh3d work
commit 54538e89a2bf33ad6936130d1cbb3ef153db01a5
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 20:01:29 2014 -0700
android work now
commit a6cc0f77875e045d169758adf0cde87360f41475
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 19:53:39 2014 -0700
remove sprite3dEffect include
commit d8482fda09d414de76d1dc1a28c0d0b8bcc5aa32
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 19:50:17 2014 -0700
remove unused Sprite3dEffect
commit c5e2d5579daca64b0e9394a2b07613352847eca8
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 19:48:12 2014 -0700
remove unused outline shader files
commit 09a100cf388d80aa1389d96994ae189cbb0652b2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 19:43:17 2014 -0700
fix error on IOS
commit 8ed28c4854d0b51ed0251f09c27a5ce328599ad5
Merge: d23ffe3 c0e8ea2
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 18:47:37 2014 -0700
Merge pull request #21 from dabingnn/mesh3d_work
Mesh3d work
commit c0e8ea26ff29fc6a3cd04e7f9e122d4ea0a67e2c
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 18:46:54 2014 -0700
adjust indent, and line to the end of the file
commit 661ceb72831d6eccfa522a09cedf994541af6f88
Merge: 8e764e7 d23ffe3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 18:35:18 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
Conflicts:
cocos/3d/CCSprite3D.cpp
cocos/3d/CCSprite3D.h
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
commit 8e764e74dd019852a0ef35b257895a7e79cd9a14
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 18:31:06 2014 -0700
add testCase for outline
commit c2ced288851892299fd7258e51f32303959b374d
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 18:03:34 2014 -0700
extract base class Effect3D
commit d23ffe3167476d10740df321e579bf647a3698d0
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 18:02:45 2014 -0700
RendeMeshData member rename
commit fb8f25553cd317a277c1b924da2c11b9f3188666
Merge: 73cb4b4 819db70
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 17:57:29 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit 819db702d5ffa9461fc9d1d232cea7d373536664
Merge: 2676911 b408f43
Author: Trace0429 <yangtuo0429@gmail.com>
Date: Thu May 15 17:54:24 2014 -0700
Merge pull request #20 from Trace0429/mesh3d_work
Mesh3d work
commit 73cb4b444b222d34e135b0d09b426b9c73c1b790
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 17:54:03 2014 -0700
android meshcommand
commit b408f4343e47766416b19a583bc6bb5167439693
Author: Trace0429 <yangtuo@chukong-inc.com>
Date: Fri May 16 08:50:38 2014 +0800
windows work now
commit afbde9c25cfcdc4a6600a9e7607bc9489ea6b6f9
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 17:38:41 2014 -0700
raw EffectSprite
commit 2676911bb71ef92b3d9cf198021169d9e4466525
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 16:37:20 2014 -0700
remove SpriteEffect from Sprite3D
commit 83dc4cfc3609d14024c3966e49ee34bf36bbd77f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 16:34:36 2014 -0700
raw effectSpriteTest
commit 39e372ef2037090317c9c4a2287b06cadf83c9c5
Merge: 734633e 6d27912
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 16:14:57 2014 -0700
use meshcommand
commit 734633ec1ffc66e590b2ad2da94f6477d78146f2
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 15:38:30 2014 -0700
use meshcommand
commit 4ec56afaa9a660e8eaad6afe18ffded8ca858eb1
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 15:31:43 2014 -0700
comment out effect framework
commit 6d27912f148e03acc07da3e3b4d0c565af8afefa
Merge: d6f6f63 61a9011
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 15:11:25 2014 -0700
Merge pull request #19 from dabingnn/mesh3d_work
Mesh3d work
commit 61a9011d6c78ea6918664bb608dc51344e0236e5
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 14:55:06 2014 -0700
fix compile error in testcases
commit 5f2f585bb8584590ecd3ebcefbb49de45b8f4bed
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 14:52:43 2014 -0700
fix compile error after merge with v3
commit 1a0de47740be51e586cc5615bc28e44ec8a1fc47
Merge: d6f6f63 760ee57
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 14:48:19 2014 -0700
Merge branch 'v3' into mesh3d_work
commit d6f6f633927eb00df984ec4239555f9ce2c7e44d
Merge: c6fbd6e 76d2523
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 14:26:40 2014 -0700
Merge pull request #18 from dabingnn/mesh3d_work
Mesh3d work
commit 76d2523ae735384533a1e37f06e370cb3481b0f2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 14:25:40 2014 -0700
move 3d shaders to shader cache
commit 9b68032c809dc6667ffd5c1af37b7ad4d84fe2de
Merge: 2c9a573 c6fbd6e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 13:56:00 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit 2c9a5738c2d24c33d4994e8e44e32fcc8d9ceece
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 13:55:49 2014 -0700
meshcommand
commit 0631a51c5d9c0aae55447105b962a888e1158cd3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 13:21:36 2014 -0700
add mesh rebuild when come to foreground in android
commit 8695016869ab56f3a046f488485f9fdfb6532417
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 13:13:59 2014 -0700
android work now
commit c6fbd6e67d29b2fdfeed74f96de0ff5a6cdae1f5
Merge: cd7b235 0466a38
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 12:21:40 2014 -0700
Merge pull request #17 from dabingnn/mesh3d_work
Mesh3d work
commit 0466a38e77ca1bc6be09bf18b42a6290db8dace8
Merge: e349e4e cd7b235
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 12:19:24 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit e349e4e0a7047ed49c2bfa9b2e3e5cae5cbc8f67
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 12:18:49 2014 -0700
commit the changed IOS/MAC project file
commit a7c9a65d5603622b1d40cc009dfceee60c376f50
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 12:17:57 2014 -0700
remove MeshPart
commit cd7b235b5ec5b3ce21bc856888d383e6224fd047
Merge: e666045 3b7b406
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Thu May 15 11:03:54 2014 -0700
Merge pull request #16 from dabingnn/mesh3d_work
Mesh3d work
commit 3b7b406caff0b6f79fe044612a32e909f778d1e3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Thu May 15 10:59:10 2014 -0700
raw version of single Mesh
commit e666045aa4768199c530f494f0a1fb402f2ce922
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 10:44:04 2014 -0700
fix outline
commit 5d4f304c5f9e5b35dbb1d1176232ab5189c98c0e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Thu May 15 10:09:45 2014 -0700
without normal no outline effect
commit 3f6bd0ffbca804dd9ca6776c8cc2b37643911d63
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 22:39:03 2014 -0700
android listenBackToForeground
commit 6bec670319ea154474c32c941c250bc3909a7e2e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 21:58:09 2014 -0700
add boss1 with normal
commit 35c1b8d5fcec188cbef92457e24721ae53820328
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 21:54:20 2014 -0700
change cache
commit 076166fba142d5432bbadaf3e75d6c35bcb6905a
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 21:35:59 2014 -0700
depress no .mtl crash
commit 498c9693a7e7009615382c5769b7493c3ff6be68
Merge: 8a63b49 d4fd946
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 15:58:50 2014 -0700
Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d
commit 8a63b4959cbb5e2b749d7f63f5b4ebe2bc5a6970
Merge: b4a8fee f395cc5
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 15:58:36 2014 -0700
merge dabingnn
commit d4fd946fc8afdc95741f6a170e489d3dca9e2519
Merge: f395cc5 a17f074
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Wed May 14 15:53:58 2014 -0700
Merge pull request #15 from dabingnn/mesh3d_work
Mesh3d work
commit a17f074302d10ff03881cba7e634e094d31feb0a
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 15:52:58 2014 -0700
android can work now
commit b4a8fee4b9735e16331a5656055572db9e551367
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 15:33:07 2014 -0700
refactoring render code
commit f395cc50cdd8f2f15204ad9a126338d5c2fa72d2
Merge: f129e02 a2c12df
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Wed May 14 15:27:21 2014 -0700
Merge pull request #14 from dabingnn/mesh3d_work
Mesh3d work
commit a2c12df8d8908abe4dcb1a0c91711a28d9f05cac
Merge: 1932e22 f129e02
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 15:26:19 2014 -0700
Merge branch 'mesh3d' of github.com:super626/cocos2d-x into mesh3d_work
commit 1932e22962a79530adf583f24070efcee32251d3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 15:25:55 2014 -0700
android can compile now(can not work)
commit f129e02ef21a0d44b8517c53d8c6bed0aaf85def
Merge: ae2aa0d c0d9097
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Wed May 14 14:21:09 2014 -0700
Merge pull request #13 from dabingnn/mesh3d_work
Mesh3d work
commit c0d90973c2b87582e99966256c74dcdf23712d6a
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 14:15:16 2014 -0700
include Sprite3DEffect in the cocos2d header
commit ae2aa0dd705bf1a961164f9059eec4e5c2281bb5
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 12:51:09 2014 -0700
outline sprite
commit e7a542d9c95c145241314fc63fbe12ba0b80ec6a
Merge: 1c76d4c 48e9f39
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 10:48:55 2014 -0700
meshvertexattrib work
commit 1c76d4ca319c15dadd7243ce4230fa35dfb7a1bb
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 10:40:55 2014 -0700
use meshvertexattribute
commit 48e9f3991dd7aafc90e99e1721d04f28d01f94e6
Merge: b70bf52 e0d87a9
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Wed May 14 09:41:57 2014 -0700
Merge pull request #12 from dabingnn/mesh3d_work
Mesh3d work
commit e0d87a99f42f808429917c8b586509ca75e8a5e2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:40:14 2014 -0700
remove compile error
commit c445e07c895fc2352f1220459d91f41f77690cd8
Merge: b70bf52 86fb75a
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:31:14 2014 -0700
Merge branch 'v3' into mesh3d_work
commit b70bf522ef139da670cf41791a3d0ddad3dfa1cc
Merge: da24c48 5a2127d
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Wed May 14 00:25:47 2014 -0700
vertex attrib
commit da24c48c981029493900bcd2143495e546faa75e
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Tue May 13 23:49:09 2014 -0700
mesh vertex attribute
commit 5a2127d718e6a9cb9f2ca3e1ac353ce1e5c0ebfd
Merge: d98adb7 5148f76
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 19:06:38 2014 -0700
Merge pull request #11 from dabingnn/mesh3d_work
Mesh3d work
commit 5148f76c43bf1e3dc5a49ad6bf112d166d6b1c93
Merge: 02deb39 d98adb7
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 19:05:40 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit 02deb399314f01ec1222d78f2383a65614e33a34
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 19:04:15 2014 -0700
fix texcoord y flipped
commit d98adb7d9d906f8376e45a2ba57bffc4e17e1775
Merge: 300eb4e 946283b
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 18:35:08 2014 -0700
Merge pull request #10 from dabingnn/mesh3d_work
Mesh3d work
commit 946283b83218de893c727dc9780291fe1683a4f9
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 18:22:16 2014 -0700
added blendFunc
commit 300eb4e31783452cf16b77f85c3ef6f9dba19fc6
Merge: da7d6a0 ccc0baf
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 16:03:01 2014 -0700
Merge pull request #9 from dabingnn/mesh3d_work
Mesh3d work
commit ccc0bafd32b3375c2fe2163e0eb32714d06f8525
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 16:01:59 2014 -0700
fix compile error after merge
commit 5bfc30b2b930131d23058d99a6862061c2217f38
Merge: da7d6a0 0171e27
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 15:56:46 2014 -0700
Merge branch 'v3' into mesh3d_work
commit da7d6a087f22f4a11827ff3410fbcd2561f155fc
Merge: 0caad32 f413b4e
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 14:19:24 2014 -0700
Merge pull request #8 from dabingnn/mesh3d_work
Mesh3d work
commit f413b4e55764d27863ae6978f1dbb2a0a3ca35e0
Merge: f47cfc6 0caad32
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 14:17:01 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit f47cfc67041ed4655a916623a6731876758a5182
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 14:15:06 2014 -0700
add new interface for createSprite3D
commit 0caad32f2aa40c45e42d5d61c83419ee06e65a97
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Tue May 13 13:58:35 2014 -0700
default GLProgram to object
commit 901ccef93593e2c39cca190784b4fc9684dfa9d0
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 13:13:24 2014 -0700
remove compile warning
commit a6f9cdfcdd001d4486eb8206c3bd9d85e9fc9bc8
Merge: 68bdd0b 3eef54c
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 13:01:20 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit 68bdd0be68e3a11bb7bc5312e61ba5fb628c439b
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 12:59:59 2014 -0700
rename init->initWithFile in Sprite3D
commit 3eef54ca06c83f72e248ce91fe639a8446ef1be5
Merge: f719f45 1c8773c
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 12:58:23 2014 -0700
Merge pull request #7 from super626/mesh3d_tmp
Mesh3d
commit 1c8773c53ff0bb87cb249d6392a900cd572dac1e
Merge: 23e8786 f719f45
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Tue May 13 12:56:06 2014 -0700
Merge branch 'mesh3d_tmp' into mesh3d
commit f719f45aba37791ffdfe107569350a1af94cbeb0
Merge: 6bd3f28 1b76467
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 11:59:46 2014 -0700
Merge pull request #6 from dabingnn/mesh3d_work
Mesh3d work
commit 1b7646759d9efcdf0942a42c0c22964a99309853
Merge: 6bd3f28 87adf9d
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:53:17 2014 -0700
Merge branch 'mesh3d' into mesh3d_work
commit 87adf9df61e76f765f78a2bae4ec980ffb73ce57
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:52:41 2014 -0700
adjust line indent and header file define
commit 23e8786892b89e25d1add091a7c3bc618990e579
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Tue May 13 11:44:22 2014 -0700
using vbo
commit 6bd3f28440eca3530379b4610d6f87cc88eb54c5
Merge: 56fc0f4 a239a7e
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 11:42:10 2014 -0700
Merge pull request #5 from dabingnn/mesh3d_work
Mesh3d work
commit a239a7e35a82f497c337d96a025125b92c8daefd
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:39:06 2014 -0700
add CCSprite3d include into cocos2d.h
commit 8d580c28a084c1dab2a5ce925871f3361e6b970a
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:33:18 2014 -0700
remove cocos2d.h include in Sprite3DTest.h
commit 56fc0f4cbccb07cda972efda302ff6689b958ab2
Merge: ab16a26 8bb75e3
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Tue May 13 11:28:47 2014 -0700
Merge pull request #4 from dabingnn/mesh3d
Mesh3d
commit 8bb75e3dd96131da1c2dd9bc622d7bdbb2ad0514
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:26:40 2014 -0700
fix compile error after rename
commit 230a73132c09c66b449efbacbc417974616694c6
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Tue May 13 11:07:30 2014 -0700
rename FileXXX to CCFileXXX
commit ab16a26376f7deddf1a82f3085668e3fd9f09a12
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Tue May 13 10:52:36 2014 -0700
rename _model to _mesh
commit 92ac7f75d06ad081282bbddcad5920a1f7584264
Merge: 6b911b5 df147d1
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Mon May 12 22:23:59 2014 -0700
Merge pull request #3 from dabingnn/mesh3d
Mesh3d
commit df147d14ddb8e61d907a44c6f03f404c8a68103f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Mon May 12 22:21:22 2014 -0700
fix retain/release in sprite3D
commit 0b38939fd79168699ab737a8dc8e97c9417cf4ce
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Mon May 12 20:04:16 2014 -0700
remove compile warnings
commit 090f81b8198d18bc0b31bbba28c3e2e6d73e9f92
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Mon May 12 19:16:25 2014 -0700
using glprogramstate work ok
commit 0b4f36a964c28f5f4b3224522f27402e0efbe123
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Mon May 12 18:38:52 2014 -0700
add obj
commit e8917d7427f3ff0e7c3d874b908e0058adecf2f7
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Mon May 12 18:33:23 2014 -0700
use glprogramstate
commit 6b911b52c86cd79e1fd3efc0536a5ca7ab04ab7a
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Mon May 12 13:01:56 2014 -0700
sprite3d
commit 2a490c344f2db27d467506cf28c910410bb892e6
Merge: 23a5232 01b015d
Author: Huabing.Xu <huabing.xu@cocos2d-x.org>
Date: Mon May 12 10:52:17 2014 -0700
Merge pull request #1 from dabingnn/newcode
Newcode
commit 01b015d1238c89b6837ea276a95ce359cf0da5a7
Merge: 23a5232 5d24b3d
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Mon May 12 10:50:14 2014 -0700
Merge branch 'v3' into newcode
commit 23a5232fe5bb4c0b0bc821d1945426486dafe253
Author: yangxiao <yangxiao@cocos2d-x.org>
Date: Mon May 12 09:44:41 2014 -0700
3d mesh initial code
2014-05-18 14:49:16 -07:00
vision
81ddbaa7b1
update the calculation of device pixel resolution
2014-05-19 01:12:56 +08:00
zifter
d875f27c67
Merge branch 'FixNodeConst' of https://github.com/zifter/cocos2d-x into FixNodeConst
...
Conflicts:
cocos/ui/UIListView.h
cocos/ui/UIPageView.h
2014-05-17 10:40:36 +03:00
James Chen
7da07342fe
Merge pull request #6734 from 2youyouo2/v3
...
fixed no effect with stopping tween between two frames
2014-05-17 12:17:34 +08:00
CocosRobot
844cc9bcef
[AUTO]: updating luabinding automatically
2014-05-17 03:20:49 +00:00
Ricardo Quesada
ef700f2e3a
Fixes android build issues
...
also restores file for VS
2014-05-16 18:16:20 -07:00
Ricardo Quesada
a1243ca9ed
Squashed commit of the following:
...
commit 8342086a358287a77d6f6bf8dd6e2ae0a488aef7
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 17:37:58 2014 -0700
little fixes in project
commit 832397c96cc63523a2ad0490ac9d8ad3e3bf7d5d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 17:33:11 2014 -0700
CopyTemplates working
commit 8c1555cb0369bf123f84733839ef30c30f70f4ff
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 17:22:05 2014 -0700
Re-adds CopyTemplate to VS solution
commit fef2ad65596fd0ff60846e3a0b09dfea82c692a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 16:40:22 2014 -0700
Updated shaders
and project fixes
2014-05-16 17:38:52 -07:00
Ricardo Quesada
0f67247325
Squashed commit of the following:
...
commit a794d107ad85667e3d754f0b6251fc864dfbf288
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 14:33:49 2014 -0700
Yeah... everything compiles on win32 and wp8
commit 4740be6e4a0d16f742c27996e7ab2c100adc76af
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 13:58:38 2014 -0700
CCIME moved to base
and compiles on Android
commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 13:02:57 2014 -0700
compiles Ok for Windows Phone 8
commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 12:25:31 2014 -0700
fixes for Windows Phone 8
commit 418197649efc93032aee0adc205e502101cdb53d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 11:15:13 2014 -0700
Compiles on Win32
commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 10:08:31 2014 -0700
Compiles on linux!
commit 118896521e5b335a5257090b6863f1fb2a2002fe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 09:30:42 2014 -0700
moves cocos/2d/platform -> cocos/platform
commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0
Merge: bd68ec2 511295e
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 08:24:41 2014 -0700
Merge remote-tracking branch 'cocos2d/v3' into files
commit bd68ec2f0e3a826d8b2f4b60564ba65ce766bc56
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Thu May 15 19:36:23 2014 -0700
files in the correct directory
2014-05-16 14:36:00 -07:00
Huabing.Xu
38b4e7ad2c
fix memory leak for GLProgramState create logic
2014-05-16 11:02:23 -07:00
minggo
e3f2c3985d
Merge pull request #6777 from boyu0/physics_rollback_for_lua
...
Roll back lua PhysicsTest.
2014-05-16 21:55:52 +08:00
minggo
540418840b
Merge pull request #6737 from seobyeongky/dispatcher_bug_fix
...
EventDispatcher bug fix
2014-05-16 18:35:51 +08:00
minggo
bf2250a67a
Merge pull request #6738 from cocoscodeide/v3
...
update template project lua
2014-05-16 18:10:10 +08:00
boyu0
74335a92f7
Roll back lua PhysicsTest.
2014-05-16 17:19:02 +08:00
minggo
eb38809630
Merge pull request #6756 from zifter/FixTwiceCallingOnExit
...
Fix twice calling on exit
2014-05-16 17:10:42 +08:00
Jason Xu
67a558c83d
for 93562d6aa6
...
update Cocos2dxHelper and AndroidManifest.xml template.
2014-05-16 15:55:00 +08:00
andyque
b434840bc9
issue #5183 , add layout parameter type to widget for convenient access
2014-05-16 10:33:28 +08:00
andyque
1b3c28ea90
Merge branch 'v3' into refactorLayout
...
Conflicts:
cocos/ui/UILayout.cpp
2014-05-16 10:22:53 +08:00
James Chen
d6007a395c
Adds a virtual method for loading native libraries.
2014-05-16 10:20:49 +08:00
Ricardo Quesada
7e4597508c
Does not crash on Mac if the .ttf file is not found
2014-05-15 17:22:53 -07:00
Ricardo Quesada
9d1ab1ba07
uniform sampler CC_Texture0 MUST NOT be defined on shaders
...
since it is a built-in.
Built-in uniforms MUST NOT be defined on shaders.
Basically all CC_ uniforms must be defined by cocos2d-x
2014-05-15 16:47:54 -07:00
AlexV
234c902630
fixing cmakelist after merge
2014-05-15 22:26:41 +09:00
AlexV
0bec438be8
Merge branch 'v3' of github.com:asmodehn/cocos2d-x into asmo_newv3_cmake_win32
2014-05-15 22:24:33 +09:00
minggo
9f67e74878
Merge pull request #6764 from minggo/monkey-test
...
EditBox: Check text content before being sent to cpp
2014-05-15 18:22:35 +08:00
samuele3hu
6f6cfba21b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
2014-05-15 16:57:08 +08:00
samuele3hu
cde4e4811b
Update some GuiConstants and resubmission pr#6361.
2014-05-15 16:54:55 +08:00
CocosRobot
44c6c4d542
[AUTO]: updating luabinding automatically
2014-05-15 08:18:44 +00:00
samuele3hu
95dfbf7dae
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
2014-05-15 15:40:28 +08:00
samuele3hu
5a14b1d67b
fix compile error and synchronizate the UI change for Lua
2014-05-15 15:39:15 +08:00
minggo
385b2507aa
Merge pull request #6615 from xhcnb/fix_ActionObject
...
FIx: correct TotalTime of ActionObject.
2014-05-15 15:39:15 +08:00
zifter
c8a1004a4d
Little refactor.
2014-05-15 09:43:18 +03:00
andyque
fc8d286fcb
closed #5188 , fixed android NULL pointer exception
2014-05-15 12:11:11 +08:00
minggo
39d3d65157
Merge pull request #6754 from minggo/monkey-test
...
Matrix -> Mat4
2014-05-15 11:10:39 +08:00
minggo
67f809e223
Matrix -> Mat4
2014-05-15 11:09:17 +08:00
andyque
cfa0342618
Merge branch 'v3' into issue5005
...
Conflicts:
cocos/ui/UIWidget.cpp
2014-05-15 11:03:03 +08:00
andyque
3f08dd2758
issue #5183 , remove no needed type
2014-05-15 10:48:33 +08:00
andyque
b32ca246e7
issue #5183 , done
2014-05-15 10:44:19 +08:00
andyque
5697d2417a
issue #5183 , done
2014-05-15 10:23:25 +08:00
andyque
0639e49031
issue #5183 , add LayoutProtocol
2014-05-15 10:07:42 +08:00
byeonggee.seo
c6f2a2aeb3
name fix
2014-05-15 10:19:59 +09:00
zifter
287b10f070
Fixed double calling onExit method.
2014-05-14 23:28:47 +03:00
Ricardo Quesada
6c025d22b5
Merge pull request #6746 from ricardoquesada/shadertest2_fixes
...
Improvments on the shader2 tests
2014-05-14 13:10:17 -07:00
Ricardo Quesada
839170c147
Improvments on the shader2 tests
2014-05-14 13:09:33 -07:00
CocosRobot
7b45fc90a8
[AUTO]: updating luabinding automatically
2014-05-14 17:16:02 +00:00
Ricardo Quesada
dc711643cd
Squashed commit of the following:
...
commit a9572b8913f3a38b59adbd7b4017ab9848a6b2b5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed May 14 10:03:44 2014 -0700
math renames
`Vector2` -> `Vec2`
`Vector3` -> `Vec3`
`Vector4` -> `Vec4`
`Matrix` -> `Mat4`
commit 4e107f4bd854c26bfceb52b063d6bd9cea02d6a3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:24:28 2014 -0700
raw version of rename Vector3
commit 1d115573ebe96a5fc815fa44fbe6417ea7dba841
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:07:14 2014 -0700
rename Vector2 after merge
commit ab2ed58c129dbc30a4c0970ed94568c5d271657b
Merge: 1978d2d 86fb75a
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:05:30 2014 -0700
Merge branch 'v3' into v3_renameMathClassName
Conflicts:
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest_Editor.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UICheckBoxTest/UICheckBoxTest_Editor.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISliderTest/UISliderTest_Editor.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest.cpp
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UITextFieldTest/UITextFieldTest_Editor.cpp
commit 1978d2d174877172ccddc083020a1bbf43ad3b39
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 08:51:45 2014 -0700
rename vector2 in tests/cpp-empty-test folder
commit d4e0ff13dcce62724d2fece656543f26aa28e467
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:58:23 2014 -0700
rename vector2 in tests/cpp-tests cpp files
commit be50ca2ec75e0fd32a6fcdaa15fe1ebb4cafe79f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:52:57 2014 -0700
rename vector2 in tests/cpp-tests head files
commit 6daef564400d4e28c4ce20859a68e0f583fed125
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:49:48 2014 -0700
rename vector2 in extension folder
commit 8f3f0f65ceea92c9e7a0d87ab54e62220c5572e2
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:47:22 2014 -0700
rename vector2 in cocos/2d cpp files
commit e1f3105aae06d595661a3030f519f7cc13aefbed
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:44:39 2014 -0700
rename vector2 in cocos/2d head files
commit 6708d890bfe486109120c3cd4b9fe5c078b7108f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:40:59 2014 -0700
rename vector2 in cocos/base folder
commit d3978fa5447c31ea2f3ece5469b7e746dfba4248
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:40:43 2014 -0700
rename vector2 in cocos/deprecated folder
commit 4bff45139363d6b9706edbbcf9f322d48b4fd019
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:40:26 2014 -0700
rename vector2 in cocos/editor-support folder
commit 353d244c995f8b5d14f635c52aed8bc5e5fc1a6f
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:36:48 2014 -0700
rename vector2 in cocos/ui folder
commit 758b8f4d513084b9922d7242e9b8f2c7f316de6c
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:32:39 2014 -0700
rename vector2 in cocos/renderer folder
commit 0bd2710dd8714cecb993880bc37affd9ecb05c27
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:32:15 2014 -0700
rename vector2 in cocos/physics folder
commit b7f0581c4587348bdbc1478d5374c2325735f21d
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:25:01 2014 -0700
rename vector2 in cocos/math folder
commit a8631a8e1a4e2740807ccd9be9d70de6ecaad7dd
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 00:16:55 2014 -0700
rename Vector2 to Vec2
deprecate typedef Vector2
2014-05-14 10:07:09 -07:00
zifter
6fcef92708
Fix Progress Action.
2014-05-14 19:13:14 +03:00
vision
90e2b8a4af
move the method from ccUtils to Director
2014-05-14 19:42:24 +08:00
minggo
abc08e703f
Merge pull request #6728 from pandamicro/FixParticlesInit
...
Fixed #5040 : Remove memory allocation assertion to permit multiply init
2014-05-14 18:39:13 +08:00
minggo
d46362abb3
Merge pull request #6681 from minggo/director-fix
...
[ci skip] don't trigger onExitTransitionDidStart
2014-05-14 18:24:26 +08:00
andyque
967c071c68
issue #5183 , refator LayoutExecutant
2014-05-14 18:24:23 +08:00
andyque
8c8f9611f7
issue #5183 , add CCLayoutExecutant file
2014-05-14 18:03:44 +08:00
James Chen
8a92b6cc7f
Merge pull request #6736 from CocosRobot/update_lua_bindings_1400061063
...
[AUTO]: updating luabinding automatically
2014-05-14 18:02:30 +08:00
byeonggee.seo
76cd9911cb
bug fix
2014-05-14 18:58:55 +09:00
minggo
fba3bf2d15
Merge pull request #6735 from Dhilan007/v3_labelfix
...
label's small improvement.
2014-05-14 17:58:46 +08:00
CocosRobot
6f6d233ea5
[AUTO]: updating luabinding automatically
2014-05-14 09:52:20 +00:00
minggo
db0ea94b8a
Merge pull request #6730 from andyque/refactor5110
...
refactor ui framework
2014-05-14 17:47:47 +08:00
andyque
6cb3b47488
closed #5110 , refactor
2014-05-14 17:07:24 +08:00
Dhilan007
059ea3dd8a
label's small improvement.
2014-05-14 16:41:26 +08:00
vision
dfb016dde3
move the utility from Renderer to UtilsHelper
2014-05-14 16:25:47 +08:00
andyque
9d5c2ba773
closed #5110 , add const specifier to getStringLength function
2014-05-14 16:25:30 +08:00
andyque
09fce798f0
closed #5110 , add const reference to typedef
2014-05-14 16:14:28 +08:00
andyque
437b30487c
issue #5110 , refactor UITextBMFont
2014-05-14 16:02:31 +08:00
andyque
76cefcaa3f
issue #5110 , refactor UITextAtlas
2014-05-14 15:51:50 +08:00
andyque
e6889dca36
issue #5110 , refactor UIText
2014-05-14 15:26:14 +08:00
yinkaile
e30e05ce92
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-05-14 15:13:38 +08:00
samuele3hu
ee4e5e4800
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_fix
2014-05-14 14:45:15 +08:00
andyque
578ff2735d
issue #5110 , fix VideoPlayer android compile error
2014-05-14 14:44:04 +08:00
samuele3hu
534ad2aafb
fix the compile error in Xcode 4.6 for mac platform which trigger by the Architectures’ value
2014-05-14 14:43:10 +08:00
minggo
f22804241a
Merge pull request #6725 from dumganhar/ref-tracker
...
Adds ref memory tracker to easily find out memory leak for instance of Ref or its subclasses
2014-05-14 13:44:22 +08:00
James Chen
4c23ff5b8c
trackRef and untrackRef are static function now.
2014-05-14 11:55:20 +08:00
pandamicro
a463a1630f
Fixed #5040 : Remove memory allocation assertion to permit multiply init
2014-05-14 11:49:09 +08:00
andyque
46cf6251b6
issue #5110 , rename a member variable and delete gui prefix in ui tests
2014-05-14 11:26:04 +08:00
vision
7b0cf3c860
replace std::function with const std::function&
2014-05-14 11:21:46 +08:00
andyque
e6a36fde18
issue #5110 , refactor VideoPlayer
2014-05-14 11:18:11 +08:00
andyque
08801c035e
issue #5110 . refactor UILoadingBar, remove unneeded deprecats
2014-05-14 10:48:16 +08:00
vision
e7df247d65
replace more tabs with spaces to uniform the code styles.
2014-05-14 10:40:56 +08:00
James Chen
54176b0267
Include <algorithm> for std::find
2014-05-14 10:31:09 +08:00
James Chen
c14482254d
Fixes wrong indention and whitespace cleanup
2014-05-14 10:25:45 +08:00
James Chen
ba3f5f8eee
Updates indention in CCRef.h
2014-05-14 10:17:08 +08:00
James Chen
72d29976c3
Disables memory tracker by default
2014-05-14 10:16:05 +08:00
James Chen
eb8f07370c
Remove a comment in CCRef.cpp
2014-05-14 10:12:49 +08:00
James Chen
d9d4d9d51a
Adds ref memory tracker to easily find out memory leak for instance of Ref or its subclasses
2014-05-14 10:07:03 +08:00
CocosRobot
20c50ef189
[AUTO]: updating luabinding automatically
2014-05-14 02:03:18 +00:00
minggo
0303e5d270
Merge pull request #6716 from andyque/issue4900
...
closed #4900 , add TTF font to UIText
2014-05-14 09:57:57 +08:00
andyque
ca4a7a7e53
issue #4900 , refactor
2014-05-14 09:55:55 +08:00
andyque
92d9120967
issue #4900 , refactor
2014-05-14 09:37:21 +08:00
andyque
df86b07f15
closed #5005 , refactor
2014-05-14 09:23:56 +08:00
vision
021be6ef9b
Merge branch 'screenshot' of github.com:visiblelight/cocos2d-x into screenshot
2014-05-14 09:22:36 +08:00
Ricardo Quesada
723938e292
Adds effectNode in ShaderTest2
2014-05-13 18:12:58 -07:00
Ricardo Quesada
0171e27747
Merge pull request #6714 from Dhilan007/v3_nodefix
...
Fix a bug that if a node changes parent, parent's matrix will not update to reflect this change.
2014-05-13 14:14:27 -07:00
zifter
249dffa346
getter always must be a const method.
2014-05-13 23:28:04 +03:00
Ricardo Quesada
6462a1bf79
Adds simple sample for multitexturing
2014-05-13 12:55:34 -07:00
Ricardo Quesada
31dd70dba2
Matrix::identity() -> IDENTITY
...
consistency with the rest of the cocos2d API
2014-05-13 10:26:25 -07:00
visiblelight
541d03d668
Now it shoudl run fine on iOS
2014-05-14 01:06:26 +08:00
visiblelight
4df8624a54
Merge branch 'screenshot' of github.com:visiblelight/cocos2d-x into screenshot
2014-05-13 22:37:40 +08:00
andyque
a28bdb0ed5
closed #5005 , refactor
2014-05-13 18:41:38 +08:00
minggo
05c16de87a
Merge pull request #6715 from dumganhar/iss5160-animation-notification
...
closed #5160 : Dispatch a custom event after an animation frame is displayed
2014-05-13 18:38:44 +08:00
visiblelight
fe91f46882
The target filename shuld use a writable path.
2014-05-13 18:34:35 +08:00
andyque
2a25afbb76
closed #4900 . add comment
2014-05-13 18:15:53 +08:00
minggo
7d7d0b8251
Merge pull request #6712 from dumganhar/dont-using-cocos2d-namespace-in-header
...
PLEASE NEVER `using namespace cocos2d;` in header file
2014-05-13 18:07:18 +08:00
cocoscodeide
0b301d6602
Merge pull request #5 from cocos2d/v3
...
update cocos2d-x
2014-05-13 17:59:18 +08:00
andyque
31a2194dcb
closed #4900 , add TTF font to UIText
2014-05-13 17:45:15 +08:00
visiblelight
0de27ad4f1
Merge branch 'screenshot' of github.com:visiblelight/cocos2d-x into screenshot
2014-05-13 17:30:16 +08:00
James Chen
1ced31a2d3
issue #5160 : Don't use static variables, use member variables
2014-05-13 17:29:05 +08:00
visiblelight
5459b581b0
replace tab with spaces; remove the 'flipped' parameter;
2014-05-13 17:17:15 +08:00
andyque
41fe56ee70
closed #5005 , fix a null pointer exception
2014-05-13 17:12:48 +08:00
James Chen
0cd2196b88
closed #5160 : Dispatch a custom event after an animation frame is displayed
2014-05-13 17:08:30 +08:00
James Chen
d0c98d6269
Adds ValueVectorNull, ValueMapNull, ValueMapIntKeyNull global variables.
2014-05-13 17:03:48 +08:00
andyque
2d88c8ea92
closed #5005 , fix visible and enable issue
2014-05-13 16:37:41 +08:00
Dhilan007
1a7ca64be2
Merge branch 'reparentChildren' of https://github.com/darkdukey/cocos2d-x into v3_nodefix
2014-05-13 16:36:42 +08:00
visiblelight
47e4ee4ff2
add a new utility function to capture the screen
2014-05-13 16:23:35 +08:00
James Chen
86411837c6
PLEASE NEVER `using namespace cocos2d;` in header file
2014-05-13 16:15:21 +08:00
Ricardo Quesada
cd194cad9f
Merge pull request #6711 from ricardoquesada/indent_issues
...
fixes more indentation issues
2014-05-13 00:10:30 -07:00
Ricardo Quesada
8aea6fe89f
fixes more indentation issues
2014-05-13 00:10:01 -07:00
CocosRobot
7ad48b632a
[AUTO]: updating luabinding automatically
2014-05-13 07:03:12 +00:00
Ricardo Quesada
f25de7869b
indentation issues
2014-05-12 23:57:46 -07:00
andyque
1c47c833c6
issue #5005 , fixed widget visit method
2014-05-13 14:56:44 +08:00
andyque
810c25b85e
Merge branch 'v3' into issue5005
2014-05-13 14:52:49 +08:00
andyque
1a319b3f12
issue #5005 , deprecated setTouchEnabled
2014-05-13 14:52:27 +08:00
Ricardo Quesada
cdac920b5f
Merge remote-tracking branch 'cocos2d/v3' into multitexturingsupport
2014-05-12 23:52:02 -07:00
Ricardo Quesada
71848aca93
Initial multitexturing support
2014-05-12 23:51:37 -07:00
Nite Luo
7d8cfc4cca
set parent transform dirty when addChild
2014-05-12 23:28:20 -07:00
minggo
75196d96ce
Merge pull request #6696 from andyque/issue5121
...
issue 5121, fix loading bar init flicker and refator percentage
2014-05-13 13:45:01 +08:00
Dhilan007
a71ee9924e
closed issue:5020:The game still oriented in landscape mode when update the describes of orientation to Portrait in 'MainPage.xaml'.
2014-05-13 12:53:43 +08:00
andyque
7049fd253d
closed #5121 , add const to getPercent method
2014-05-13 12:06:28 +08:00
andyque
b2397f4059
issue #5005 , fix widget hittest problem
2014-05-13 12:04:43 +08:00
CocosRobot
bf6ed6eb8b
[AUTO]: updating luabinding automatically
2014-05-13 03:39:46 +00:00
minggo
ccb55448da
Merge pull request #6685 from andyque/refactor5118
...
closed #5118 , remove WidgetType and refactor LayoutType to Type
2014-05-13 11:35:36 +08:00
andyque
7db02fc0e9
closed #5121 , change percentage from int to float
2014-05-13 10:34:08 +08:00
andyque
5e01c61d8b
closed #5118 , fix indent
2014-05-13 10:15:29 +08:00
andyque
9125673c1c
issue #5121 , fix LoadingBar percentage when initialize
2014-05-13 10:13:08 +08:00
Ricardo Quesada
012f1020ca
GLProgramState fixes
...
It is possible to submit to the Renderer a Sprite with custom uniforms
(although it won't be batched).
It is possible to use a custom shader + uniforms on Sprite with
subclassing Sprite
2014-05-12 19:12:56 -07:00
andyque
c2f7c10f1c
closed #5118 , refactor, improving variable name
2014-05-13 09:56:10 +08:00
Ricardo Quesada
5d24b3d99a
Merge pull request #6693 from MSOpenTech/wp8-v3-fix2
...
Fixes for WP8 V3 build recently broken by recent commits
2014-05-12 10:06:32 -07:00
Dale Stammen
78df412669
updated project files to latest version of cocos2d
2014-05-12 09:27:52 -07:00
Dale Stammen
34b0245cfe
updated WP8 precompiled shaders
2014-05-12 09:27:27 -07:00
Dale Stammen
bad71e38d0
fixed for ABSOLUTE and RELATIVE winrt compiler reserved words
2014-05-12 09:26:39 -07:00
Dale Stammen
50336dca40
updated to latest version of cocos2d
2014-05-12 09:25:37 -07:00
James Chen
602d89126f
Value: initialize Value with Type::None when its move and copy
...
contructor is called.
Memory leak fix in `operator =(Value&&)` move assignment.
2014-05-12 23:32:51 +08:00
James Chen
b24f742c92
Null ptr check in value assignment
2014-05-12 18:45:36 +08:00
andyque
ebffc66a83
closed #5118 , fix CCSGUIReader setAnchorPoint
2014-05-12 18:07:13 +08:00
andyque
a0a4df5ac5
closed #5118 , remove WidgetType and refactor LayoutType to Type
2014-05-12 18:00:54 +08:00
minggo
9ab2dae212
Merge pull request #6635 from dumganhar/iss4660-unicode
...
issue #4660 : ccUTF8 uses utf8-utf16 conversion in llvm3.4
2014-05-12 17:57:25 +08:00
CocosRobot
16b31e3157
[AUTO]: updating luabinding automatically
2014-05-12 08:14:14 +00:00
minggo
f290d4d3ff
Merge pull request #6632 from andyque/refactor5057
...
issue #5057 . add UIDeprecated.h and refactor FocusDirection to inner class of
2014-05-12 16:10:21 +08:00
andyque
9a8c87601c
Merge branch 'v3' into refactor5057
2014-05-12 15:52:47 +08:00
Dhilan007
64b2562e1f
fixed compile fail on android.
2014-05-12 15:22:57 +08:00
minggo
1053cacc16
don't trigger onExitTransitionDidStart
2014-05-12 15:05:21 +08:00
andyque
da3e794631
issue #5057 , convert const char* to std::string&
2014-05-12 14:59:00 +08:00
Dhilan007
fc72dc040d
Label:fixed wrong logic of alignment.
2014-05-12 14:34:25 +08:00
andyque
56f417c520
issue #5057 , fix windows compile error
2014-05-12 14:11:44 +08:00
minggo
94f50b1856
Merge pull request #6535 from dumganhar/value-optimize
...
closed #5099 : Optimization for Value
2014-05-12 13:57:50 +08:00
andyque
8232b98525
issue #5057 , fix android compile error
2014-05-12 13:54:30 +08:00
CocosRobot
5c735e5277
[AUTO]: updating luabinding automatically
2014-05-12 05:44:32 +00:00
minggo
b23056537b
Merge pull request #6602 from minggo/remove-unneeded-codes
...
remove unneeded codes
2014-05-12 13:41:12 +08:00
andyque
b735ce3ffc
issue #5057 , fix andriod and linux compile
2014-05-12 11:55:00 +08:00
andyque
9d7d06a1f8
issue #5047 , refactor UIVideoPlayer
2014-05-12 11:35:57 +08:00
andyque
4f3c128c4f
issue #5057 , refator UITextField
2014-05-12 11:29:22 +08:00
andyque
eeaf48d3e5
issue #5047 , refactor UISlider
2014-05-12 11:17:06 +08:00
andyque
74ac5d1d5a
issue #5057 , refactor UIScrollView
2014-05-12 11:08:10 +08:00
andyque
ba802e1308
issue #5057 , refactor UIRichText
2014-05-12 10:39:30 +08:00
andyque
77a463bac3
issue #5057 , refactor UIPageView
2014-05-12 10:31:52 +08:00
andyque
7f15a14d55
issue #5057 , refactor LoadingBar
2014-05-12 10:12:22 +08:00
andyque
43eb75fb1a
issue #5057 , refactor Listview
2014-05-12 09:51:23 +08:00
yinkaile
3f83367b61
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3
2014-05-11 17:25:39 +08:00
James Chen
5b14338d1f
Update Android.mk
2014-05-11 13:22:42 +08:00
James Chen
449d1af7a8
Merge pull request #6672 from dumganhar/linux-android-fix
...
Linux android build fix
2014-05-11 12:51:27 +08:00
James Chen
292c1a5aa4
Linux android build fix
2014-05-11 12:50:51 +08:00
James Chen
14b6a046a3
Warning fix in CCDeprecated.cpp and CCGLProgramState.h
2014-05-11 12:14:17 +08:00
James Chen
3d22c30933
issue #4660 : Warning fix in CCLabel.cpp and ConvertUTF.c
2014-05-11 11:24:01 +08:00
James Chen
602fa28577
issue #4660 : Updates comments and doc for deprecated ccutf8 api
2014-05-10 21:51:42 +08:00
James Chen
448c1ad352
issue #4660 : Removes unused function in ccUTF8.cpp
2014-05-10 19:34:49 +08:00
Dhilan007
4692c67b78
issue #4660:remove unnecessary API.
2014-05-10 19:33:05 +08:00
James Chen
645a9761c8
issue #4660 : CCTweenFunction.h/.cpp must be in 'action' filter
2014-05-10 19:33:05 +08:00
James Chen
f0cf415228
issue #4660 : Fix windows include path doesn't contain `external/ConvertUTF`
2014-05-10 19:33:05 +08:00
James Chen
3a30adde0f
issue #4660 : A warning fix in CCFontAtlas.cpp
2014-05-10 19:33:05 +08:00
James Chen
07204a0602
issue #4660 : Updates win32 project
2014-05-10 19:33:05 +08:00
James Chen
e693a51c6e
issue #4660 : Linux build ok
2014-05-10 19:24:04 +08:00
James Chen
20adf418fd
Updates 2d/CMakeLists.txt
2014-05-10 19:24:04 +08:00
James Chen
e003a09a2c
Updates CMakeLists.txt
2014-05-10 19:24:04 +08:00
James Chen
dd3ed008b9
issue #4660 : Updates Android.mk
2014-05-10 19:24:04 +08:00
James Chen
b003ba5eb0
issue #4660 : Oops, utf16 is 2 bytes.
2014-05-10 19:24:03 +08:00
James Chen
a61b1097db
issue #4660 : Adds ConvertUTFWrapper.cpp, using llvm::ConvertUTF8toWide and llvm:: convertUTF16ToUTF8String
2014-05-10 19:24:03 +08:00
James Chen
5fda13639d
issue #4660 : Uses new utf api for Label.
2014-05-10 19:24:03 +08:00
James Chen
ed8633141f
issue #4660 : Updates android.mk
2014-05-10 19:24:03 +08:00
James Chen
9f4d2acaee
issue #4660 : StringUtils is a namespace now
2014-05-10 19:24:03 +08:00
James Chen
20a8808b78
issue #4660 : Refactors utf8 api, make it safer and easier to use.
2014-05-10 19:24:03 +08:00
Huabing.Xu
bbac0be9a6
add deprecated alias cc.VERTEX_ATTRIB_TEX_COORDS
2014-05-09 22:04:19 -07:00
Ricardo Quesada
4d579892b1
Merge pull request #6668 from dabingnn/v3_fix_accident_changes
...
V3 fix accident changes
2014-05-09 21:38:09 -07:00
Huabing.Xu
ba63befa5e
roll back target=android-10
2014-05-09 21:36:35 -07:00
Ricardo Quesada
a8c2fb5431
Fixes deprecated warnings
2014-05-09 21:29:24 -07:00
Ricardo Quesada
605fe8e4f3
fixes double free crash on GLProgramStateCache
2014-05-09 21:06:02 -07:00
CocosRobot
f0c240f885
[AUTO]: updating luabinding automatically
2014-05-10 03:47:56 +00:00
Ricardo Quesada
32d96ca9ad
Compiles on Windows Phone 8
...
... but does not run
2014-05-09 19:42:57 -07:00
Ricardo Quesada
488a8deae9
Shader fixes for windows
2014-05-09 19:13:12 -07:00
Ricardo Quesada
e8d2cf7871
Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into improved_glprogram
2014-05-09 19:08:08 -07:00
Ricardo Quesada
8f71e65482
Compiles on windows, sort of
2014-05-09 19:07:22 -07:00
yangxiao
d46729862c
android rename ShaderCahe to GLProgramCache
2014-05-09 19:05:39 -07:00
Ricardo Quesada
b62f4e51a4
Updates Linux project
2014-05-09 18:40:53 -07:00
Ricardo Quesada
77c03fcf11
ShaderCache -> GLProgramCache
2014-05-09 18:39:25 -07:00
AlexV
d7f1af876a
fixed network link library curl in win32 case : libcurl_imp
2014-05-10 10:07:57 +09:00
AlexV
83018eb69a
adding headers in src files so they appear in IDE
2014-05-10 10:03:46 +09:00
Ricardo Quesada
b5fdbf2d49
it is v3.1-alpha1
2014-05-09 17:03:34 -07:00
Ricardo Quesada
faf617bc37
fixes for Linux
2014-05-09 16:57:11 -07:00
Ricardo Quesada
f511b1f8a1
Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into improved_glprogram
2014-05-09 16:46:35 -07:00
Ricardo Quesada
fec1b82c0a
Shader files use STRINGIFY
2014-05-09 16:45:42 -07:00
yangxiao
1be6ba961c
Merge branch 'newcode' into improved_glprogram
2014-05-09 16:05:42 -07:00
yangxiao
877d8dd771
android works!!
2014-05-09 15:59:49 -07:00
Ricardo Quesada
9cad6cf027
removes some unused directories from the propery sheet
...
... for Visual Studio
2014-05-09 15:35:53 -07:00
Ricardo Quesada
4c623f1f5e
compiles and runs on Windows Phone 8
...
What's missing is to have the pre-compiled shaders from MS
to test the the ShaderTest
2014-05-09 15:14:50 -07:00
yangxiao
879958855b
UniformValue use union array
2014-05-09 14:38:36 -07:00
Ricardo Quesada
739af170ad
compiles and runs on Windows!!!
2014-05-09 13:24:56 -07:00
Ricardo Quesada
9ffaeec515
Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into improved_glprogram
2014-05-09 12:00:33 -07:00
Ricardo Quesada
16c6b2163d
More VisualStudio fixes
2014-05-09 11:59:52 -07:00
Huabing.Xu
e72633c066
Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into tony_improved_glprogram
2014-05-09 11:53:22 -07:00
Huabing.Xu
a8b27de799
fix bug for y flipped coord (particle system)
2014-05-09 11:50:37 -07:00
Ricardo Quesada
78dd92a7ef
Merge remote-tracking branch 'cocos2d/v3' into improved_glprogram
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-05-09 11:40:13 -07:00
Ricardo Quesada
8565e899f9
adds missing files to VisualStudio
2014-05-09 11:38:43 -07:00
Ricardo Quesada
dec753f0c4
Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into improved_glprogram
2014-05-09 11:36:02 -07:00
Ricardo Quesada
34a87f8332
Merge remote-tracking branch 'super626/improved_glprogram' into improved_glprogram
2014-05-09 11:28:16 -07:00
Ricardo Quesada
00834b1d6e
adds missing files for Windows
2014-05-09 11:28:06 -07:00
yangxiao
a986455e63
store useCache in GLProgramState
2014-05-09 10:23:24 -07:00
andyque
e1fe26543d
issue #5057 , refactor & remove deprecated warnings
2014-05-09 18:37:22 +08:00
andyque
264769f814
issue #5057 , refactor LinearGravity
2014-05-09 17:54:25 +08:00
andyque
0c0f18e7f3
issue #5047 , refactor LayoutParameterType
2014-05-09 17:38:05 +08:00
andyque
d12a71f738
issue #5057 , refactor UILayoutDefine
2014-05-09 17:16:11 +08:00
andyque
09a53e7b03
issue #5057 , refactor BackGroundColorType
2014-05-09 17:05:36 +08:00
andyque
e8e0d007bd
issue #5057 , refactor LayoutType
2014-05-09 16:49:00 +08:00
andyque
305f052344
issue #5057 , refactor LayoutClippingType
2014-05-09 16:31:22 +08:00
andyque
451b7a1b6b
issue #5057 , refactor UICheckBox event callback
2014-05-09 16:04:55 +08:00
andyque
c5a505ec4c
issue #5057 , Merge branch 'v3' into refactor5057
...
Conflicts:
cocos/ui/CocosGUI.h
2014-05-09 15:39:02 +08:00
andyque
d799ffce40
issue #5057 , remove include dependency
2014-05-09 15:32:51 +08:00
andyque
f070fc335f
issue #5057 , refactor BrightStyle to strong typed enum
2014-05-09 15:23:34 +08:00
andyque
762e8d9249
issue #5057 , refactor WidgetType to strong typed enum
2014-05-09 15:16:33 +08:00
andyque
6a7277c38f
issue #5057 , refactor TextureResType to strong typed enum
2014-05-09 14:56:05 +08:00
andyque
57ce0ee2cf
issue #5057 , refactor addTouchEventListener to std::function<>
2014-05-09 14:30:39 +08:00
chuanweizhang2013
d502e41af4
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into codeidev3
...
Conflicts:
templates/lua-template-runtime/frameworks/runtime-src/Classes/AppDelegate.cpp
2014-05-09 14:28:14 +08:00
yangxiao
95e036dd1b
GLProgramStateCache
2014-05-08 21:54:49 -07:00
Dhilan007
06f264e87d
rename VideoWidget to VideoPlayer.
2014-05-09 11:30:07 +08:00
andyque
21e4d05e6e
issue #5057 , refactor SEL_TouchEvent to std::function
2014-05-09 11:28:36 +08:00
andyque
a699230e75
issue #5057 , replace license
2014-05-09 09:39:18 +08:00
andyque
1d7726133c
issue #5057 , refactor enum SizeType to strong typed enum
2014-05-09 09:37:51 +08:00
andyque
3ef1facfb0
issue #5057 , replace deprecated enum with strong typed enum
2014-05-09 09:29:07 +08:00
Ricardo Quesada
7fee9cc266
Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into improved_glprogram
2014-05-08 18:02:27 -07:00
Ricardo Quesada
62d9c24518
moves shaders files from 2d/ to renderer/
2014-05-08 18:01:48 -07:00
Huabing.Xu
1d5bfb5a10
roll back _yCoordFlipped changes
2014-05-08 16:45:08 -07:00
Ricardo Quesada
51f498fc94
fixed deprecation warnings
2014-05-08 16:42:36 -07:00
Ricardo Quesada
2e669c1d28
GLProgram::create() returns a linked GLProgram
2014-05-08 16:04:59 -07:00
Ricardo Quesada
580ebf939f
working Ok with new API
2014-05-08 15:43:12 -07:00
Ricardo Quesada
453b670ad2
Removes CCVertexAttribBind
2014-05-08 14:01:26 -07:00
Ricardo Quesada
9ea4aa1e16
Simplified VertexAttrib
2014-05-08 14:01:03 -07:00
Ricardo Quesada
8f2ba467ff
Yeahhhhhh
...
it is working
2014-05-08 12:34:26 -07:00
Ricardo Quesada
a2361b30de
Merge branch 'improved_glprogram' of github.com:super626/cocos2d-x into improved_glprogram
2014-05-08 10:16:49 -07:00
Ricardo Quesada
087378926f
Merge remote-tracking branch 'cocos2d/v3' into improved_glprogram
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-05-08 10:16:09 -07:00
yangxiao
815f0b7bd9
useCallback to false
2014-05-08 10:12:12 -07:00
Dale Stammen
eea1ba6946
added missing files to projects
2014-05-08 10:11:42 -07:00
cocoscodeide
6efaa2fe8f
Merge pull request #2 from chuanweizhang2013/v3luaruntime
...
modify luadebug and adjust code file
2014-05-08 22:09:06 +08:00
minggo
56622dc765
Merge pull request #6555 from Dhilan007/v3_video
...
issue #4859:Add a widget to play video
2014-05-08 18:33:51 +08:00
andyque
fd362d2ace
issue #5057 . deprcated PositionType and make a new enum class instead
2014-05-08 18:25:49 +08:00
Dhilan007
af26fb9b07
issue #4870:Add a ui widget of playing video
2014-05-08 18:13:50 +08:00
Dhilan007
bda73bc7b3
issue #4868:Use system widget to play video on iOS
2014-05-08 18:12:53 +08:00
Dhilan007
bda8a73ae5
issue #4867:Use system widget to play video on Android
2014-05-08 18:12:03 +08:00
andyque
0c2fd977ea
issue #5057 . add UIDeprecated.h and refactor FocusDirection to inner class of
...
Widget and also simplify the enum value
2014-05-08 18:10:21 +08:00
minggo
f12bdeca9a
Merge pull request #6627 from nutty898/v3_nutty_fixedreaderbug
...
Fixed bug of guireader
2014-05-08 18:06:21 +08:00
minggo
c886bf21a8
Merge pull request #6631 from Dhilan007/v3_labelhotfixed
...
closed #5054:Label:Text have black border if it's created with system font on WP8/WINRT.
2014-05-08 17:24:08 +08:00
minggo
d84e26c7b4
Merge pull request #6626 from Ryeeeeee/v3_pause_sound_background
...
sounds pause automatically when switching background
2014-05-08 17:11:29 +08:00
Ryeeeeee
80103487fe
rename variable
2014-05-08 16:53:24 +08:00
chuanweizhang2013
8f7cb74dd1
fixed debug
2014-05-08 16:02:55 +08:00
CaiWenzhi
0a46b3c8d2
Merge branch 'v3' into v3_nutty_fixedreaderbug
...
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2014-05-08 15:56:34 +08:00
Dhilan007
966e7e2b20
closed #5054:Label:Text have black border if it's created with system font on WP8/WINRT.
2014-05-08 15:47:37 +08:00
minggo
a8d728ffc9
Merge pull request #6610 from zawasp/vs2013project
...
upgrade win32 projects for Visual Studio 2013
2014-05-08 15:40:02 +08:00
CaiWenzhi
a562f19880
Fixed bug of guireader
2014-05-08 15:15:09 +08:00
Ryeeeeee
eec96e9e96
sounds pause automatically when switching background
2014-05-08 14:44:47 +08:00
CocosRobot
119ef29a87
[AUTO]: updating luabinding automatically
2014-05-08 06:03:37 +00:00