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

23820 Commits

Author SHA1 Message Date
minggo 3de82474c0 SchedulerPauseResumeAll can not resume at 5s 2014-09-16 16:38:30 +08:00
minggo afd1271078 Merge pull request #8071 from huangshiwu/v3_wp8test 
fix wp8 and winrt compile error --add chipmunk static lib
 2014-09-16 10:07:50 +08:00
minggo 75ff798239 Merge pull request #8070 from samuele3hu/v3_beta0_test 
Update release configure setting for cpp template
 2014-09-16 10:03:40 +08:00
huangshiwu d0d3e185ce fix wp8 and winrt compile error --add chipmunk static lib 2014-09-16 10:03:00 +08:00
samuele3hu 2fa87b9c38 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_beta0_test 2014-09-16 09:57:45 +08:00
samuele3hu 0c2268d85e Update release configure setting for cpp template 2014-09-16 09:57:10 +08:00
minggo a8a8265174 Merge pull request #8068 from CocosRobot/update_cocosfiles_1410809260 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-09-16 09:41:00 +08:00
minggo b3aa9cc045 Merge pull request #8064 from CocosRobot/update_lua_bindings_1410795317 
[AUTO]: updating luabinding automatically
 2014-09-16 09:40:30 +08:00
CocosRobot 34f679a88a [AUTO][ci skip]: updating cocos2dx_files.json 2014-09-15 19:27:41 +00:00
Ricardo Quesada 56a59f7671 Merge pull request #8067 from ricardoquesada/english_fixes 
English fixes
 2014-09-15 12:24:14 -07:00
Ricardo Quesada c89f7ec6c4 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into english_fixes 
Conflicts:
	CHANGELOG
 2014-09-15 09:34:11 -07:00
Ricardo Quesada 38cdee45f8 English fixes 2014-09-15 09:33:07 -07:00
CocosRobot 4097a68ea9 [AUTO]: updating luabinding automatically 2014-09-15 15:38:05 +00:00
minggo d35141a1e2 Merge pull request #8063 from CocosRobot/update_lua_bindings_1410794320 
[AUTO]: updating luabinding automatically
 2014-09-15 23:23:09 +08:00
CocosRobot 526c28bea9 [AUTO]: updating luabinding automatically 2014-09-15 15:21:18 +00:00
minggo 27528f3e5f Merge pull request #8061 from minggo/fix-cocostudio-test-crash 
[ci skip]remove unneeded Android.mk
 2014-09-15 22:53:18 +08:00
minggo 14d1fc48bd Merge pull request #8057 from samuele3hu/v3_beta0_test 
Update cocos2dx_3d.ini
 2014-09-15 22:52:24 +08:00
minggo 625dfb4781 Merge pull request #8056 from super626/v3 
BillBoard Rease Notes
 2014-09-15 22:50:23 +08:00
minggo 9a29ab2113 Merge pull request #8058 from andyque/fixWebView 
improve webview coding style
 2014-09-15 22:49:53 +08:00
minggo 515e230f85 Merge pull request #8059 from andyque/addWebViewReleaseNote 
modify release note
 2014-09-15 22:48:28 +08:00
minggo a61cda04ee remove unneeded Android.mk 2014-09-15 22:47:44 +08:00
andyque 6bc04cd129 modify release note 2014-09-15 18:34:46 +08:00
andyque af3dd215cb improve android web view 2014-09-15 18:14:04 +08:00
samuele3hu c56c0dfd4f Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_beta0_test 2014-09-15 18:04:08 +08:00
andyque 5f95ad221e improve iOS WebView 2014-09-15 18:02:11 +08:00
samuele3hu 225c3db005 Update cocos2dx_3d.ini 2014-09-15 17:59:57 +08:00
andyque 126ec18a89 add video player debug draw config 2014-09-15 17:59:51 +08:00
minggo 0af9c33301 Merge pull request #8055 from Dhilan007/v3-audio903 
Fix a potential crash in AudioEngine on Android.
 2014-09-15 17:37:59 +08:00
yangxiao 73909b2e9e billboard releaseNote 2014-09-15 17:37:37 +08:00
Dhilan007 39a8b8d5ea Fix a potential crash in AudioEngine on Android. 2014-09-15 17:36:00 +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
andyque 71b6be678e fix header guard 2014-09-15 16:56:51 +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