Commit Graph

21395 Commits

Author SHA1 Message Date
yangxiao 4685a8654e Animate3D transition 2014-06-27 17:02:08 +08:00
Huabing.Xu 33a8b6563f windows works for fast tmx 2014-06-27 16:56:26 +08:00
minggo a85f522dd1 Merge pull request #7233 from CocosRobot/update_cocosfiles_1403858314
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-27 16:41:33 +08:00
minggo 5c0a1b2248 Merge pull request #7232 from CocosRobot/update_lua_bindings_1403857751
[AUTO]: updating luabinding automatically
2014-06-27 16:41:16 +08:00
minggo 145ae387c9 [ci skip] 2014-06-27 16:38:41 +08:00
CocosRobot 054f8c5d11 [AUTO][ci skip]: updating cocos2dx_files.json 2014-06-27 08:38:35 +00:00
minggo 26292b3e63 Merge pull request #7231 from andyque/fixUIMargin
fix ui Margin
2014-06-27 16:37:24 +08:00
yangxiao 2a6ce26335 Merge branch 'v3' of https://github.com/super626/cocos2d-x into v3 2014-06-27 16:36:36 +08:00
yangxiao 343ef9ae55 update sprite3d test 2014-06-27 16:36:01 +08:00
CocosRobot 9393777c22 [AUTO]: updating luabinding automatically 2014-06-27 08:31:17 +00:00
minggo 7c18824adf [ci skip] 2014-06-27 16:27:09 +08:00
Huabing.Xu 3066d0a879 Merge pull request #45 from dabingnn/tony_v3
linux work now for bundleReader
2014-06-27 16:26:55 +08:00
minggo af0b8e5195 Merge pull request #7065 from Teivaz/v3
Custom uniform search optimization
2014-06-27 16:26:07 +08:00
Huabing.Xu 9126819941 linux work now for bundleReader 2014-06-27 01:22:41 -07:00
andyque 94e311bebb fix platform compile error 2014-06-27 16:11:35 +08:00
andyque 1eab15ea41 add MarginZero as an external variable 2014-06-27 15:56:29 +08:00
XiaoYang 39dfda1ebe Merge pull request #44 from lvlonggame/v3
modify bug about parent index is -1
2014-06-27 15:55:29 +08:00
lvlong a497cc0ed2 wrong suffix name 2014-06-27 15:53:25 +08:00
andyque 62e046c0d5 add deprecated variable 2014-06-27 15:42:00 +08:00
andyque bd663ac55e fix margin zero 2014-06-27 15:39:10 +08:00
Huabing.Xu eba84b5dea fix wrong indentions 2014-06-27 14:45:30 +08:00
Huabing.Xu 1152f77ed7 clean up fast tmx code 2014-06-27 14:42:53 +08:00
lvlong 9d9c1eb51a change the tab in code to space 2014-06-27 14:42:48 +08:00
Huabing.Xu b232896f85 roll back fps compute logic
fix crash bug
2014-06-27 13:41:06 +08:00
Huabing.Xu 7254977358 roll back quadcommand 2014-06-27 12:44:19 +08:00
Huabing.Xu 6292ed05be improvement for fast tmx rendering 2014-06-27 11:50:44 +08:00
lvlong fac17097a0 add a new model and change girl model to it 2014-06-27 11:44:44 +08:00
Huabing.Xu a04b5fc5d5 use custom command for fast_tmx rendering 2014-06-27 10:30:21 +08:00
lvlong e6e9c6caa9 modify bug about parent index is -1 2014-06-27 09:32:09 +08:00
minggo 6b8fded088 [ci skip] 2014-06-26 22:59:20 +08:00
minggo aff4d179a6 [ci skip] 2014-06-26 22:58:36 +08:00
minggo 49da072b1a Merge pull request #7214 from lite3/addValueEqual
add operator == != for Value
2014-06-26 22:57:01 +08:00
yangxiao 392a769c8f merge cocos2d v3 2014-06-26 22:48:42 +08:00
yangxiao 1be44465b5 android version 2014-06-26 22:34:05 +08:00
yangxiao 2175b25730 fix animation bug 2014-06-26 21:58:26 +08:00
Huabing.Xu 81aa9c2c74 use custom command for rendering 2014-06-26 20:45:08 +08:00
yangxiao ccb39e51b2 animation3d transition not finished 2014-06-26 18:35:12 +08:00
oleksandr.kuznietsov 1fbdbfc8f4 Updated pull request #7065 due to new changes in current branch
- Switched ProgramState from unordered_map<string, Uniform> to unordered_map<GLint, Uniform> for faster uniform search
- changed `uniformValue` variable name to more relative
2014-06-26 13:26:41 +03:00
minggo f91084500d Merge pull request #7223 from andyque/fixMinorBugs
fix gui reader
2014-06-26 17:29:04 +08:00
andyque d06ca0e75d fix gui reader 2014-06-26 17:29:07 +08:00
lite3 568a4bad49 fix Value equal ( float and double) 2014-06-26 17:26:57 +08:00
minggo 768eb4e1d0 Merge pull request #7222 from minggo/warnings-fix
fix warnings
2014-06-26 17:24:13 +08:00
minggo dc635db163 fix warnings 2014-06-26 16:15:02 +08:00
minggo 11f6cf3b5b [ci skip] 2014-06-26 16:09:19 +08:00
minggo 08c68e12c3 [ci skip] 2014-06-26 16:08:25 +08:00
minggo e0e9d3379c Merge pull request #6948 from lite3/v3
Add immediate send request
2014-06-26 16:05:58 +08:00
minggo 013cf6de28 [ci skip] 2014-06-26 15:21:10 +08:00
minggo b033f7f664 Merge pull request #7218 from minggo/add-findChildren
Add utils::findChildren
2014-06-26 15:19:54 +08:00
minggo b817a15c31 Merge pull request #7219 from CocosRobot/update_cocosfiles_1403764857
[AUTO][ci skip]: updating cocos2dx_files.json
2014-06-26 14:41:49 +08:00
CocosRobot a3de7c00c8 [AUTO][ci skip]: updating cocos2dx_files.json 2014-06-26 06:40:58 +00:00