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

2456 Commits

Author SHA1 Message Date
minggo fdb30f1ee7 Merge pull request #8115 from Dhilan007/v3-audio903 
New Audio Engine -MAC
 2014-09-24 15:00:53 +08:00
Sergey Perepelitsa d8216149de precompiled headers improvements for iOS & Mac 2014-09-23 23:19:25 +04:00
Dhilan007 ed4e800d70 Add audio resource. 2014-09-23 15:38:40 +08:00
Dhilan007 077ffb2b43 update lua binding 2014-09-22 15:54:35 +08:00
Dhilan007 936c3b3f79 New Audio Engine -MAC 2014-09-22 15:38:12 +08:00
minggo e8b20d8583 Merge pull request #8093 from wohaaitinciu/v3_WebView_win32 
web view win32
 2014-09-22 09:30:29 +08:00
minggo 681621805d Merge pull request #8109 from andyque/fixTests 
fix editbox test
 2014-09-19 16:29:07 +08:00
yangxiao 06c0adcf6d remove unused resource 2014-09-19 14:52:25 +08:00
andyque 7615eb8d39 fix editbox test 2014-09-19 14:21:18 +08:00
yangxiao 650f810815 add obb by default 2014-09-19 11:22:37 +08:00
Jeff 418ec69abf compile error 2014-09-18 15:18:30 +08:00
minggo 442f30af1f Merge pull request #8091 from dabingnn/v3_PageTurnZFighting 
new version of avoid z fighting in pageTurn
 2014-09-18 10:50:31 +08:00
Huabing.Xu 39c6f9bfbd remove setDepthTest(true) because it is not needed to be set for pageTurn 2014-09-18 10:00:36 +08:00
Jeff e9c6f5d02b fix compile errors 2014-09-18 01:30:14 +08:00
Jeff 27919dad77 add simple implement of WebView for win32 
1.add simple implement of WebView for win32
2.Modify `std::string' to `const std::string &' as issues 7958 said
3.Open the test case in cpp-tests
 2014-09-17 22:30:15 +08:00
Huabing.Xu 3a0e9be97e new version of avoid z fighting in pageTurn 2014-09-17 18:33:18 +08:00
minggo ccbf694927 Merge pull request #8086 from huangshiwu/v3_test 
fix bug produce by CCDrawNode in test Node:UI-GUI Editor test-ScrollView...
 2014-09-17 14:50:42 +08:00
huangshiwu c8bdba69ad fix bug produce by CCDrawNode in test Node:UI-GUI Editor test-ScrollView PageView ListView 2014-09-17 14:00:40 +08:00
andyque 6badfb30e1 add getTitleRenderer interface to UIButton 2014-09-17 10:57:40 +08:00
minggo 7d97aaeeb3 Merge pull request #8078 from minggo/SchedulerPauseResumeAll-issue 
SchedulerPauseResumeAll can not resume at 5s
 2014-09-16 17:30:20 +08:00
minggo da29b92ff4 Merge pull request #8072 from Dhilan007/v3-audio903 
move AudioEngine to cocos2d:experimental namespace
 2014-09-16 17:12:03 +08:00
minggo 3de82474c0 SchedulerPauseResumeAll can not resume at 5s 2014-09-16 16:38:30 +08:00
huangshiwu 3907e5c1a2 fix ClippingNode's memory leak bug 2014-09-16 14:50:00 +08:00
Dhilan007 9942206c53 move AudioEngine in cocos2d:experimental namespace 2014-09-16 10:22:25 +08: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 a61cda04ee remove unneeded Android.mk 2014-09-15 22:47:44 +08:00
andyque 5f95ad221e improve iOS WebView 2014-09-15 18:02:11 +08:00
minggo 68ab3082b4 fix warnings 2014-09-15 16:23:57 +08:00
minggo 7bb391ce55 Merge pull request #8033 from Dhilan007/v3-audio903 
Lua bindings of AudioEngine.
 2014-09-15 13:43:27 +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
minggo 70f922d07a Merge pull request #8030 from andyque/fixButtonScaleIssue 
fix button scale issue
 2014-09-15 09:49:06 +08:00
minggo 788f3c5c38 Merge pull request #8025 from andyque/fixEditBoxLuaBinding 
fix Editbox lua binding
 2014-09-15 09:36:36 +08:00
andyque 7b0f41ed7b remove auto scale text 2014-09-15 09:28:56 +08:00
Dhilan007 51e3b1af7b Add lua test case of AudioEngine 2014-09-14 22:54:48 +08:00
Dhilan007 28af7999e5 update test case of AudioEngine 2014-09-14 22:49:27 +08:00
andyque 880929f102 fix button scale issue 2014-09-13 22:08:02 +08:00
andyque 02d2282b83 add ui::Editbox lua binding, deprecated cc.EditBox to ccui.EditBox 2014-09-12 17:07:06 +08:00
huangshiwu 0addaf3912 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_shadercompilefix 2014-09-12 15:38:29 +08:00
minggo 55783b66c2 Merge pull request #8012 from huangshiwu/v3_drawnode_prbk 
V3 drawnode prbk
 2014-09-12 15:17:49 +08:00
huangshiwu 11d8829b3a Deprecate DrawPrimitives and enhance DrawNode --little modify 2014-09-12 14:50:41 +08:00
andyque c81cfc1ecf fix text doesn't scale with button issue 2014-09-12 14:24:27 +08:00
andyque ed22792a72 fix text only button issue 2014-09-12 13:50:13 +08:00
huangshiwu 6182a872c6 Deprecate DrawPrimitives and enhance DrawNode --more modify 2014-09-12 11:12:20 +08:00
huangshiwu 147bb7301b fix wp8 compile error --add BillBoard and BillBoardTest 2014-09-12 09:33:30 +08:00
huangshiwu 8922121ed1 Deprecate DrawPrimitives and enhance DrawNode --make some modify 2014-09-12 07:33:34 +08:00
huangshiwu d9634057ab Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3_drawnode_prbk 2014-09-11 16:41:54 +08:00
yangxiao 5274b4f958 merge cocos resolve conflict 2014-09-11 16:02:07 +08:00
huangshiwu fb1d47900c Deprecate DrawPrimitives and enhance DrawNode 2014-09-11 15:39:56 +08:00
yangxiao bb6f5a6be5 Merge branch 'newcode' into billboard 2014-09-10 16:27:59 +08:00