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

23767 Commits

Author SHA1 Message Date
minggo 7bb391ce55 Merge pull request #8033 from Dhilan007/v3-audio903 
Lua bindings of AudioEngine.
 2014-09-15 13:43:27 +08:00
minggo 9e36be70f8 Merge pull request #8035 from andyque/fixLuaTemplate 
adjust registering ui module before extension module
 2014-09-15 13:40:56 +08:00
andyque 2cfff1813b modify comments 2014-09-15 12:06:34 +08:00
minggo d34d586366 Merge pull request #8045 from CocosRobot/update_cocosfiles_1410752121 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-09-15 11:35:56 +08:00
minggo eb0fb88bdd Merge pull request #8043 from CocosRobot/update_cocosfiles_1410750694 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-09-15 11:35:31 +08:00
CocosRobot 18313b6684 [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-15 03:35:22 +00:00
minggo 7266006b45 Merge pull request #8040 from CocosRobot/update_lua_bindings_1410747115 
[AUTO]: updating luabinding automatically
 2014-09-15 11:34:35 +08:00
minggo c28004866b Merge pull request #8044 from andyque/fixWarnings 
fix UI related warnings
 2014-09-15 11:34:22 +08:00
Dhilan007 9cc9359b78 fix compile error 2014-09-15 11:16:27 +08:00
andyque 030fe34afa fix UI related warnings 2014-09-15 11:13:56 +08:00
CocosRobot dcdabb404a [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-15 03:11:35 +00:00
minggo edbabe5739 Merge pull request #8042 from huangshiwu/v3_template 
change-template-folder-name --win32 and wp8
 2014-09-15 11:10:31 +08:00
huangshiwu 42c193c424 change-template-folder-name --win32 and wp8 2014-09-15 11:04:07 +08:00
CocosRobot 8c86fe4201 [AUTO]: updating luabinding automatically 2014-09-15 02:13:35 +00:00
Dhilan007 56aa9c04ef fix lua bindings 2014-09-15 10:07:14 +08:00
minggo cc221e5e16 Merge pull request #8036 from CocosRobot/update_lua_bindings_1410745737 
[AUTO]: updating luabinding automatically
 2014-09-15 09:56:20 +08:00
minggo cd9611a0a6 [ci skip] 2014-09-15 09:55:38 +08:00
minggo 4aad03c449 [ci skip] 2014-09-15 09:54:42 +08:00
minggo fe7af9e5e8 [ci skip] 2014-09-15 09:51:16 +08:00
CocosRobot 8c7eb81271 [AUTO]: updating luabinding automatically 2014-09-15 01:50:32 +00:00
minggo df78ec90f1 Merge pull request #8032 from joewan/v3-fix-leak 
fix memory leak when use menu_selector.
 2014-09-15 09:50:05 +08:00
minggo 70f922d07a Merge pull request #8030 from andyque/fixButtonScaleIssue 
fix button scale issue
 2014-09-15 09:49:06 +08:00
minggo 0d412b1e5e Merge pull request #8027 from slackmoehrle/patch-1 
Added git clone instructions and git submodule update --init
 2014-09-15 09:48:22 +08:00
andyque 2f85310348 adjust registering ui module before extension module 2014-09-15 09:46:07 +08:00
minggo 6bcab3b05d Merge pull request #7920 from rny/audio_win32 
win32 can not stop looping sound effect
 2014-09-15 09:37:11 +08:00
minggo 788f3c5c38 Merge pull request #8025 from andyque/fixEditBoxLuaBinding 
fix Editbox lua binding
 2014-09-15 09:36:36 +08:00
minggo 8b1e928741 Merge pull request #8026 from super626/v3 
Transparent Mesh support
 2014-09-15 09:36:17 +08:00
minggo 2b16a29627 Merge pull request #8029 from kskkbys/ssl_verification 
HttpClient SSL verification
 2014-09-15 09:35:51 +08:00
minggo 3e124222d9 Merge pull request #8034 from minggo/change-template-folder-name 
[ci skip]res->Resources src->Classes for cpp template
 2014-09-15 09:34:47 +08:00
andyque 7b0f41ed7b remove auto scale text 2014-09-15 09:28:56 +08:00
Dhilan007 51c19d4b06 update project for lua bindings of AudioEngine 2014-09-14 23:17:39 +08:00
Dhilan007 51e3b1af7b Add lua test case of AudioEngine 2014-09-14 22:54:48 +08:00
Dhilan007 cf2a60898f Lua bindings of AudioEngine. 2014-09-14 22:54:04 +08:00
Dhilan007 28af7999e5 update test case of AudioEngine 2014-09-14 22:49:27 +08:00
Dhilan007 f6992b94de fix crash in AudioEngine 2014-09-14 22:48:41 +08:00
joewan 93fdcf1f04 fix memory leak when use menu_selector. 2014-09-14 21:41:19 +08:00
Keisuke Kobayashi c4d2c5eaed Rename setSSLVerification 2014-09-14 00:28:11 +09:00
andyque 880929f102 fix button scale issue 2014-09-13 22:08:02 +08:00
Keisuke Kobayashi 6b0879fe93 HttpClient SSL verification 2014-09-13 20:37:36 +09:00
minggo a9232a14ea res->Resources src->Classes for cpp template 2014-09-13 17:50:02 +08:00
slackmoehrle 0dfd272180 Added git clone instructions and git submodule update --init 
Added git clone instructions and git submodule update --init
 2014-09-12 10:01:48 -07:00
minggo 2b3bdbf56d [ci skip] 2014-09-12 18:06:33 +08:00
yangxiao 2e0e4e58c8 support transparent object 2014-09-12 17:57:54 +08:00
minggo 0f42d9bbd8 Merge pull request #8022 from Dhilan007/v3-labelfix 
Label:It may display incorrectly with outline feature enabled.
 2014-09-12 17:54:02 +08:00
yangxiao df5da80439 Merge branch 'newcode' into v3 2014-09-12 17:43:05 +08:00
minggo 92325d30e5 [ci skip] 2014-09-12 17:17:28 +08:00
minggo 34a015895d Merge pull request #8020 from dabingnn/v3_MaterialIDBug 
fix bug for MeshCommand materialID generation
 2014-09-12 17:15:49 +08:00
andyque 02d2282b83 add ui::Editbox lua binding, deprecated cc.EditBox to ccui.EditBox 2014-09-12 17:07:06 +08:00
andyque d4b2e8d154 remove deprecated warning 2014-09-12 17:06:13 +08:00
minggo ba7c0475ba Merge pull request #8023 from CocosRobot/update_lua_bindings_1410509636 
[AUTO]: updating luabinding automatically
 2014-09-12 16:21:49 +08:00