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

19664 Commits

Author SHA1 Message Date
James Chen 306df0537e Reverts changes in CCApplication.cpp/.mm, pollEvent must after main loop, otherwise, potential crash will happen. 2014-03-15 00:10:39 +08:00
minggo d0bb70ef52 Update README.md 2014-03-14 23:56:25 +08:00
minggo 98f5be028c Update README.md 2014-03-14 23:52:44 +08:00
minggo 5988e5a9f5 Merge pull request #5814 from lihex/develop 
update submodule
 2014-03-14 23:50:41 +08:00
lihex c36bae6c07 update submodule 2014-03-14 23:48:20 +08:00
James Chen 411ae24599 Merge pull request #5813 from CocosRobot/update_cocosfiles_1394811515 
[AUTO][ci skip]: updating cocos2dx_files.json
 2014-03-14 23:39:24 +08:00
CocosRobot ebe7b37ec2 [AUTO][ci skip]: updating cocos2dx_files.json 2014-03-14 15:38:36 +00:00
minggo 6ff07ed033 [ci skip] 2014-03-14 23:35:28 +08:00
minggo 1e16dfaea5 Merge pull request #5769 from boyu0/support_for_xcode_iphone_64bit_simulator 
update external library, add iOS x86_64 and arm64 architectures, support...
 2014-03-14 23:30:17 +08:00
minggo f054acecef Merge pull request #5812 from minggo/develop 
update readme
 2014-03-14 23:14:36 +08:00
minggo b6b34feb1b update readme 2014-03-14 23:12:01 +08:00
James Chen aa6029ca7d Merge pull request #5811 from dumganhar/develop 
Updates bindings-generator.
 2014-03-14 23:05:13 +08:00
James Chen 7cff033b55 Updates bindings-generator. 2014-03-14 23:04:05 +08:00
minggo 2a58d814b1 Merge pull request #5810 from lihex/develop 
update submodule
 2014-03-14 23:00:33 +08:00
lihex f7a1d1f095 update submodule 2014-03-14 22:56:40 +08:00
minggo bf036ae7b2 Merge pull request #5809 from minggo/develop 
update README
 2014-03-14 22:49:25 +08:00
minggo bade59cf1c update README 2014-03-14 22:45:29 +08:00
minggo feeed7cffa Merge pull request #5808 from lihex/develop 
update submodule
 2014-03-14 22:19:06 +08:00
lihex 99221ffcf1 update submodule 2014-03-14 22:17:47 +08:00
minggo 4e717cb878 Merge pull request #5807 from lihex/develop 
update submodule
 2014-03-14 21:32:45 +08:00
lihex b62d2e8ec0 update submodule 2014-03-14 21:29:36 +08:00
cw f76582ae9e update res path 2014-03-14 21:06:45 +08:00
Dhilan007 e512235299 Remove the old implementation of LabelTTF 2014-03-14 21:06:40 +08:00
cw da60d3bfce update template 2014-03-14 20:08:14 +08:00
James Chen d91f5b9a68 Merge pull request #5803 from dumganhar/develop 
PollEvents should invoked before main loop and little improvement in CCApplication.cpp/.mm.
 2014-03-14 20:02:04 +08:00
minggo 154382d813 Merge pull request #5804 from lihex/develop 
update submodule
 2014-03-14 19:43:16 +08:00
lihex 2ea565018c update submodule 2014-03-14 19:41:51 +08:00
James Chen 9bc48a7ac1 PollEvents before main loop and beautifies codes in CCApplication.cpp/.mm. 2014-03-14 18:40:04 +08:00
James Chen a5775e9e6a Merge pull request #5793 from koowolf/win32_crash 
Crash while clicking close button on desktop platforms
 2014-03-14 18:26:34 +08:00
James Chen c4fc97a20c Merge pull request #5799 from samuele3hu/develop_3_fix 
fix: Make `Close Menu` of lua_tests invisible for iOS platform
 2014-03-14 18:13:56 +08:00
James Chen 70d534bf41 Update CHANGELOG [ci skip] 2014-03-14 18:08:58 +08:00
James Chen edde48e132 Merge pull request #5798 from Dhilan007/develop_label 
closed #4377: LabelAtlas::setColor takes no effect.
 2014-03-14 18:07:36 +08:00
minggo cd9e57f577 Merge pull request #5801 from minggo/lua-template-linux 
copy lua files
 2014-03-14 18:03:29 +08:00
minggo 1aedf01590 copy lua files 2014-03-14 18:01:53 +08:00
minggo 1ab6856cd2 Merge pull request #5800 from minggo/lua-template-linux 
add websockets link
 2014-03-14 17:51:35 +08:00
minggo 3c96ef9394 add websockets link 2014-03-14 17:46:18 +08:00
samuele3hu 0eb1903811 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_3_fix 2014-03-14 17:39:59 +08:00
samuele3hu a05d6a55e2 fix: Make Close Menu invisible for iOS platform 2014-03-14 17:38:58 +08:00
Dhilan007 c4d91f512d LabelAtlas:fixed display incorrect color. 
MenuItem:using Label to replace LabelTTF.
 2014-03-14 17:36:05 +08:00
koowolf ad5f870f7c fix close crash in linux and mac 2014-03-14 17:21:27 +08:00
minggo 5e2eb24b1d Merge pull request #5797 from minggo/lua-template-linux 
lua tempalte support for linux
 2014-03-14 16:59:57 +08:00
minggo 7bddf7f36a lua tempalte support for linux 2014-03-14 16:58:33 +08:00
James Chen 4cbad19dfe Merge pull request #5796 from CocosRobot/update_lua_bindings_1394786638 
[AUTO]: updating luabinding automatically
 2014-03-14 16:52:58 +08:00
CocosRobot a090729b6e [AUTO]: updating luabinding automatically 2014-03-14 08:44:57 +00:00
cw d192619ddf add prebuilt runtime 2014-03-14 16:33:53 +08:00
James Chen 5c3069b4ec Merge pull request #5794 from Dhilan007/develop_label 
update Lua binding for label.
 2014-03-14 16:27:24 +08:00
Dhilan007 2089dd9ccd update Lua binding for label. 2014-03-14 16:21:56 +08:00
koowolf 90f5d6511e fix win32 crash while click close button. 2014-03-14 16:13:32 +08:00
James Chen d4efcb32af Merge pull request #5792 from CocosRobot/update_lua_bindings_1394783744 
[AUTO]: updating luabinding automatically
 2014-03-14 15:57:37 +08:00
CocosRobot 189733abac [AUTO]: updating luabinding automatically 2014-03-14 07:56:39 +00:00