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

24044 Commits

Author SHA1 Message Date
Steve Kanter 05f0f71cc5 Update CCDevice-ios.mm 
On iOS, Device::setKeepScreenOn(bool value) was ignoring the value and simply always disabling the timer.
 2014-09-17 14:52:30 -04:00
Jeff ed530454b2 fix compile error 2014-09-18 02:11:20 +08:00
Jeff 1dffbd0a7b fix link errors 2014-09-18 01:52:08 +08:00
slackmoehrle 2a54534291 Update README.md 
fixed spacing for Git instructions
 2014-09-17 10:36:00 -07:00
Jeff b5d481914f Merge branch 'v3_WebView_win32' of https://github.com/wohaaitinciu/cocos2d-x into v3_WebView_win32 2014-09-18 01:31:10 +08:00
Jeff e9c6f5d02b fix compile errors 2014-09-18 01:30:14 +08:00
Jeff Wang 9cb970be62 Update CocosGUI.h 2014-09-18 01:01:19 +08:00
Jeff 08e8963b1a fix compile errors 2014-09-18 00:04:48 +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
Jeff Wang 721311f106 Merge pull request #10 from cocos2d/v3 
update
 2014-09-17 19:19:19 +08:00
Huabing.Xu 3a0e9be97e new version of avoid z fighting in pageTurn 2014-09-17 18:33:18 +08:00
honghui f009de11c3 Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-09-17 18:07:06 +08:00
minggo 427c4e25af Merge pull request #8088 from natural-law/v3 
Update the reference of submodule cocos2d-console.
 2014-09-17 18:05:05 +08:00
zhangbin f73d015343 Update the reference of submodule cocos2d-console. 2014-09-17 18:03:49 +08:00
honghui fa4a6fae32 fix bug: response not been sent completely 2014-09-17 18:01:25 +08:00
yangxiao 34f642377e fix billboard anchor point 2014-09-17 18:01:18 +08:00
minggo 431064bc45 Merge pull request #8087 from cocoscodeide/v3 
fix runtime build error for 3.3
 2014-09-17 15:37:54 +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
minggo 1226184998 Merge pull request #8084 from dabingnn/v3_releaseNotes 
update release notes
 2014-09-17 14:31:54 +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
yangxiao 18717cfc86 Merge branch 'newcode' into v3 2014-09-17 13:44:28 +08:00
yangxiao c5f6f8de5b share glprogramstate 2014-09-17 13:42:08 +08:00
Huabing.Xu 7062e368e0 update release notes 2014-09-17 12:00:55 +08:00
minggo 6a7cfc812a Merge pull request #8083 from CocosRobot/update_lua_bindings_1410924831 
[AUTO]: updating luabinding automatically
 2014-09-17 11:42:44 +08:00
CocosRobot 9b5d47c61e [AUTO]: updating luabinding automatically 2014-09-17 03:35:46 +00:00
minggo bffcf79737 [ci skip] 2014-09-17 11:33:41 +08:00
minggo 38810eeb2e Merge pull request #8082 from dabingnn/v3_fixFastTMXIntIndices 
change indices to short for fast tmx
 2014-09-17 11:31:58 +08:00
minggo 32ed437e6d Merge pull request #8081 from andyque/addInterfaceToUI 
add getTitleRenderer interface to UIButton
 2014-09-17 11:31:16 +08:00
Huabing.Xu 725d107ae5 change indices to short for fast tmx 2014-09-17 11:06:15 +08:00
minggo 38259bd311 Merge pull request #8075 from dabingnn/v3_FixVertsAndDrawCallsForPrimitiveCommand 
add draw calls and draw verts for PrimitiveCommand
 2014-09-17 11:04:43 +08:00
andyque 6badfb30e1 add getTitleRenderer interface to UIButton 2014-09-17 10:57:40 +08:00
Huabing.Xu 34e3e23af5 Fix compile error 2014-09-17 10:35:42 +08:00
minggo 71325220bc [ci skip] 2014-09-17 10:26:03 +08:00
minggo 21af9a4701 [ci skip] 2014-09-17 10:24:20 +08:00
minggo 77371a025d Merge pull request #8062 from zhongfq/v3 
optimize decompress jpg data
 2014-09-17 10:22:57 +08:00
joewan 729910d77e Merge branch 'v3-official' 2014-09-16 22:04:46 +08:00
Eric Zhong ae5f6e63e5 optimize decompress jpg data and fix warnings 2014-09-16 21:55:05 +08:00
minggo e60a5db1cb Merge pull request #8079 from CocosRobot/update_lua_bindings_1410858873 
[AUTO]: updating luabinding automatically
 2014-09-16 17:31:00 +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
CocosRobot b37659a448 [AUTO]: updating luabinding automatically 2014-09-16 09:16:17 +00:00
minggo 0d7674d864 [ci skip] 2014-09-16 17:13:34 +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
honghui 86416e73ca sync code from default template 2014-09-16 16:19:05 +08:00
minggo 98a85fd635 Merge pull request #8077 from huangshiwu/v3_test 
fix ClippingNode's memory leak bug
 2014-09-16 15:36:56 +08:00
Dhilan007 369c14ed49 fix compile error 2014-09-16 14:57:58 +08:00
huangshiwu 3907e5c1a2 fix ClippingNode's memory leak bug 2014-09-16 14:50:00 +08:00
Huabing.Xu f702b4e9b3 add draw calls and draw verts for PrimitiveCommand 2014-09-16 12:04:35 +08:00
honghui c34eedae1c Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3 2014-09-16 11:53:55 +08:00
Dhilan007 9942206c53 move AudioEngine in cocos2d:experimental namespace 2014-09-16 10:22:25 +08:00