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

21395 Commits

Author SHA1 Message Date
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
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
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 3cb47f9ecc Merge pull request #7208 from CocosRobot/update_cocosfiles_1403688059 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-06-25 17:23:33 +08:00
CocosRobot 486bf9ad12 [AUTO][ci skip]: updating cocos2dx_files.json 2014-06-25 09:21:01 +00:00
minggo 46d380b5ac Merge pull request #7204 from andyque/fixListViewTestHorizentalCarsh 
fix ListView addChild problem
 2014-06-25 17:20:17 +08:00
minggo d97f531d1c Merge pull request #7205 from samuele3hu/v3_ui_binary 
Update bindings-generator submodule
 2014-06-25 17:19:15 +08:00
minggo 4253babe0a Merge pull request #7207 from CocosRobot/update_lua_bindings_1403687738 
[AUTO]: updating luabinding automatically
 2014-06-25 17:19:02 +08:00
CocosRobot 68649695b2 [AUTO]: updating luabinding automatically 2014-06-25 09:17:16 +00:00
minggo ae346a741e [ci skip] 2014-06-25 17:14:57 +08:00
minggo f1943ca350 Merge pull request #7203 from samuele3hu/v3_ui_focus 
Add coco studio ui focus test cases for Lua and add deprecated support for some functions
 2014-06-25 17:12:06 +08:00
samuele3hu ca56aaa0d8 Update bindings-generator submodule 2014-06-25 16:23:26 +08: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 2c6abb94d4 [ci skip] 2014-06-25 14:43:27 +08:00
minggo 07c5e219d5 [ci skip] 2014-06-25 14:42:12 +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
minggo 986f77a827 Merge pull request #7156 from samuele3hu/v3_keypad_fix 
Update controller.lua for CocosIDE’s need
 2014-06-25 14:40:08 +08:00
minggo e44dafb9f9 [ci skip] 2014-06-25 14:33:42 +08:00
zhangcheng bdf7be6fa0 1. add classname = "" log. 2014-06-25 14:32:38 +08:00
minggo 5f569cb423 Merge pull request #7193 from samuele3hu/v3_ui_binary 
Add UI Editor test cases for Lua
 2014-06-25 14:30:34 +08:00
minggo 71f92a41b5 Merge pull request #7198 from CocosRobot/update_lua_bindings_1403676931 
[AUTO]: updating luabinding automatically
 2014-06-25 14:29:40 +08:00
CocosRobot 515f967f96 [AUTO]: updating luabinding automatically 2014-06-25 06:17:41 +00:00
minggo 5dcc6e6707 [ci skip] 2014-06-25 14:13:50 +08:00