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

23790 Commits

Author SHA1 Message Date
yangxiao 73909b2e9e billboard releaseNote 2014-09-15 17:37:37 +08:00
yangxiao e55c15c609 billboard release note 2014-09-15 17:35:21 +08:00
yangxiao d07aa89dff billboard release not 2014-09-15 17:32:18 +08:00
minggo d62e3762d2 Merge pull request #8054 from andyque/fixWin32Template 
fix resource path
 2014-09-15 16:42:46 +08:00
andyque d6bacea506 fix resource path 2014-09-15 16:40:32 +08:00
minggo fcf3fe97a8 Merge pull request #8053 from minggo/fix-warning 
[ci skip]fix warnings
 2014-09-15 16:25:19 +08:00
minggo 68ab3082b4 fix warnings 2014-09-15 16:23:57 +08:00
minggo de8242d048 [ci skip] 2014-09-15 16:01:44 +08:00
minggo d96050e1ce Merge pull request #8048 from Dhilan007/v3-audio903 
update LUA templates for AudioEngine.
 2014-09-15 16:00:11 +08:00
minggo ef76938741 Merge pull request #8052 from minggo/update-release-note 
[ci skip]update release note
 2014-09-15 15:59:47 +08:00
minggo 03410a0107 update release note 2014-09-15 15:56:38 +08:00
minggo 5e960a10cd Merge pull request #8051 from andyque/fixWin32Template 
Fix win32 template
 2014-09-15 15:48:09 +08:00
andyque b6bd70f119 fix lua runtime compile error 2014-09-15 15:35:04 +08:00
andyque 36feb8e47b fix lua win32 template compile error 2014-09-15 15:10:55 +08:00
andyque 8b4a7902ec fix cpp template compile 2014-09-15 14:43:41 +08:00
minggo fc06916689 [ci skip] 2014-09-15 14:39:19 +08:00
minggo 544082ff64 Merge pull request #8050 from mailgyc/v3 
fix: ParticleSystem "set not pop-up message box when load image failed" ...
 2014-09-15 14:20:17 +08:00
mailgyc 9e8b32b3c4 fix: ParticleSystem "set not pop-up message box when load image failed" doesn't work 
isPopupNotify() doesn't work
 2014-09-15 14:06:04 +08:00
minggo 7084070c4a Merge pull request #8049 from natural-law/v3 
Modify the config file in template for the folder rename.
 2014-09-15 13:59:37 +08:00
zhangbin 0f62ac19c0 Modify the config file in template for the folder rename. 2014-09-15 13:56:15 +08:00
Dhilan007 1639d759af update LUA templates for AudioEngine. 2014-09-15 13:51:18 +08:00
minggo 22bf82bb1b Merge pull request #8047 from CocosRobot/update_cocosfiles_1410759983 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-09-15 13:47:09 +08:00
CocosRobot 5e936ec8ca [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-15 05:46:24 +00:00
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