Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
21,726 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

21726 Commits

Author SHA1 Message Date
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
chuanweizhang2013 09d1ee8fcf Merge branch 'v3luaruntime' of https://github.com/chuanweizhang2013/cocos2d-x into v3luaruntime 2014-06-26 05:02:34 -07:00
chuanweizhang2013 b80d825421 commit 2014-06-26 04:41:54 -07:00
yangxiao ccb39e51b2 animation3d transition not finished 2014-06-26 18:35:12 +08:00
oleksandr.kuznietsov 1fbdbfc8f4 Updated pull request #7065 due to new changes in current branch 
- Switched ProgramState from unordered_map<string, Uniform> to unordered_map<GLint, Uniform> for faster uniform search
- changed `uniformValue` variable name to more relative
 2014-06-26 13:26:41 +03:00
minggo f91084500d Merge pull request #7223 from andyque/fixMinorBugs 
fix gui reader
 2014-06-26 17:29:04 +08:00
andyque d06ca0e75d fix gui reader 2014-06-26 17:29:07 +08:00
lite3 568a4bad49 fix Value equal ( float and double) 2014-06-26 17:26:57 +08:00
minggo 768eb4e1d0 Merge pull request #7222 from minggo/warnings-fix 
fix warnings
 2014-06-26 17:24:13 +08:00
samuele3hu b3da322920 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_VideoPlayer 
Conflicts:
	build/cocos2d_tests.xcodeproj/project.pbxproj
 2014-06-26 16:21:09 +08:00
samuele3hu 32c355dca4 Add VideoPlayer Lua bindings and update bindings-generator submodule 2014-06-26 16:19:22 +08:00
minggo dc635db163 fix warnings 2014-06-26 16:15:02 +08:00
minggo 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
minggo 4a49cb6f19 Merge pull request #7217 from CocosRobot/update_lua_bindings_1403752158 
[AUTO]: updating luabinding automatically
 2014-06-26 14:39:39 +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
minggo ff04528df1 Merge pull request #7215 from samuele3hu/v3_SceneReader 
Add Lua binding for ActionTimeline related,related test cases and update bindings-generator submodule
 2014-06-26 11:06:53 +08: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 c767f8a276 Update bindings-generator submodule 2014-06-26 09:51:56 +08:00
samuele3hu 3bd195d4ef Add Lua binding for ActionTimeline related and related test cases 2014-06-26 09:51:32 +08:00
minggo a14d8ec734 Merge pull request #7213 from MSOpenTech/wp8-v3-fix 
WP8 v3 fix for cpp template
 2014-06-26 09:43:24 +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
Dale Stammen 97d126d300 added source files for component to be consistent with other platforms templates 2014-06-25 09:50:40 -07:00
cocoscodeide c5056f0635 Merge pull request #42 from chuanweizhang2013/v3luaruntime 
modify mac out file
 2014-06-25 04:40:10 -07:00
chuanweizhang2013 cee5754db4 modify mac out file 2014-06-25 19:33:38 +08:00
zhangcheng 98c21f6f57 1. remove Hungary style. 2014-06-25 18:10:06 +08:00
minggo eb67d9deff [ci skip] 2014-06-25 17:59:30 +08:00
minggo 2c4f0f4340 [ci skip] 2014-06-25 17:58:01 +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
minggo bc7d2cd4f8 [ci skip] 2014-06-25 17:37:18 +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